[Openvas-commits] r12035 - in trunk/openvas-plugins: . scripts

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Nov 7 18:29:38 CET 2011


Author: mime
Date: 2011-11-07 18:29:01 +0100 (Mon, 07 Nov 2011)
New Revision: 12035

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/AfterLogic_WebMail_Pro_detect.nasl
   trunk/openvas-plugins/scripts/AproxEngine_detect.nasl
   trunk/openvas-plugins/scripts/ConnX_detect.nasl
   trunk/openvas-plugins/scripts/FormMail_detect.nasl
   trunk/openvas-plugins/scripts/FreeWebShop_detect.nasl
   trunk/openvas-plugins/scripts/GlassFish_detect.nasl
   trunk/openvas-plugins/scripts/JBoss_enterprise_aplication_server_detect.nasl
   trunk/openvas-plugins/scripts/MercuryBoard_detect.nasl
   trunk/openvas-plugins/scripts/OpenX_detect.nasl
   trunk/openvas-plugins/scripts/PHPMySpace_detect.nasl
   trunk/openvas-plugins/scripts/PowerPhlogger_detect.nasl
   trunk/openvas-plugins/scripts/TinyPHPForum_detect.nasl
   trunk/openvas-plugins/scripts/TinyWebGallery_detect.nasl
   trunk/openvas-plugins/scripts/TorrentTrader_detect.nasl
   trunk/openvas-plugins/scripts/aas_detect.nasl
   trunk/openvas-plugins/scripts/adaptbb_detect.nasl
   trunk/openvas-plugins/scripts/atmail_detect.nasl
   trunk/openvas-plugins/scripts/awstats_detect.nasl
   trunk/openvas-plugins/scripts/axigen_web_detect.nasl
   trunk/openvas-plugins/scripts/barracuda_im_firewall_detect.nasl
   trunk/openvas-plugins/scripts/barracuda_web_application_firewall_detect.nasl
   trunk/openvas-plugins/scripts/base_detect.nasl
   trunk/openvas-plugins/scripts/bind_cve_2009_0696.nasl
   trunk/openvas-plugins/scripts/bloofoxCMS_detect.nasl
   trunk/openvas-plugins/scripts/boastMachine_detect.nasl
   trunk/openvas-plugins/scripts/bugzilla_detect.nasl
   trunk/openvas-plugins/scripts/cacti_detect.nasl
   trunk/openvas-plugins/scripts/centreon_detect.nasl
   trunk/openvas-plugins/scripts/cms_made_simple_detect.nasl
   trunk/openvas-plugins/scripts/coppermine_detect.nasl
   trunk/openvas-plugins/scripts/cs_whois_34700.nasl
   trunk/openvas-plugins/scripts/cvstrac_detect.nasl
   trunk/openvas-plugins/scripts/deluxeBB_detect.nasl
   trunk/openvas-plugins/scripts/dnsmasq_tftp.nasl
   trunk/openvas-plugins/scripts/dnsmasq_version.nasl
   trunk/openvas-plugins/scripts/dokeos_detect.nasl
   trunk/openvas-plugins/scripts/drupal_detect.nasl
   trunk/openvas-plugins/scripts/e107_detect.nasl
   trunk/openvas-plugins/scripts/ePo_detect.nasl
   trunk/openvas-plugins/scripts/eggdrop_detect.nasl
   trunk/openvas-plugins/scripts/ejabberd_detect.nasl
   trunk/openvas-plugins/scripts/eliteCMS_detect.nasl
   trunk/openvas-plugins/scripts/family_connections_detect.nasl
   trunk/openvas-plugins/scripts/femitter_ftp_34689.nasl
   trunk/openvas-plugins/scripts/firestats_detect.nasl
   trunk/openvas-plugins/scripts/flatpress_detect.nasl
   trunk/openvas-plugins/scripts/freznoshop_detect.nasl
   trunk/openvas-plugins/scripts/ftpdmin_detect.nasl
   trunk/openvas-plugins/scripts/gb_informix_detect.nasl
   trunk/openvas-plugins/scripts/gb_ossim_web_detect.nasl
   trunk/openvas-plugins/scripts/gb_sap_maxdb_detect.nasl
   trunk/openvas-plugins/scripts/gb_workgroupshare_detect.nasl
   trunk/openvas-plugins/scripts/gravity_board_x_detect.nasl
   trunk/openvas-plugins/scripts/hp_power_manager_detect.nasl
   trunk/openvas-plugins/scripts/idb_detect.nasl
   trunk/openvas-plugins/scripts/jd_web_detect.nasl
   trunk/openvas-plugins/scripts/linpha_detect.nasl
   trunk/openvas-plugins/scripts/mambo_detect.nasl
   trunk/openvas-plugins/scripts/mantis_detect.nasl
   trunk/openvas-plugins/scripts/mldonkey_2_9_7_remote.nasl
   trunk/openvas-plugins/scripts/mozilloCMS_detect.nasl
   trunk/openvas-plugins/scripts/mt_detect.nasl
   trunk/openvas-plugins/scripts/multiple_EditeurScripts_products_xss.nasl
   trunk/openvas-plugins/scripts/my_dealer_detect.nasl
   trunk/openvas-plugins/scripts/mysql_version.nasl
   trunk/openvas-plugins/scripts/nagios_detect.nasl
   trunk/openvas-plugins/scripts/nagios_statd_detect.nasl
   trunk/openvas-plugins/scripts/nanocms_detect.nasl
   trunk/openvas-plugins/scripts/ncftpd_35822.nasl
   trunk/openvas-plugins/scripts/net2ftp_detect.nasl
   trunk/openvas-plugins/scripts/nginx_detect.nasl
   trunk/openvas-plugins/scripts/notftp_detect.nasl
   trunk/openvas-plugins/scripts/novaboard_detect.nasl
   trunk/openvas-plugins/scripts/novell_edirectory_detect.nasl
   trunk/openvas-plugins/scripts/novell_imanager_detect.nasl
   trunk/openvas-plugins/scripts/nsd_version.nasl
   trunk/openvas-plugins/scripts/ntop_detect.nasl
   trunk/openvas-plugins/scripts/open_media_collectors_database_detect.nasl
   trunk/openvas-plugins/scripts/opencart_detect.nasl
   trunk/openvas-plugins/scripts/oracle_webLogic_server_detect.nasl
   trunk/openvas-plugins/scripts/oscommerce_detect.nasl
   trunk/openvas-plugins/scripts/pdns_version.nasl
   trunk/openvas-plugins/scripts/perforce_detect.nasl
   trunk/openvas-plugins/scripts/phorum_detect.nasl
   trunk/openvas-plugins/scripts/phpBugTracker_detect.nasl
   trunk/openvas-plugins/scripts/phpScheduleIt_detect.nasl
   trunk/openvas-plugins/scripts/phpWebThings_detect.nasl
   trunk/openvas-plugins/scripts/phpbb_detect.nasl
   trunk/openvas-plugins/scripts/phpgroupware_detect.nasl
   trunk/openvas-plugins/scripts/phpldapadmin_detect.nasl
   trunk/openvas-plugins/scripts/phplive_detect.nasl
   trunk/openvas-plugins/scripts/phpmyfaq_detect.nasl
   trunk/openvas-plugins/scripts/phpshop_detect.nasl
   trunk/openvas-plugins/scripts/pligg_cms_detect.nasl
   trunk/openvas-plugins/scripts/podcast_generator_detect.nasl
   trunk/openvas-plugins/scripts/prtg_traffic_grapher_detect.nasl
   trunk/openvas-plugins/scripts/quicksilver_forums_detect.nasl
   trunk/openvas-plugins/scripts/realty_web_base_detect.nasl
   trunk/openvas-plugins/scripts/redaxscript_detect.nasl
   trunk/openvas-plugins/scripts/rt_detect.nasl
   trunk/openvas-plugins/scripts/sahana_detect.nasl
   trunk/openvas-plugins/scripts/serendipity_detect.nasl
   trunk/openvas-plugins/scripts/snitz_forums_2000_detect.nasl
   trunk/openvas-plugins/scripts/ssh_proto_version.nasl
   trunk/openvas-plugins/scripts/sun_dir_server_detect.nasl
   trunk/openvas-plugins/scripts/support_incident_tracker_detect.nasl
   trunk/openvas-plugins/scripts/testlink_detect.nasl
   trunk/openvas-plugins/scripts/tftgallery_detect.nasl
   trunk/openvas-plugins/scripts/thin_webserver_detect.nasl
   trunk/openvas-plugins/scripts/unbound_version.nasl
   trunk/openvas-plugins/scripts/viewvc_detect.nasl
   trunk/openvas-plugins/scripts/webcalendar_detect.nasl
   trunk/openvas-plugins/scripts/webfileexplorer_detect.nasl
   trunk/openvas-plugins/scripts/webmedia_explorer_detect.nasl
   trunk/openvas-plugins/scripts/xmpp_detect.nasl
   trunk/openvas-plugins/scripts/zabbix_web_detect.nasl
   trunk/openvas-plugins/scripts/znc_detect.nasl
Log:
Don't rely on the presence of the risk factor in script description to generate output.

Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/ChangeLog	2011-11-07 17:29:01 UTC (rev 12035)
@@ -1,3 +1,125 @@
+2011-11-07  Michael Meyer <michael.meyer at greenbone.net>
+
+	* scripts/e107_detect.nasl,
+	scripts/sahana_detect.nasl,
+	scripts/nagios_detect.nasl,
+	scripts/nagios_statd_detect.nasl,
+	scripts/sun_dir_server_detect.nasl,
+	scripts/hp_power_manager_detect.nasl,
+	scripts/eggdrop_detect.nasl,
+	scripts/notftp_detect.nasl,
+	scripts/novell_imanager_detect.nasl,
+	scripts/webfileexplorer_detect.nasl,
+	scripts/phpBugTracker_detect.nasl,
+	scripts/testlink_detect.nasl,
+	scripts/dnsmasq_tftp.nasl,
+	scripts/ftpdmin_detect.nasl,
+	scripts/ssh_proto_version.nasl,
+	scripts/cs_whois_34700.nasl,
+	scripts/TorrentTrader_detect.nasl,
+	scripts/mt_detect.nasl,
+	scripts/cvstrac_detect.nasl,
+	scripts/support_incident_tracker_detect.nasl,
+	scripts/family_connections_detect.nasl,
+	scripts/xmpp_detect.nasl,
+	scripts/realty_web_base_detect.nasl,
+	scripts/gb_ossim_web_detect.nasl,
+	scripts/jd_web_detect.nasl,
+	scripts/nsd_version.nasl,
+	scripts/ncftpd_35822.nasl,
+	scripts/thin_webserver_detect.nasl,
+	scripts/cms_made_simple_detect.nasl,
+	scripts/AfterLogic_WebMail_Pro_detect.nasl,
+	scripts/open_media_collectors_database_detect.nasl,
+	scripts/axigen_web_detect.nasl,
+	scripts/phpWebThings_detect.nasl,
+	scripts/barracuda_im_firewall_detect.nasl,
+	scripts/linpha_detect.nasl,
+	scripts/mysql_version.nasl,
+	scripts/eliteCMS_detect.nasl,
+	scripts/phorum_detect.nasl,
+	scripts/ePo_detect.nasl,
+	scripts/unbound_version.nasl,
+	scripts/TinyWebGallery_detect.nasl,
+	scripts/gb_workgroupshare_detect.nasl,
+	scripts/phpScheduleIt_detect.nasl,
+	scripts/quicksilver_forums_detect.nasl,
+	scripts/rt_detect.nasl,
+	scripts/mldonkey_2_9_7_remote.nasl,
+	scripts/gb_sap_maxdb_detect.nasl,
+	scripts/phpbb_detect.nasl,
+	scripts/dnsmasq_version.nasl,
+	scripts/TinyPHPForum_detect.nasl,
+	scripts/firestats_detect.nasl,
+	scripts/mambo_detect.nasl,
+	scripts/pdns_version.nasl,
+	scripts/tftgallery_detect.nasl,
+	scripts/phpldapadmin_detect.nasl,
+	scripts/deluxeBB_detect.nasl,
+	scripts/MercuryBoard_detect.nasl,
+	scripts/phpgroupware_detect.nasl,
+	scripts/FreeWebShop_detect.nasl,
+	scripts/novell_edirectory_detect.nasl,
+	scripts/podcast_generator_detect.nasl,
+	scripts/snitz_forums_2000_detect.nasl,
+	scripts/PowerPhlogger_detect.nasl,
+	scripts/FormMail_detect.nasl,
+	scripts/pligg_cms_detect.nasl,
+	scripts/gravity_board_x_detect.nasl,
+	scripts/mantis_detect.nasl,
+	scripts/nginx_detect.nasl,
+	scripts/centreon_detect.nasl,
+	scripts/webcalendar_detect.nasl,
+	scripts/femitter_ftp_34689.nasl,
+	scripts/barracuda_web_application_firewall_detect.nasl,
+	scripts/PHPMySpace_detect.nasl,
+	scripts/opencart_detect.nasl,
+	scripts/viewvc_detect.nasl,
+	scripts/AproxEngine_detect.nasl,
+	scripts/redaxscript_detect.nasl,
+	scripts/multiple_EditeurScripts_products_xss.nasl,
+	scripts/gb_informix_detect.nasl,
+	scripts/OpenX_detect.nasl,
+	scripts/my_dealer_detect.nasl,
+	scripts/drupal_detect.nasl,
+	scripts/ntop_detect.nasl,
+	scripts/nanocms_detect.nasl,
+	scripts/phpmyfaq_detect.nasl,
+	scripts/idb_detect.nasl,
+	scripts/boastMachine_detect.nasl,
+	scripts/bugzilla_detect.nasl,
+	scripts/prtg_traffic_grapher_detect.nasl,
+	scripts/bloofoxCMS_detect.nasl,
+	scripts/aas_detect.nasl,
+	scripts/oracle_webLogic_server_detect.nasl,
+	scripts/atmail_detect.nasl,
+	scripts/cacti_detect.nasl,
+	scripts/webmedia_explorer_detect.nasl,
+	scripts/net2ftp_detect.nasl,
+	scripts/adaptbb_detect.nasl,
+	scripts/perforce_detect.nasl,
+	scripts/novaboard_detect.nasl,
+	scripts/dokeos_detect.nasl,
+	scripts/freznoshop_detect.nasl,
+	scripts/base_detect.nasl,
+	scripts/phpshop_detect.nasl,
+	scripts/mozilloCMS_detect.nasl,
+	scripts/znc_detect.nasl,
+	scripts/JBoss_enterprise_aplication_server_detect.nasl,
+	scripts/ConnX_detect.nasl,
+	scripts/ejabberd_detect.nasl,
+	scripts/GlassFish_detect.nasl,
+	scripts/awstats_detect.nasl,
+	scripts/coppermine_detect.nasl,
+	scripts/serendipity_detect.nasl,
+	scripts/zabbix_web_detect.nasl,
+	scripts/bind_cve_2009_0696.nasl,
+	scripts/oscommerce_detect.nasl,
+	scripts/phplive_detect.nasl,
+	scripts/flatpress_detect.nasl:
+	Don't rely on the presence of the risk factor in script
+	description to generate output.
+
 2011-11-07  Henri Doreau <henri.doreau at greenbone.net>
 
 	* scripts/deb_1441_1.nasl,

Modified: trunk/openvas-plugins/scripts/AfterLogic_WebMail_Pro_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/AfterLogic_WebMail_Pro_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/AfterLogic_WebMail_Pro_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -102,16 +102,12 @@
       if(!isnull(cpe))
          register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-      info = string("None\n\nAfterLogic WebMail Pro Version '");
+      info = string("\n\nAfterLogic WebMail Pro Version '");
       info += string(vers);
       info += string("' was detected on the remote host in the following directory(s):\n\n");
       info += string(install, "\n");
 
-      desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-      );
+      desc = desc + info;
 
          if(report_verbosity > 0) {
            security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/AproxEngine_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/AproxEngine_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/AproxEngine_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -95,16 +95,12 @@
 
     set_kb_item(name: string("www/", port, "/AproxEngine"), value: string(vers," under ",install));
 
-    info = string("None\n\nAproxEngine Version '");
+    info = string("\n\nAproxEngine Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/ConnX_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ConnX_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/ConnX_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -91,16 +91,12 @@
     
     set_kb_item(name: string("www/", port, "/connx"), value: string(vers," under ",install));
 
-    info = string("None\n\nConnX Version '");
+    info = string("\n\nConnX Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/FormMail_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/FormMail_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/FormMail_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -110,15 +110,11 @@
       if(!isnull(cpe))
          register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-      info = string("None\n\nFormMail Version '");
+      info = string("\n\nFormMail Version '");
       info += string(vers);
       info += string("' was detected on the remote host\n");
 
-      desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-      );    
+      desc = desc + info;    
        
          if(report_verbosity > 0) {
            security_note(port:port,data:string(desc));

Modified: trunk/openvas-plugins/scripts/FreeWebShop_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/FreeWebShop_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/FreeWebShop_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -111,16 +111,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nFreeWebshop Version '");
+    info = string("\n\nFreeWebshop Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/GlassFish_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/GlassFish_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/GlassFish_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -109,15 +109,11 @@
 
     }  
 
-    info = string("None\n\nGlassFish Version '");
+    info = string("\n\nGlassFish Version '");
     info += string(vers);
     info += string("' was detected on the remote host\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
 	 if(report) {

Modified: trunk/openvas-plugins/scripts/JBoss_enterprise_aplication_server_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/JBoss_enterprise_aplication_server_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/JBoss_enterprise_aplication_server_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -83,18 +83,14 @@
      if(!isnull(cpe))
         register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-     info = string("None\n\nJBoss Enterprise Application Server Version '");
+     info = string("\n\nJBoss Enterprise Application Server Version '");
      info += string(vers);
      info += string("' was detected on the remote host.\n");
 
-     desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+     desc = desc + info;
 
      if(report_verbosity > 0) {
-        security_note(port:port);
+        security_note(port:port,data:desc);
         exit(0); 
      }
    }

Modified: trunk/openvas-plugins/scripts/MercuryBoard_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/MercuryBoard_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/MercuryBoard_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -95,16 +95,12 @@
 
     set_kb_item(name: string("www/", port, "/mercuryboard"), value: string(vers," under ",install));
 
-    info = string("None\n\nMercuryBoard Version '");
+    info = string("\n\nMercuryBoard Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/OpenX_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/OpenX_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/OpenX_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -101,16 +101,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nOpenX Version '");
+    info = string("\n\nOpenX Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/PHPMySpace_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/PHPMySpace_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/PHPMySpace_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -97,16 +97,12 @@
 
     set_kb_item(name: string("www/", port, "/phpMySpace"), value: string(vers," under ",install));
 
-    info = string("None\n\nphpMySpace Version '");
+    info = string("\n\nphpMySpace Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/PowerPhlogger_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/PowerPhlogger_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/PowerPhlogger_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -101,16 +101,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nPowerPhlogger Version '");
+    info = string("\n\nPowerPhlogger Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/TinyPHPForum_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/TinyPHPForum_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/TinyPHPForum_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nTinyPHPForum Version '");
+    info = string("\n\nTinyPHPForum Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/TinyWebGallery_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/TinyWebGallery_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/TinyWebGallery_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,16 +103,12 @@
          if(!isnull(cpe))
             register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-         info = string("None\n\nTinyWebGallery Version '");
+         info = string("\n\nTinyWebGallery Version '");
          info += string(vers);
          info += string("' was detected on the remote host in the following directory(s):\n\n");
          info += string(install, "\n"); 
 
-	desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-        );
+	desc = desc + info;
 
          security_note(port:port,data:desc);
          exit(0);

Modified: trunk/openvas-plugins/scripts/TorrentTrader_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/TorrentTrader_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/TorrentTrader_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nTorrentTrader Version '");
+    info = string("\n\nTorrentTrader Version '");
     info += vers;
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/aas_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/aas_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/aas_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -94,15 +94,11 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nA A S Application Access Server Version '");
+    info = string("\n\nA A S Application Access Server Version '");
     info += string(vers);
     info += string("' was detected on the remote host\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:string(desc));

Modified: trunk/openvas-plugins/scripts/adaptbb_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/adaptbb_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/adaptbb_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,16 +103,12 @@
     #if(!isnull(cpe))
        register_host_detail(name:"App", value:"cpe:/a:adaptbb:adaptbb", nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nAdaptBB Version '");
+    info = string("\n\nAdaptBB Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/atmail_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/atmail_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/atmail_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -112,16 +112,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
  
-    info = string("None\n\nAtmail Version '");
+    info = string("\n\nAtmail Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/awstats_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/awstats_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/awstats_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,16 +103,12 @@
       register_host_detail(name:"App", value:string("cpe:/a:awstats:awstats"), nvt:SCRIPT_OID, desc:SCRIPT_DESC);
     }  
 
-    info = string("None\n\nAwstats Version '");
+    info = string("\n\nAwstats Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/axigen_web_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/axigen_web_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/axigen_web_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,15 +103,11 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nAxigen Version '");
+    info = string("\n\nAxigen Version '");
     info += string(vers);
     info += string("' was detected on the remote host\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/barracuda_im_firewall_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/barracuda_im_firewall_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/barracuda_im_firewall_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -91,15 +91,11 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nBarracuda IM Firewall Version '");
+    info = string("\n\nBarracuda IM Firewall Version '");
     info += string(vers);
     info += string("' was detected on the remote host.\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/barracuda_web_application_firewall_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/barracuda_web_application_firewall_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/barracuda_web_application_firewall_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -77,15 +77,11 @@
 
     set_kb_item(name: string("www/", port, "/barracuda_web_application_firewall"), value: vers);
 
-    info = string("None\n\nBarracuda Web Application Firewall Version '");
+    info = string("\n\nBarracuda Web Application Firewall Version '");
     info += string(vers);
     info += string("' was detected on the remote host.\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/base_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/base_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/base_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -106,16 +106,12 @@
    if(!isnull(cpe))
       register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nBasic Analysis and Security Engine (BASE) Version '");
+    info = string("\n\nBasic Analysis and Security Engine (BASE) Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/bind_cve_2009_0696.nasl
===================================================================
--- trunk/openvas-plugins/scripts/bind_cve_2009_0696.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/bind_cve_2009_0696.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -121,13 +121,9 @@
      version_in_range(version:version, test_version:"9.5", test_version2:"9.5.1.P2") ||
      version_in_range(version:version, test_version:"9",   test_version2:"9.4.3.P2")) {
 
-     info = string("Medium\n\n** OpenVAS only check the version number (from TXT record in the\nChaos class) because 'safe checks' are enabled.\n");
+     info = string("\n\n** OpenVAS only check the version number (from TXT record in the\nChaos class) because 'safe checks' are enabled.\n");
  
-     desc = ereg_replace(
-         string:desc,
-         pattern:"Medium$",
-         replace:info
-     );
+     desc = desc + info;
 
      security_warning(port:53,data:desc,proto:"udp");
      exit(0);   
@@ -151,13 +147,9 @@
           buf = recv(socket:soc, length:4096);
           if(buf == 0) {
 
-              info = string("Medium\n\n** It seems that OpenVAS was able to crash the remote Bind.\nPlease check its status right now.\n");
+              info = string("\n\n** It seems that OpenVAS was able to crash the remote Bind.\nPlease check its status right now.\n");
 
-              desc = ereg_replace(
-                string:desc,
-                pattern:"Medium$",
-                replace:info
-              );
+              desc = desc + info;
 
               security_warning(port:53,data:desc,proto:"udp");
               close(soc);          
@@ -172,13 +164,9 @@
             version_in_range(version:version, test_version:"9.5", test_version2:"9.5.1.P2") ||
             version_in_range(version:version, test_version:"9",   test_version2:"9.4.3.P2")) {
 
-            info = string("Medium\n\n** It seems that OpenVAS was not able to crash the remote Bind.\nAccording to its version number the remote version of BIND is\nanyway vulnerable.\nPlease check its status right now.\n"); 
+            info = string("\n\n** It seems that OpenVAS was not able to crash the remote Bind.\nAccording to its version number the remote version of BIND is\nanyway vulnerable.\nPlease check its status right now.\n"); 
 
-            desc = ereg_replace(
-             string:desc,
-             pattern:"Medium$",
-             replace:info
-           );
+            desc = desc + info;
            
             security_warning(port:53,data:desc,proto:"udp");
             exit(0);

Modified: trunk/openvas-plugins/scripts/bloofoxCMS_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/bloofoxCMS_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/bloofoxCMS_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -105,16 +105,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nbloofoxCMS Version '");
+    info = string("\n\nbloofoxCMS Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/boastMachine_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/boastMachine_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/boastMachine_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -94,16 +94,12 @@
 
     set_kb_item(name: string("www/", port, "/boastMachine"), value: string(vers," under ",install));
 
-    info = string("None\n\nboastMachine Version '");
+    info = string("\n\nboastMachine Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/bugzilla_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/bugzilla_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/bugzilla_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -167,16 +167,12 @@
     ## build cpe and store it as host detail
     register_cpe(tmpVers:vers,tmpExpr:"^([0-9._]+)",tmpBase:"cpe:/a:mozilla:bugzilla:");
 
-    info = string("None\n\nBugzilla Version '");
+    info = string("\n\nBugzilla Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/cacti_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/cacti_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/cacti_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -117,15 +117,11 @@
       if(!isnull(cpe))
          register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-      info = string("None\n\nCacti Version '");
+      info = string("\n\nCacti Version '");
       info += string(vers);
       info += string("' was detected on the remote host\n");
 
-      desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-      );    
+      desc = desc + info;    
        
          if(report_verbosity > 0) {
            security_note(port:port,data:string(desc));

Modified: trunk/openvas-plugins/scripts/centreon_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/centreon_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/centreon_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -99,16 +99,12 @@
 
     set_kb_item(name: string("www/", port, "/centreon"), value: string(vers," under ",install));
 
-    info = string("None\n\nCentreon Version '");
+    info = string("\n\nCentreon Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/cms_made_simple_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/cms_made_simple_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/cms_made_simple_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -88,16 +88,12 @@
 
     set_kb_item(name: string("www/", port, "/cms_made_simple"), value: string(vers," under ",install));
 
-    info = string("None\n\nCMS Made Simple Version '");
+    info = string("\n\nCMS Made Simple Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/coppermine_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/coppermine_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/coppermine_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -135,16 +135,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nCoppermine Version '");
+    info = string("\n\nCoppermine Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/cs_whois_34700.nasl
===================================================================
--- trunk/openvas-plugins/scripts/cs_whois_34700.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/cs_whois_34700.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -90,16 +90,12 @@
 }
 
 if(installations) {
-  info = string("High\n\nVulnerable installations were found on the remote host in the following directory(s):\n\n");  
+  info = string("\n\nVulnerable installations were found on the remote host in the following directory(s):\n\n");  
   foreach found (installations) {
    info += string(found, "\n");
   }
 
-  desc = ereg_replace(
-    	string:desc,
-    	pattern:"High$",
-    	replace:info
-    );     
+  desc = desc + info;     
 
   security_hole(port:port, data: desc);
   exit(0);

Modified: trunk/openvas-plugins/scripts/cvstrac_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/cvstrac_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/cvstrac_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -102,16 +102,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nCVSTrac Version '");
+    info = string("\n\nCVSTrac Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/deluxeBB_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/deluxeBB_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/deluxeBB_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -109,16 +109,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\ndeluxeBB Version (");
+    info = string("\n\ndeluxeBB Version (");
     info += string(vers);
     info += string(") was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/dnsmasq_tftp.nasl
===================================================================
--- trunk/openvas-plugins/scripts/dnsmasq_tftp.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/dnsmasq_tftp.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -91,12 +91,8 @@
 if(version_is_less(version: version, test_version: "2.50")) {
 
   if (tftp_alive(port:port)) {
-    info = string("High\n\nINFO: OpenVAs found a running TFTPD at this host. If this is the\ndnsmasq-tftpd, you should disable it immediately until you have\nswitched to the latest version of dnsmasq.\n");
-    desc = ereg_replace(
-        string:desc,
-        pattern:"High$",
-        replace:info
-    );
+    info = string("\n\nINFO: OpenVAs found a running TFTPD at this host. If this is the\ndnsmasq-tftpd, you should disable it immediately until you have\nswitched to the latest version of dnsmasq.\n");
+    desc = desc + info;
   } 
 
       security_hole(port:dnsPort,data: desc);

Modified: trunk/openvas-plugins/scripts/dnsmasq_version.nasl
===================================================================
--- trunk/openvas-plugins/scripts/dnsmasq_version.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/dnsmasq_version.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -120,15 +120,11 @@
 
 		 hole_data -= string("dnsmasq-");
 
-		 info = string("None\n\nDnsmasq Version '"); 
+		 info = string("\n\nDnsmasq Version '"); 
 		 info += hole_data;
 		 info += string("' was detected on the remote Host\n\n");  
 		
-		desc = ereg_replace(
-    	                        string:desc,
-                         	pattern:"None$",
-                        	replace:info
-                       );    
+		desc = desc + info;    
 
 		set_kb_item(name:"dnsmasq/version",value:hole_data);
                 if(report_verbosity > 0) {

Modified: trunk/openvas-plugins/scripts/dokeos_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/dokeos_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/dokeos_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -106,16 +106,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
  
-    info = string("None\n\nDokeos Version '");
+    info = string("\n\nDokeos Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/drupal_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/drupal_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/drupal_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -115,16 +115,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nDrupal Version '");
+    info = string("\n\nDrupal Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
     if(report_verbosity > 0){
       security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/e107_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/e107_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/e107_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,16 +103,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\ne107 Version '");
+    info = string("\n\ne107 Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/ePo_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ePo_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/ePo_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -85,7 +85,7 @@
     egrep(pattern:"ComputerName>", string: buf, icase: FALSE) &&
     egrep(pattern:"FrameworkLog", string: buf, icase: FALSE))) {
 
-    info = string("None\n\nInformation that was gathered:\n\n");
+    info = string("\n\nInformation that was gathered:\n\n");
 
     if("403 Forbidden" >< buf) {
     
@@ -157,11 +157,7 @@
     }
 
     if(strlen(info)>40) {
-      desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-      );
+      desc = desc + info;
      }
 
      if(report_verbosity > 0) {

Modified: trunk/openvas-plugins/scripts/eggdrop_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/eggdrop_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/eggdrop_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -91,15 +91,11 @@
       if(!isnull(cpe))
          register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-      info = string("None\n\nEggdrop Version '");
+      info = string("\n\nEggdrop Version '");
       info += string(vers);
       info += string("' was detected on the remote host\n");
 
-      desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-      );    
+      desc = desc + info;    
        
          if(report_verbosity > 0) {
            security_note(port:port,data:string(desc));

Modified: trunk/openvas-plugins/scripts/ejabberd_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ejabberd_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/ejabberd_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -65,12 +65,8 @@
   if(!isnull(version)) {
     set_kb_item(name: string("xmpp/", xmpp_port, "/ejabberd"), value: version);
     register_host_detail(name:"App", value:string("cpe:/a:process-one:ejabberd:",version), nvt:SCRIPT_OID, desc:SCRIPT_DESC);
-    info = string("None\n\nejabberd version '", version, "' was detected by OpenVAS.\n");
-    desc = ereg_replace(
-         string:desc,
-	 pattern:"None$",
-	 replace:info
-    );	 
+    info = string("\n\nejabberd version '", version, "' was detected by OpenVAS.\n");
+    desc = desc + info;	 
     if(report_verbosity > 0) {
       security_note(port:xmpp_port,data:desc);
     }  

Modified: trunk/openvas-plugins/scripts/eliteCMS_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/eliteCMS_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/eliteCMS_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -105,16 +105,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\neliteCMS Version '");
+    info = string("\n\neliteCMS Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/family_connections_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/family_connections_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/family_connections_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nFamily Connections Version '");
+    info = string("\n\nFamily Connections Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/femitter_ftp_34689.nasl
===================================================================
--- trunk/openvas-plugins/scripts/femitter_ftp_34689.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/femitter_ftp_34689.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -105,15 +105,11 @@
   }
   
   if(result && egrep(pattern: "\[boot loader\]", string: result)) {
-   info = string("Medium\n\nHere are the contents of the file 'boot.ini' that\nOpenVAS was able to read from the remote host:\n\n"); 
+   info = string("\n\nHere are the contents of the file 'boot.ini' that\nOpenVAS was able to read from the remote host:\n\n"); 
    info += result;
    info += string("\n");
 
-   desc = ereg_replace(
-    	string:desc,
-    	pattern:"Medium$",
-    	replace:info
-    );    
+   desc = desc + info;    
 
    security_warning(port:port,data:desc);
    ftp_close(socket:soc1);

Modified: trunk/openvas-plugins/scripts/firestats_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/firestats_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/firestats_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -114,16 +114,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nFireStats Version '");
+    info = string("\n\nFireStats Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/flatpress_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/flatpress_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/flatpress_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -101,16 +101,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nFlatPress Version '");
+    info = string("\n\nFlatPress Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/freznoshop_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/freznoshop_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/freznoshop_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,16 +103,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nFreznoShop Version '");
+    info = string("\n\nFreznoShop Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/ftpdmin_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ftpdmin_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/ftpdmin_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -84,15 +84,11 @@
 
     set_kb_item(name:"ftpdmin/Ver", value:vers);
 
-    info = string("None\n\nFtpdmin Version '");
+    info = string("\n\nFtpdmin Version '");
     info += string(vers);
     info += string("' was detected on the remote host.\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/gb_informix_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_informix_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/gb_informix_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -121,7 +121,7 @@
       register_service(port:port, proto:"informix", ipproto:"tcp");
       register_host_detail(name:"App", value:string("cpe:/a:ibm:informix_dynamic_server"), nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-      info = string("None\n\nHere is the gathered data:\n\n");
+      info = string("\n\nHere is the gathered data:\n\n");
 
       data = strstr(buf, string(raw_string(0x00),"k",raw_string(0x00)));
 
@@ -143,11 +143,7 @@
       }
 
       if(strlen(info) > 35) {
-        desc = ereg_replace(
-              string:desc,
-              pattern:"None$",
-              replace:info
-          );
+        desc = desc + info;
       }
       
       register_service(port:port, ipproto:"tcp", proto:"informix");

Modified: trunk/openvas-plugins/scripts/gb_ossim_web_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_ossim_web_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/gb_ossim_web_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -92,14 +92,10 @@
     set_kb_item(name: string("www/", port, "/ossim"), value: string(vers," under ",install));
     register_host_detail(name:"App", value:string("cpe:/a:open_source_security_information_management:os-sim"), nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nOSSIM was detected on the remote host in the following directory:\n\n");
+    info = string("\n\nOSSIM was detected on the remote host in the following directory:\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/gb_sap_maxdb_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_sap_maxdb_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/gb_sap_maxdb_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -126,12 +126,8 @@
      }
 
      if(info) {
-       info = string("None\n\nInformation that was gathered:\n\n", info);
-       desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-       );
+       info = string("\n\nInformation that was gathered:\n\n", info);
+       desc = desc + info;
      }
  
       if(report_verbosity > 0) {

Modified: trunk/openvas-plugins/scripts/gb_workgroupshare_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_workgroupshare_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/gb_workgroupshare_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -66,12 +66,8 @@
 
   if(!isnull(version[1])) {
     ver = version[1];
-    info = string("None\n\nWorkgroupShare version '", ver,"' was found on the remote Host.\n");
-    desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-	       );	
+    info = string("\n\nWorkgroupShare version '", ver,"' was found on the remote Host.\n");
+    desc = desc + info;	
   }  
 
   security_note(port:port, data:desc);

Modified: trunk/openvas-plugins/scripts/gravity_board_x_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gravity_board_x_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/gravity_board_x_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC); 
 
-    info = string("None\n\nGravity Board X Version '");
+    info = string("\n\nGravity Board X Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/hp_power_manager_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/hp_power_manager_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/hp_power_manager_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -96,15 +96,11 @@
 
     set_kb_item(name: string("www/", port, "/hp_power_manager"), value: string(vers));
 
-    info = string("None\n\nHP Power Manager Version '");
+    info = string("\n\nHP Power Manager Version '");
     info += string(vers);
     info += string("' was detected on the remote host.\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/idb_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/idb_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/idb_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -109,16 +109,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\niDB Version '");
+    info = string("\n\niDB Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/jd_web_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/jd_web_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/jd_web_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -122,7 +122,7 @@
       if(!isnull(cpe))
          register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-      info  = string("None\n\nJDownloader Webinterface Version '");
+      info  = string("\n\nJDownloader Webinterface Version '");
       info += string(vers);
       info += string("' was detected on the remote host\n");
 
@@ -139,11 +139,8 @@
          info += string("\nIt was possible for OpenVAS to log in into the JDownloader Webinterface\nby using 'JD' (the default username and password) as username and password.\n");
       }  
 
-      desc  = ereg_replace(
-                string:desc,
-                pattern:"None$",
-                replace:info
-                );
+      desc = desc + info;
+
    }
 
    if(JD_WEBSERVER) {

Modified: trunk/openvas-plugins/scripts/linpha_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/linpha_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/linpha_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nLinPHA Version '");
+    info = string("\n\nLinPHA Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/mambo_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/mambo_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/mambo_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -192,16 +192,12 @@
         if(!isnull(cpe))
            register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-        info = string("None\n\nmambo Version (");
+        info = string("\n\nmambo Version (");
         info += string(vers);
         info += string(") was detected on the remote host in the following directory(s):\n\n");
 	info += string(install, "\n"); 
 
-	desc = ereg_replace(
-         string:desc,
-         pattern:"None$",
-         replace:info
-	); 
+	desc = desc + info; 
 
 	if(report_verbosity > 0) {
 	  security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/mantis_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/mantis_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/mantis_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -114,16 +114,12 @@
       if(!isnull(cpe))
          register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nMantis Version (");
+    info = string("\n\nMantis Version (");
     info += string(vers);
     info += string(") was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/mldonkey_2_9_7_remote.nasl
===================================================================
--- trunk/openvas-plugins/scripts/mldonkey_2_9_7_remote.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/mldonkey_2_9_7_remote.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -95,17 +95,13 @@
    if(isnull(version) || version >< "unknown")exit(0);
    
    if(version <= "2.9.7") {
-    info  = string("Medium\n\nAccording to its version number ("); 
+    info  = string("\n\nAccording to its version number ("); 
     info += version;
     info += string(") MLDonkey is\nvulnerable, but seems to be reject connections from "); 
     info += this_host_name();
     info +=  string(".\n\n");
 
-    desc = ereg_replace(
-    	string:desc,
-    	pattern:"Medium$",
-    	replace:info
-    );
+    desc = desc + info; 
 
     security_warning(port:port,data:desc);
     exit(0);

Modified: trunk/openvas-plugins/scripts/mozilloCMS_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/mozilloCMS_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/mozilloCMS_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nmoziloCMS Version '");
+    info = string("\n\nmoziloCMS Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/mt_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/mt_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/mt_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -96,16 +96,12 @@
 
     set_kb_item(name: string("www/", port, "/movabletype"), value: string(vers," under ",install));
 
-    info = string("None\n\nMovable Type Version '");
+    info = string("\n\nMovable Type Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/multiple_EditeurScripts_products_xss.nasl
===================================================================
--- trunk/openvas-plugins/scripts/multiple_EditeurScripts_products_xss.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/multiple_EditeurScripts_products_xss.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -110,7 +110,7 @@
 }
 
 if(vuln_essoft_found) {
-  info = string("Medium\n\nThe following vulnerable EditeurScripts products were detected on the remote host:\n\n");
+  info = string("\n\nThe following vulnerable EditeurScripts products were detected on the remote host:\n\n");
   foreach found (vuln_essoft_found) {
    if(!isnull(found)) { 
     vuln=TRUE;
@@ -118,11 +118,7 @@
    }
   }  
 
- desc = ereg_replace(
-        string:desc,
-        pattern:"Medium$",
-        replace:info
-    );
+ desc = desc + info;
 
  if(vuln) {
   security_warning(port:port,data:desc); 

Modified: trunk/openvas-plugins/scripts/my_dealer_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/my_dealer_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/my_dealer_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -93,16 +93,12 @@
     
     set_kb_item(name: string("www/", port, "/mydealercms"), value: string(vers," under ",install));
 
-    info = string("None\n\nMyDealer Cms Version '");
+    info = string("\n\nMyDealer Cms Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/mysql_version.nasl
===================================================================
--- trunk/openvas-plugins/scripts/mysql_version.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/mysql_version.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,15 +103,11 @@
      set_mysql_version(port:port, version:mySQL_version);
     }
 
-    info = string("None\n\nMySQL Version '");
+    info = string("\n\nMySQL Version '");
     info += mySQL_version;
     info += string("' was detected on the remote host.\n\n");
 
-    txt = ereg_replace(
-    	string:desc,
-    	pattern:"None$",
-    	replace:info
-    ); 
+    txt = desc + info;
 
    }  
    register_service(port:port, proto:"mysql");

Modified: trunk/openvas-plugins/scripts/nagios_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/nagios_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/nagios_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -105,15 +105,11 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC); 
 
-    info = string("None\n\nNagios Version '");
+    info = string("\n\nNagios Version '");
     info += string(vers);
     info += string("' was detected on the remote host\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/nagios_statd_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/nagios_statd_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/nagios_statd_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -127,14 +127,10 @@
 
  if(strlen(result)) {
 
-   info = string("None\n\nHere are a few Information from the nagios-statd daemon received by OpenVAS:\n\n");
+   info = string("\n\nHere are a few Information from the nagios-statd daemon received by OpenVAS:\n\n");
    info += result;
 
-   desc = ereg_replace(
-    	string:desc,
-    	pattern:"None$",
-    	replace:info
-    ); 
+   desc = desc + info; 
 
  }  
 

Modified: trunk/openvas-plugins/scripts/nanocms_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/nanocms_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/nanocms_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -100,16 +100,12 @@
 
     set_kb_item(name: string("www/", port, "/nanocms"), value: string(vers," under ",install));
 
-    info = string("None\n\nNanoCMS Version '");
+    info = string("\n\nNanoCMS Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/ncftpd_35822.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ncftpd_35822.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/ncftpd_35822.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -113,18 +113,14 @@
 	      ftp_close(socket:soc1);
 	      close(soc1);
 
-              info = string("Medium.\n\nHere are the contents of the file '/etc/passwd' that\nOpenVAS was able to read from the remote host:\n\n");
+              info = string("\n\nHere are the contents of the file '/etc/passwd' that\nOpenVAS was able to read from the remote host:\n\n");
               info += cd;
               info += string("\n\nPlease delete the directory ");
               info += dir;
               info += string(" immediately.\n");
 
-              desc = ereg_replace(
-                 string:desc,
-                 pattern:"Medium$",
-                 replace:info
-              );
-              
+              desc = desc + info;
+
 	      security_warning(port:ftpPort, data:desc);
 	      exit(0);
 	    }  

Modified: trunk/openvas-plugins/scripts/net2ftp_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/net2ftp_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/net2ftp_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nnet2ftp Version '");
+    info = string("\n\nnet2ftp Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/nginx_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/nginx_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/nginx_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -83,15 +83,11 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nnginx Version '");
+    info = string("\n\nnginx Version '");
     info += string(vers);
     info += string("' was detected on the remote host.");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/notftp_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/notftp_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/notftp_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -121,16 +121,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nNotFTP Version '");
+    info = string("\n\nNotFTP Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/novaboard_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/novaboard_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/novaboard_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -87,16 +87,12 @@
 
     set_kb_item(name: string("www/", port, "/NovaBoard"), value: string(vers," under ",install));
 
-    info = string("None\n\nNovaBoard Version '");
+    info = string("\n\nNovaBoard Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/novell_edirectory_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/novell_edirectory_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/novell_edirectory_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -106,15 +106,11 @@
       if(!isnull(cpe))
          register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-      info = string("None\n\nNovell eDirectory Version '");
+      info = string("\n\nNovell eDirectory Version '");
       info += string(version[1]);
       info += string("' was detected on the remote host\n");
 
-      desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-      );
+      desc = desc + info;
     }
     if(report_verbosity > 0) {
       security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/novell_imanager_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/novell_imanager_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/novell_imanager_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -90,15 +90,11 @@
 
     set_kb_item(name: string("www/", port, "/imanager"), value: string(vers));
 
-    info = string("None\n\nNovell iManager Version '");
+    info = string("\n\nNovell iManager Version '");
     info += string(vers);
     info += string("' was detected on the remote host.\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/nsd_version.nasl
===================================================================
--- trunk/openvas-plugins/scripts/nsd_version.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/nsd_version.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -130,15 +130,11 @@
 
 		 hole_data -= string("NSD ");
 
-		 info = string("None\n\nNSD Version '"); 
+		 info = string("\n\nNSD Version '"); 
 		 info += hole_data;
 		 info += string("' was detected on the remote Host\n\n");  
 		
-		desc = ereg_replace(
-    	                        string:desc,
-                         	pattern:"None$",
-                        	replace:info
-                       );    
+		desc = desc + info;    
 
 		set_kb_item(name:"nsd/version",value:hole_data);
 		security_note(port:53, data:desc, protocol:proto);

Modified: trunk/openvas-plugins/scripts/ntop_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ntop_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/ntop_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -90,15 +90,11 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nNtop Version '");
+    info = string("\n\nNtop Version '");
     info += string(vers);
     info += string("' was detected on the remote host\n\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/open_media_collectors_database_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/open_media_collectors_database_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/open_media_collectors_database_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -97,16 +97,12 @@
 
     set_kb_item(name: string("www/", port, "/opendb"), value: string(vers," under ",install));
 
-    info = string("None\n\nOpen Media Collectors Database Version '");
+    info = string("\n\nOpen Media Collectors Database Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/opencart_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/opencart_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/opencart_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -112,16 +112,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nOpenCart Version ");
+    info = string("\n\nOpenCart Version ");
     info += string(vers);
     info += string(" was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/oracle_webLogic_server_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/oracle_webLogic_server_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/oracle_webLogic_server_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -96,15 +96,11 @@
    }  
 
 
-   info = string("None\n\nWebLogic Server Version '");
+   info = string("\n\nWebLogic Server Version '");
    info += string(vers);
    info += string("' was detected on the remote host.\n\n");
 
-   desc = ereg_replace(
-       string:desc,
-       pattern:"None$",
-       replace:info
-   );
+   desc = desc + info;
 
       if(report_verbosity > 0) {
         security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/oscommerce_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/oscommerce_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/oscommerce_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -110,7 +110,7 @@
 }
 
 if(installations) {
-    info = string("None\n\nOsCommerce was detected on the remote host in the following directory(s):\n\n"); 
+    info = string("\n\nOsCommerce was detected on the remote host in the following directory(s):\n\n"); 
     foreach found (installations) {
     	if (!get_kb_item("Software/osCommerce")) {
     	    set_kb_item(name:"Software/osCommerce", value: TRUE);
@@ -120,11 +120,7 @@
 	set_kb_item(name: string("www/", port, "/oscommerce"), value: string("unknown under ",found));
     }
    
-    desc = ereg_replace(
-    	string:desc,
-    	pattern:"None$",
-    	replace:info
-    );    
+    desc = desc + info;    
    
    if(report_verbosity > 0) { 
      security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/pdns_version.nasl
===================================================================
--- trunk/openvas-plugins/scripts/pdns_version.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/pdns_version.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -126,15 +126,11 @@
 		 version = eregmatch(pattern: "(PowerDNS [a-zA-Z ]*[0-9.]+)", string: hole_data, icase: TRUE);
 		 if(isnull(version[1]))exit(0);
 
-		 info = string("None\n\nPowerDNS Version '"); 
+		 info = string("\n\nPowerDNS Version '"); 
 		 info += version[1];
 		 info += string("' was detected on the remote Host\n\n");  
 		
- 		 desc = ereg_replace(
-    	                        string:desc,
-                         	pattern:"None$",
-                        	replace:info
-                        );    
+ 		 desc = desc + info;    
 
 		set_kb_item(name:"powerdns/version",value:version[1]);
 		num_version = eregmatch(pattern:"([0-9.]+)", string: version[1]);

Modified: trunk/openvas-plugins/scripts/perforce_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/perforce_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/perforce_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -134,15 +134,11 @@
       if(!isnull(cpe))
          register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-      info = string("None\n\nPerforce Version '");
+      info = string("\n\nPerforce Version '");
       info += version[1];
       info += string("' was detected on the remote host.\n");
 
-      desc = ereg_replace(
-             string:desc,
-             pattern:"None$",
-             replace:info
-      );
+      desc = desc + info;
     }
      
      if(report_verbosity > 0) {   

Modified: trunk/openvas-plugins/scripts/phorum_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phorum_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phorum_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nphorum Version '");
+    info = string("\n\nphorum Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/phpBugTracker_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phpBugTracker_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phpBugTracker_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -113,16 +113,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nphpBugTracker Version '");
+    info = string("\n\nphpBugTracker Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
     if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/phpScheduleIt_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phpScheduleIt_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phpScheduleIt_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nphpScheduleIt Version '");
+    info = string("\n\nphpScheduleIt Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/phpWebThings_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phpWebThings_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phpWebThings_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -105,16 +105,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nphpWebThings Version '");
+    info = string("\n\nphpWebThings Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/phpbb_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phpbb_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phpbb_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -117,16 +117,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nphpBB Version (");
+    info = string("\n\nphpBB Version (");
     info += string(vers);
     info += string(") was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/phpgroupware_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phpgroupware_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phpgroupware_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -112,16 +112,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nphpGroupWare Version '");
+    info = string("\n\nphpGroupWare Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/phpldapadmin_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phpldapadmin_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phpldapadmin_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -101,16 +101,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nphpLDAPadmin Version '");
+    info = string("\n\nphpLDAPadmin Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/phplive_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phplive_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phplive_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -100,16 +100,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nPHP Live! Version '");
+    info = string("\n\nPHP Live! Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/phpmyfaq_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phpmyfaq_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phpmyfaq_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -112,16 +112,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nphpMyFAQ Version '");
+    info = string("\n\nphpMyFAQ Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
     if(report_verbosity > 0) {
       security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/phpshop_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/phpshop_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/phpshop_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -112,16 +112,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nPhpShop Version '");
+    info = string("\n\nPhpShop Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/pligg_cms_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/pligg_cms_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/pligg_cms_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -114,16 +114,12 @@
       register_host_detail(name:"App", value:string("cpe:/a:pligg:pligg_cms"), nvt:SCRIPT_OID, desc:SCRIPT_DESC);
     }  
 
-    info = string("None\n\nPligg CMS Version '");
+    info = string("\n\nPligg CMS Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/podcast_generator_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/podcast_generator_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/podcast_generator_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -102,16 +102,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nPodcast Generator Version '");
+    info = string("\n\nPodcast Generator Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/prtg_traffic_grapher_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/prtg_traffic_grapher_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/prtg_traffic_grapher_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -95,15 +95,11 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nPRTG Traffic Grapher Version '");
+    info = string("\n\nPRTG Traffic Grapher Version '");
     info += string(vers);
     info += string("' was detected on the remote host\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/quicksilver_forums_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/quicksilver_forums_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/quicksilver_forums_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -99,16 +99,12 @@
 
     set_kb_item(name: string("www/", port, "/quicksilver"), value: string(vers," under ",install));
 
-    info = string("None\n\nQuicksilver Forums Version '");
+    info = string("\n\nQuicksilver Forums Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/realty_web_base_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/realty_web_base_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/realty_web_base_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -104,16 +104,12 @@
         if(!isnull(cpe))
            register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-         info = string("None\n\nRealty Web-Base Version '");
+         info = string("\n\nRealty Web-Base Version '");
          info += string(vers);
          info += string("' was detected on the remote host in the following directory(s):\n\n");
          info += string(install, "\n"); 
 
-	desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-        );
+	desc = desc + info;
 
          security_note(port:port,data:desc);
          exit(0);

Modified: trunk/openvas-plugins/scripts/redaxscript_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/redaxscript_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/redaxscript_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -92,16 +92,12 @@
     
     set_kb_item(name: string("www/", port, "/redaxscript"), value: string(vers," under ",install));
 
-    info = string("None\n\nRedaxscript Version '");
+    info = string("\n\nRedaxscript Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/rt_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/rt_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/rt_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -105,16 +105,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nRT: Request Tracker Version '");
+    info = string("\n\nRT: Request Tracker Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/sahana_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/sahana_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/sahana_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,16 +103,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nSahana Version '");
+    info = string("\n\nSahana Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/serendipity_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/serendipity_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/serendipity_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -114,15 +114,11 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nSerendipity Version '");
+    info = string("\n\nSerendipity Version '");
     info += string(vers[1]);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(directory, "\n");
-    desc = ereg_replace(
-    string:desc,
-    pattern:"None$",
-    replace:info
-    );
+    desc = desc + info;
 
     if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/snitz_forums_2000_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/snitz_forums_2000_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/snitz_forums_2000_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,16 +103,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nSnitz Forums 2000 Version '");
+    info = string("\n\nSnitz Forums 2000 Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/ssh_proto_version.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ssh_proto_version.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/ssh_proto_version.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -188,14 +188,10 @@
     info += string("\n", fingerprint_info);
   }
 
-  info += string("\n\nRisk factor : None\n");
   set_kb_item(name:"SSH/supportedversions/" + port,value: supported_versions);
-  
-  desc = ereg_replace(
-         string:desc,
-         pattern:"Risk factor : None$",
-         replace:info);
-
+ 
+  desc = desc + info;
+ 
          security_note(port:port,data:desc);
 	 exit(0);
 }

Modified: trunk/openvas-plugins/scripts/sun_dir_server_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/sun_dir_server_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/sun_dir_server_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -100,15 +100,11 @@
     if(!isnull(version[1])) {
       set_kb_item(name:string("ldap/",port,"/SunJavaDirServer"), value:version[1]);
       register_host_detail(name:"App", value:string("cpe:/a:sun:java_system_directory_server:",version[1]), nvt:SCRIPT_OID, desc:SCRIPT_DESC);
-      info = string("None\n\nSun Java System Directory Server Version '");
+      info = string("\n\nSun Java System Directory Server Version '");
       info += string(version[1]);
       info += string("' was detected on the remote host\n");
 
-      desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-      );
+      desc = desc + info;
     }
     if(report_verbosity > 0) {
       security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/support_incident_tracker_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/support_incident_tracker_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/support_incident_tracker_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -102,16 +102,12 @@
     
     set_kb_item(name: string("www/", port, "/support_incident_tracker"), value: string(vers," under ",install));
 
-    info = string("None\n\nSiT! Support Incident Tracker Version '");
+    info = string("\n\nSiT! Support Incident Tracker Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/testlink_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/testlink_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/testlink_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -100,16 +100,12 @@
         register_host_detail(name:"App", value:"cpe:/a:teamst:testlink", nvt:SCRIPT_OID, desc:SCRIPT_DESC);
       }  
 
-      info = string("None\n\nTestLink Version '");
+      info = string("\n\nTestLink Version '");
       info += string(vers);
       info += string("' was detected on the remote host in the following directory(s):\n\n");
       info += string(install, "\n");
 
-      desc = ereg_replace(
-          string:desc,
-          pattern:"None$",
-          replace:info
-      );
+      desc = desc + info;
 
          if(report_verbosity > 0) {
            security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/tftgallery_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/tftgallery_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/tftgallery_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -101,16 +101,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nTFT Gallery Version '");
+    info = string("\n\nTFT Gallery Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/thin_webserver_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/thin_webserver_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/thin_webserver_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -71,15 +71,11 @@
 
     set_kb_item(name: string("www/", port, "/thin"), value: string(vers));
 
-    info = string("None\n\nThin Version '");
+    info = string("\n\nThin Version '");
     info += string(vers);
     info += string("' was detected on the remote host\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/unbound_version.nasl
===================================================================
--- trunk/openvas-plugins/scripts/unbound_version.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/unbound_version.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -126,15 +126,11 @@
 
 		 hole_data -= string("unbound ");
 
-		 info = string("None\n\nUnbound Version '"); 
+		 info = string("\n\nUnbound Version '"); 
 		 info += hole_data;
 		 info += string("' was detected on the remote Host\n\n");  
 		
-		desc = ereg_replace(
-    	                        string:desc,
-                         	pattern:"None$",
-                        	replace:info
-                       );    
+		desc = desc + info;    
 
 		set_kb_item(name:"unbound/version",value:hole_data);
   register_host_detail(name:"App", value:string("cpe:/a:unbound:unbound:",hole_data), nvt:SCRIPT_OID, desc:SCRIPT_DESC);

Modified: trunk/openvas-plugins/scripts/viewvc_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/viewvc_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/viewvc_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -107,16 +107,12 @@
      if(!isnull(cpe))
         register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
  
-     info = string("None\n\nViewVC Version '");
+     info = string("\n\nViewVC Version '");
      info += string(vers);
      info += string("' was detected on the remote host in the following directory(s):\n\n");
      info += string(install, "\n");
      
-     desc = ereg_replace(
-         string:desc,
-         pattern:"None$",
-         replace:info
-     );
+     desc = desc + info;
 
         if(report_verbosity > 0) {
           security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/webcalendar_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/webcalendar_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/webcalendar_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -103,16 +103,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nWebCalendar Version '");
+    info = string("\n\nWebCalendar Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/webfileexplorer_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/webfileexplorer_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/webfileexplorer_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -105,16 +105,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-    info = string("None\n\nWebFileExplorer Version '");
+    info = string("\n\nWebFileExplorer Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/webmedia_explorer_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/webmedia_explorer_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/webmedia_explorer_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -106,16 +106,12 @@
     if(!isnull(cpe))
        register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
  
-    info = string("None\n\nWebmedia Explorer Version '");
+    info = string("\n\nWebmedia Explorer Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n"); 
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );    
+    desc = desc + info;    
        
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/xmpp_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/xmpp_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/xmpp_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -199,12 +199,8 @@
 
 if(server_name && server_version) {
  
-  info = string("None\n\nXMPP Server '",server_name, "' version '", server_version, "' was detected by OpenVAS.\n");
-  desc = ereg_replace(
-    string:desc,
-    pattern:"None$",
-    replace:info
-  );
+  info = string("\n\nXMPP Server '",server_name, "' version '", server_version, "' was detected by OpenVAS.\n");
+  desc = desc + info;
  
 }
 

Modified: trunk/openvas-plugins/scripts/zabbix_web_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/zabbix_web_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/zabbix_web_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -98,16 +98,12 @@
       register_host_detail(name:"App", value:string("cpe:/a:zabbix:zabbix"), nvt:SCRIPT_OID, desc:SCRIPT_DESC);
     }  
 
-    info = string("None\n\nZabbix Version '");
+    info = string("\n\nZabbix Version '");
     info += string(vers);
     info += string("' was detected on the remote host in the following directory(s):\n\n");
     info += string(install, "\n");
 
-    desc = ereg_replace(
-        string:desc,
-        pattern:"None$",
-        replace:info
-    );
+    desc = desc + info;
 
        if(report_verbosity > 0) {
          security_note(port:port,data:desc);

Modified: trunk/openvas-plugins/scripts/znc_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/znc_detect.nasl	2011-11-07 16:36:03 UTC (rev 12034)
+++ trunk/openvas-plugins/scripts/znc_detect.nasl	2011-11-07 17:29:01 UTC (rev 12035)
@@ -105,15 +105,11 @@
             if(!isnull(cpe))
                register_host_detail(name:"App", value:cpe, nvt:SCRIPT_OID, desc:SCRIPT_DESC);
 
-            info = string("None\n\nZNC Version '");
+            info = string("\n\nZNC Version '");
             info += string(vers);
             info += string("' was detected on the remote host\n");
 
-            desc = ereg_replace(
-                string:desc,
-                pattern:"None$",
-                replace:info
-            );
+            desc = desc + info;
         }	
        }
 	 



More information about the Openvas-commits mailing list