From 1a39740b163eab78a754c6ab925c0629b8f519a7 Mon Sep 17 00:00:00 2001 From: Mark Unwin Date: Fri, 1 Apr 2016 09:07:21 +1000 Subject: [PATCH 01/98] When running discovery and we have an IP that gives us no information from SNMP or SSH AND we have port 5060 open, assign device type 'voip phone'. --- code_igniter/application/controllers/discovery.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code_igniter/application/controllers/discovery.php b/code_igniter/application/controllers/discovery.php index 78b6dcd2e..a151d9b99 100644 --- a/code_igniter/application/controllers/discovery.php +++ b/code_igniter/application/controllers/discovery.php @@ -1426,6 +1426,14 @@ public function process_subnet() } } + # in the case where 5060 is detected and we have no other information, assign type 'voip phone' + if (empty($details->type) and + empty($details->snmp_oid) and + empty($details->uuid) and + stripos($details->nmap_result, 'Discovered open port 5060') !== false) { + $details->type = 'voip phone'; + } + # We have new details - create a new system key $details->system_key = $this->m_system->create_system_key($details, $display); $details = dns_validate($details, $display); From 40a4729a9d880676e210cc1bf062ff8572e4fa8c Mon Sep 17 00:00:00 2001 From: Mark Unwin Date: Fri, 1 Apr 2016 10:07:57 +1000 Subject: [PATCH 02/98] Added code to log and exclude from the listing invalid XML files for groups and reports on the Activate Group | Report pages. --- .../application/controllers/admin_group.php | 12 +++++++++--- .../application/controllers/admin_report.php | 17 ++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/code_igniter/application/controllers/admin_group.php b/code_igniter/application/controllers/admin_group.php index 24f96ef18..26339c49e 100644 --- a/code_igniter/application/controllers/admin_group.php +++ b/code_igniter/application/controllers/admin_group.php @@ -50,6 +50,7 @@ public function index() public function activate_group() { + $log_details = new stdClass(); if ($handle = opendir(BASEPATH.'../application/controllers/groups')) { $i = 0; $this->load->model("m_oa_group"); @@ -59,9 +60,14 @@ public function activate_group() $file_handle = fopen(BASEPATH.'../application/controllers/groups/'.$file, "rb"); $contents = fread($file_handle, filesize(BASEPATH.'../application/controllers/groups/'.$file)); try { - $xml = new SimpleXMLElement($contents); - } catch (Exception $e) { - echo $e; + $xml = @new SimpleXMLElement($contents); + } catch (Exception $error) { + // $errors = libxml_get_errors(); + // print_r($errors); + $log_details->message = "Invalid XML for group in file " . BASEPATH.'../application/controllers/groups/'.$file; + $log_details->file = 'system'; + stdlog($log_details); + continue; } $group_name = $xml->details->group_name; $group_icon = $xml->details->group_icon; diff --git a/code_igniter/application/controllers/admin_report.php b/code_igniter/application/controllers/admin_report.php index ca7a40275..77f94253a 100644 --- a/code_igniter/application/controllers/admin_report.php +++ b/code_igniter/application/controllers/admin_report.php @@ -50,6 +50,7 @@ public function index() public function activate_report() { + $log_details = new stdClass(); if ($handle = opendir(BASEPATH.'../application/controllers/reports')) { $i = 0; $this->load->model("m_oa_report"); @@ -60,16 +61,14 @@ public function activate_report() $file_handle = fopen(BASEPATH.'../application/controllers/reports/'.$file, "rb"); $contents = fread($file_handle, filesize(BASEPATH.'../application/controllers/reports/'.$file)); try { - $xml = new SimpleXMLElement($contents); + $xml = @new SimpleXMLElement($contents); } catch (Exception $error) { - $errors = libxml_get_errors(); - echo "Invalid XML.
\n
\n";
-                        print_r($errors);
-                        // not a valid XML string
-                        echo'Invalid XML input for: '.$file;
-                        echo "
\n";
-                        print_r($xml);
-                        exit;
+                        // $errors = libxml_get_errors();
+                        // print_r($errors);
+                        $log_details->message = "Invalid XML for report in file " . BASEPATH.'../application/controllers/reports/'.$file;
+                        $log_details->file = 'system';
+                        stdlog($log_details);
+                        continue;
                     }
                     $report_name = $xml->details->report_name;
                     $report_description = $xml->details->report_description;

From f8ac21d52e5e213d17a41b4d88ca46b810d2db33 Mon Sep 17 00:00:00 2001
From: Mark Unwin 
Date: Fri, 1 Apr 2016 11:14:50 +1000
Subject: [PATCH 03/98] Provide flag (manually set) in the linux discover
 subnet script to force a ping check and only attempt scanning if a device
 responds to the ping.

---
 other/discover_subnet.sh | 57 ++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/other/discover_subnet.sh b/other/discover_subnet.sh
index 9a3e1b30b..84e100623 100755
--- a/other/discover_subnet.sh
+++ b/other/discover_subnet.sh
@@ -51,6 +51,7 @@ system_hostname=$(hostname 2>/dev/null)
 timing="-T4"
 sequential="n"
 os_scan="n"
+force_ping="n"
 
 # OSX - nmap not in _www user's path
 if [[ $(uname) == "Darwin" ]]; then
@@ -97,6 +98,10 @@ if [ "$help" == "y" ]; then
 	echo "     1 - Minimal Output."
 	echo "    *2 - Verbose output."
 	echo ""
+	echo "  force_ping"
+	echo "    *n - When discovering devices, do not check for ping response."
+	echo "     y - Check for a ping response and only discover those devices that do respond."
+	echo ""
 	echo "  os_scan"
 	echo "    *n - Do not use the -O Nmap flag when scanning devices."
 	echo "     y - Use -O (will slow down scan and requires SUID be set on the Nmap binary."
@@ -199,33 +204,35 @@ fi
 
 i=0
 j=0
-# removed the below for 1.12.2 - scan every IP now as we're checking for devices not responding to a ping
-# for line in $(nmap -v -sn -n "$timing" "$subnet_range" 2>/dev/null | grep "scan report for"); do
-# 	if [ "$debugging" -gt 0 ]; then
-# 		echo "$line"
-# 	fi
-# 	host=$(echo "$line" | cut -d" " -f5)
-# 	let "i = i + 1"
-# 	if [[ "$line" == *"[host down]"* ]]; then
-# 		if [[ "$log_no_response" == "y" ]]; then
-# 			log_entry="Non responsive ip address $host"
-# 			write_log "$log_entry"
-# 		fi
-# 	else
-# 		let "j = j + 1"
-# 		hosts="$hosts"$'\n'"$host"
-# 	fi
-# done
-
 hosts=""
-for line in $(nmap -n -sL "$subnet_range" 2>/dev/null | grep "Nmap scan report for" | cut -d" " -f5); do
-	let "i = i + 1"
-	hosts="$hosts"$'\n'"$line"
-done
+# removed the below for 1.12.2 - scan every IP now as we're checking for devices not responding to a ping
+if [ "$force_ping" == "y" ]; then
+	for line in $(nmap -v -sn -n "$timing" "$subnet_range" 2>/dev/null | grep "scan report for"); do
+		if [ "$debugging" -gt 0 ]; then
+			echo "$line"
+		fi
+		host=$(echo "$line" | cut -d" " -f5)
+		let "i = i + 1"
+		if [[ "$line" == *"[host down]"* ]]; then
+			if [[ "$log_no_response" == "y" ]]; then
+				log_entry="Non responsive ip address $host"
+				write_log "$log_entry"
+			fi
+		else
+			let "j = j + 1"
+			hosts="$hosts"$'\n'"$host"
+		fi
+	done
+else
+	for line in $(nmap -n -sL "$subnet_range" 2>/dev/null | grep "Nmap scan report for" | cut -d" " -f5); do
+		let "i = i + 1"
+		hosts="$hosts"$'\n'"$line"
+	done
 
-if [ "$debugging" -gt 0 ]; then
-	echo "Total ip addresses: $i"
-	#echo "Total responding ip addresses: $j"
+	if [ "$debugging" -gt 0 ]; then
+		echo "Total ip addresses: $i"
+		#echo "Total responding ip addresses: $j"
+	fi
 fi
 
 result_file=""

From 80642bcfa5060eab6bf5c80dc0e8266e250327db Mon Sep 17 00:00:00 2001
From: Mark Unwin 
Date: Fri, 1 Apr 2016 11:40:55 +1000
Subject: [PATCH 04/98] OMK-1512 - Seaching improvement.

---
 code_igniter/application/controllers/main.php | 2 ++
 code_igniter/application/models/m_system.php  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code_igniter/application/controllers/main.php b/code_igniter/application/controllers/main.php
index 3b4d4d389..54cac345d 100644
--- a/code_igniter/application/controllers/main.php
+++ b/code_igniter/application/controllers/main.php
@@ -594,11 +594,13 @@ public function search_device()
     {
         # search for a match on PRODUCTION devices only.
         # search for name, ip
+        $this->data['search'] = '';
         if (isset($_POST['search'])) {
             $this->data['search'] = urldecode($_POST['search']);
         }
         $this->data['search'] = html_entity_decode($this->data['search']);
         if ($this->data['search'] == '') {
+            //exit();
             redirect('main/list_groups/');
         }
 
diff --git a/code_igniter/application/models/m_system.php b/code_igniter/application/models/m_system.php
index 96ee62cc6..5d0c64ac2 100644
--- a/code_igniter/application/models/m_system.php
+++ b/code_igniter/application/models/m_system.php
@@ -706,7 +706,8 @@ public function search_device($search)
 			WHERE ( system.hostname LIKE ? OR
 				system.fqdn LIKE ? OR
 				system.domain LIKE ? OR
-				system.man_ip_address LIKE ? OR
+                system.man_ip_address LIKE ? OR
+                system.man_ip_address LIKE ? OR
 				ip.ip LIKE ? ) AND
 				system.man_status = 'production' AND
 				oa_group_user.user_id = ? AND
@@ -714,8 +715,7 @@ public function search_device($search)
 			GROUP BY system.system_id
 			ORDER BY system.hostname";
         $sql = $this->clean_sql($sql);
-        #$data = array("$search", "$search", "$search", "$search_ip", "$search_ip", "$search", $this->user->user_id);
-        $data = array("$search", "$search", "$search", "$search", "$search_ip", $this->user->user_id);
+        $data = array("$search", "$search", "$search", "$search", "$search_ip", "$search_ip", $this->user->user_id);
         $query = $this->db->query($sql, $data);
         $result = $query->result();
         for ($i = 0; $i
Date: Fri, 1 Apr 2016 12:00:44 +1000
Subject: [PATCH 05/98] Improvement for search.

---
 code_igniter/application/models/m_system.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/code_igniter/application/models/m_system.php b/code_igniter/application/models/m_system.php
index 5d0c64ac2..552bb0bcd 100644
--- a/code_igniter/application/models/m_system.php
+++ b/code_igniter/application/models/m_system.php
@@ -692,7 +692,9 @@ public function search_device($search)
         }
         $myip = explode(".", $search_ip);
         foreach ($myip as $index => $data) {
-            $myip[$index] = mb_substr("000".$myip[$index], -3);
+            #$myip[$index] = mb_substr("000".$myip[$index], -3);
+            #$myip[$index] = mb_substr("%%%".$myip[$index], -3);
+            $myip[$index] = '%' . $myip[$index] . '%';
         }
         $search_ip = "%".implode(".", $myip)."%";
         $search = "%".$search."%";
@@ -720,17 +722,11 @@ public function search_device($search)
         $result = $query->result();
         for ($i = 0; $iip, $search_ip) !== false) {
-                $result[$i]->ip  = $this->ip_address_from_db($result[$i]->ip);
+                $result[$i]->ip = $this->ip_address_from_db($result[$i]->ip);
             } else {
                 $result[$i]->ip = $this->ip_address_from_db($result[$i]->man_ip_address);
             }
         }
-        // echo "
\n";
-        // echo $this->db->last_query();
-        // print_r($this->data);
-        // print_r($result);
-        // echo "
\n";
-        // exit();
         return ($result);
     }
 
@@ -760,7 +756,7 @@ public function search_device_columns()
         $i = new stdclass();
         $i->column_order = '1';
         $i->column_name = 'IP Address';
-        $i->column_variable = 'ip_address';
+        $i->column_variable = 'ip';
         $i->column_type = "text";
         $i->column_align = "left";
         $i->column_secondary = "";

From 5c735e8654a89f606eb43fa2f6a66e4d6dcbbb61 Mon Sep 17 00:00:00 2001
From: Mark Unwin 
Date: Fri, 1 Apr 2016 12:11:43 +1000
Subject: [PATCH 06/98] All man_icon in group definitions replaced by icon.

---
 code_igniter/application/controllers/groups/AllDevices.xml  | 4 ++--
 code_igniter/application/controllers/groups/AllPrinters.xml | 2 +-
 .../application/controllers/groups/Apple_OSX_Systems.xml    | 4 ++--
 .../application/controllers/groups/CentOSLinuxSystems.xml   | 4 ++--
 .../application/controllers/groups/CiscoLinuxSystems.xml    | 4 ++--
 code_igniter/application/controllers/groups/Computers.xml   | 4 ++--
 code_igniter/application/controllers/groups/DHCPServers.xml | 4 ++--
 code_igniter/application/controllers/groups/DNSServers.xml  | 4 ++--
 .../application/controllers/groups/DatabaseServers.xml      | 4 ++--
 .../application/controllers/groups/DebianSystems.xml        | 4 ++--
 .../controllers/groups/DefaultOrganisationowneditems.xml    | 2 +-
 .../application/controllers/groups/DevicesDeleted.xml       | 4 ++--
 code_igniter/application/controllers/groups/DevicesLost.xml | 4 ++--
 .../application/controllers/groups/DevicesMaintenance.xml   | 4 ++--
 .../application/controllers/groups/DevicesRetired.xml       | 4 ++--
 .../application/controllers/groups/DevicesUnallocated.xml   | 4 ++--
 .../application/controllers/groups/DomainControllers.xml    | 4 ++--
 .../application/controllers/groups/DuplicateUUIDs.xml       | 4 ++--
 .../application/controllers/groups/ExchangeServers.xml      | 4 ++--
 code_igniter/application/controllers/groups/FileServers.xml | 4 ++--
 .../controllers/groups/GNU_LinuxSystems-Physical.xml        | 4 ++--
 .../application/controllers/groups/GNU_LinuxSystems.xml     | 4 ++--
 .../controllers/groups/ItemsinDefaultLocation.xml           | 2 +-
 code_igniter/application/controllers/groups/Laptops.xml     | 4 ++--
 .../application/controllers/groups/NonProductionDevices.xml | 4 ++--
 .../groups/Open-AudITEnterpriseManagedDevices.xml           | 4 ++--
 .../controllers/groups/OracleUnbreakableLinuxSystems.xml    | 4 ++--
 code_igniter/application/controllers/groups/Phones.xml      | 4 ++--
 .../application/controllers/groups/PublicIpDevices.xml      | 4 ++--
 .../application/controllers/groups/RedHatSystems.xml        | 4 ++--
 code_igniter/application/controllers/groups/Routers.xml     | 2 +-
 code_igniter/application/controllers/groups/SSHServers.xml  | 4 ++--
 code_igniter/application/controllers/groups/Switches.xml    | 2 +-
 .../application/controllers/groups/UbuntuSystems.xml        | 4 ++--
 .../application/controllers/groups/UnAssignedSystems.xml    | 6 +++---
 .../application/controllers/groups/UnClassedsystems.xml     | 4 ++--
 .../application/controllers/groups/UnSerialsystems.xml      | 6 +++---
 code_igniter/application/controllers/groups/UnixSystems.xml | 4 ++--
 .../application/controllers/groups/UnknownDevices.xml       | 2 +-
 .../application/controllers/groups/VirtualGuests.xml        | 4 ++--
 .../application/controllers/groups/VirtualHosts.xml         | 4 ++--
 code_igniter/application/controllers/groups/WebServers.xml  | 4 ++--
 .../application/controllers/groups/Windows2000Systems.xml   | 4 ++--
 .../application/controllers/groups/Windows2003Systems.xml   | 4 ++--
 .../application/controllers/groups/Windows2008Systems.xml   | 4 ++--
 .../application/controllers/groups/Windows2012Systems.xml   | 4 ++--
 .../application/controllers/groups/Windows7Systems.xml      | 4 ++--
 .../application/controllers/groups/Windows8Systems.xml      | 4 ++--
 .../application/controllers/groups/WindowsComputers.xml     | 4 ++--
 .../application/controllers/groups/WindowsServers.xml       | 4 ++--
 .../application/controllers/groups/WindowsXPSystems.xml     | 4 ++--
 .../application/controllers/groups/Workstations.xml         | 4 ++--
 52 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/code_igniter/application/controllers/groups/AllDevices.xml b/code_igniter/application/controllers/groups/AllDevices.xml
index 43e6bccbd..fcc1df243 100644
--- a/code_igniter/application/controllers/groups/AllDevices.xml
+++ b/code_igniter/application/controllers/groups/AllDevices.xml
@@ -7,14 +7,14 @@
 		1
 		Any items that have their status attribute set to 'production'.
 		device
-		
+		
 		devices
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/AllPrinters.xml b/code_igniter/application/controllers/groups/AllPrinters.xml
index fe0992672..8b6e973f3 100644
--- a/code_igniter/application/controllers/groups/AllPrinters.xml
+++ b/code_igniter/application/controllers/groups/AllPrinters.xml
@@ -6,7 +6,7 @@
 		
 		1
 		device
-		
+		
 		printer
 		Any items that have their status attribute set to 'production' and have their type attribute set to 'printer'.
 	
diff --git a/code_igniter/application/controllers/groups/Apple_OSX_Systems.xml b/code_igniter/application/controllers/groups/Apple_OSX_Systems.xml
index f284d0e0b..d93439374 100644
--- a/code_igniter/application/controllers/groups/Apple_OSX_Systems.xml
+++ b/code_igniter/application/controllers/groups/Apple_OSX_Systems.xml
@@ -8,13 +8,13 @@
 		os
 		apple
 		Any items that have their status attribute set to 'production' and have their os_family attribute containing 'osx'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/CentOSLinuxSystems.xml b/code_igniter/application/controllers/groups/CentOSLinuxSystems.xml
index 7bfea258b..f36feab8e 100644
--- a/code_igniter/application/controllers/groups/CentOSLinuxSystems.xml
+++ b/code_igniter/application/controllers/groups/CentOSLinuxSystems.xml
@@ -8,13 +8,13 @@
 		os
 		centos
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'CentOS'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/CiscoLinuxSystems.xml b/code_igniter/application/controllers/groups/CiscoLinuxSystems.xml
index 41e3b5730..b457c3708 100644
--- a/code_igniter/application/controllers/groups/CiscoLinuxSystems.xml
+++ b/code_igniter/application/controllers/groups/CiscoLinuxSystems.xml
@@ -8,13 +8,13 @@
 		os
 		cisco
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Linux' and their manufacturer set to 'Cisco'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Computers.xml b/code_igniter/application/controllers/groups/Computers.xml
index db4fbaf88..9146a20ad 100644
--- a/code_igniter/application/controllers/groups/Computers.xml
+++ b/code_igniter/application/controllers/groups/Computers.xml
@@ -8,13 +8,13 @@
 		device
 		computer
 		Any items that have their status attribute set to 'production' and have their type attribute set to 'computer'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DHCPServers.xml b/code_igniter/application/controllers/groups/DHCPServers.xml
index 1102cc280..8bc88fac7 100644
--- a/code_igniter/application/controllers/groups/DHCPServers.xml
+++ b/code_igniter/application/controllers/groups/DHCPServers.xml
@@ -8,13 +8,13 @@
 		application
 		application
 		Any items that have their status attribute set to 'production' and have a service installed called 'DHCP Server'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DNSServers.xml b/code_igniter/application/controllers/groups/DNSServers.xml
index 365815d10..f7fd19a63 100644
--- a/code_igniter/application/controllers/groups/DNSServers.xml
+++ b/code_igniter/application/controllers/groups/DNSServers.xml
@@ -8,13 +8,13 @@
 		application
 		application
 		Any items that have their status attribute set to 'production' and have a service installed called 'DNS Server'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DatabaseServers.xml b/code_igniter/application/controllers/groups/DatabaseServers.xml
index 7085ce1fd..aa2174b5c 100644
--- a/code_igniter/application/controllers/groups/DatabaseServers.xml
+++ b/code_igniter/application/controllers/groups/DatabaseServers.xml
@@ -6,7 +6,7 @@
 		
 		1
 		application
-		
+		
 		database
 		Any items that have their status attribute set to 'production' and have their os_name attribute containing 'server' and have rows in the server table that is of type 'database'.
 	
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DebianSystems.xml b/code_igniter/application/controllers/groups/DebianSystems.xml
index fc47e29a4..f74e4bb82 100644
--- a/code_igniter/application/controllers/groups/DebianSystems.xml
+++ b/code_igniter/application/controllers/groups/DebianSystems.xml
@@ -9,13 +9,13 @@
 		os
 		debian
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Debian'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DefaultOrganisationowneditems.xml b/code_igniter/application/controllers/groups/DefaultOrganisationowneditems.xml
index 5fa87c2ea..99bed5d01 100644
--- a/code_igniter/application/controllers/groups/DefaultOrganisationowneditems.xml
+++ b/code_igniter/application/controllers/groups/DefaultOrganisationowneditems.xml
@@ -14,7 +14,7 @@
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DevicesDeleted.xml b/code_igniter/application/controllers/groups/DevicesDeleted.xml
index 14bae4678..86fd74cf0 100644
--- a/code_igniter/application/controllers/groups/DevicesDeleted.xml
+++ b/code_igniter/application/controllers/groups/DevicesDeleted.xml
@@ -8,13 +8,13 @@
 		device
 		devices
 		Any items that have their status attribute set to 'deleted'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DevicesLost.xml b/code_igniter/application/controllers/groups/DevicesLost.xml
index 9be40b4e1..84cbe6e9c 100644
--- a/code_igniter/application/controllers/groups/DevicesLost.xml
+++ b/code_igniter/application/controllers/groups/DevicesLost.xml
@@ -8,13 +8,13 @@
 		device
 		devices
 		Any items that have their status attribute set to 'lost'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DevicesMaintenance.xml b/code_igniter/application/controllers/groups/DevicesMaintenance.xml
index d68da0e27..f80796397 100644
--- a/code_igniter/application/controllers/groups/DevicesMaintenance.xml
+++ b/code_igniter/application/controllers/groups/DevicesMaintenance.xml
@@ -8,13 +8,13 @@
 		device
 		devices
 		Any items that have their status attribute set to 'maintenance'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DevicesRetired.xml b/code_igniter/application/controllers/groups/DevicesRetired.xml
index eb2c6c3ab..0ae9ff216 100644
--- a/code_igniter/application/controllers/groups/DevicesRetired.xml
+++ b/code_igniter/application/controllers/groups/DevicesRetired.xml
@@ -8,13 +8,13 @@
 		device
 		devices
 		Any items that have their status attribute set to 'retired'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DevicesUnallocated.xml b/code_igniter/application/controllers/groups/DevicesUnallocated.xml
index ef7428f9d..bed5f46db 100644
--- a/code_igniter/application/controllers/groups/DevicesUnallocated.xml
+++ b/code_igniter/application/controllers/groups/DevicesUnallocated.xml
@@ -8,13 +8,13 @@
 		device
 		devices
 		Any items that have their status attribute set to 'unallocated'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DomainControllers.xml b/code_igniter/application/controllers/groups/DomainControllers.xml
index 7101974f8..3b9424e97 100644
--- a/code_igniter/application/controllers/groups/DomainControllers.xml
+++ b/code_igniter/application/controllers/groups/DomainControllers.xml
@@ -8,13 +8,13 @@
 		application
 		ldap
 		Any items that have their status attribute set to 'production' and have their windows_domain_role attribute set to 'Domain Controller'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/DuplicateUUIDs.xml b/code_igniter/application/controllers/groups/DuplicateUUIDs.xml
index 754ddbf8b..694d50269 100644
--- a/code_igniter/application/controllers/groups/DuplicateUUIDs.xml
+++ b/code_igniter/application/controllers/groups/DuplicateUUIDs.xml
@@ -6,14 +6,14 @@
 		1
 		Any items in the system table that have an identical UUID entry regardless of status.
 		general
-		
+		
 		general
 	
 	
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/ExchangeServers.xml b/code_igniter/application/controllers/groups/ExchangeServers.xml
index 4049b72b2..a01dff1a0 100644
--- a/code_igniter/application/controllers/groups/ExchangeServers.xml
+++ b/code_igniter/application/controllers/groups/ExchangeServers.xml
@@ -8,13 +8,13 @@
 		application
 		email
 		Any items that have their status attribute set to 'production' and have a service installed called 'Microsoft Exchange Information Store'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/FileServers.xml b/code_igniter/application/controllers/groups/FileServers.xml
index 48e660814..b3af36480 100644
--- a/code_igniter/application/controllers/groups/FileServers.xml
+++ b/code_igniter/application/controllers/groups/FileServers.xml
@@ -8,13 +8,13 @@
 		application
 		share
 		Any items that have their status attribute set to 'production' and have their function attribute set to 'FILE'.
-		
+		
 	
 	
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/GNU_LinuxSystems-Physical.xml b/code_igniter/application/controllers/groups/GNU_LinuxSystems-Physical.xml
index 85461f416..3d23160cb 100644
--- a/code_igniter/application/controllers/groups/GNU_LinuxSystems-Physical.xml
+++ b/code_igniter/application/controllers/groups/GNU_LinuxSystems-Physical.xml
@@ -8,13 +8,13 @@
 		os
 		linux
 		Any items that have their status attribute set to 'production' and have their os_group attribute set to 'linux' and are not KNOWN to be virtual (But could be).
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/GNU_LinuxSystems.xml b/code_igniter/application/controllers/groups/GNU_LinuxSystems.xml
index 66fbb5fe0..af1c1a615 100644
--- a/code_igniter/application/controllers/groups/GNU_LinuxSystems.xml
+++ b/code_igniter/application/controllers/groups/GNU_LinuxSystems.xml
@@ -8,13 +8,13 @@
 		os
 		linux
 		Any items that have their status attribute set to 'production' and have their os_group attribute set to 'linux'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/ItemsinDefaultLocation.xml b/code_igniter/application/controllers/groups/ItemsinDefaultLocation.xml
index 51142caa2..9454513bc 100644
--- a/code_igniter/application/controllers/groups/ItemsinDefaultLocation.xml
+++ b/code_igniter/application/controllers/groups/ItemsinDefaultLocation.xml
@@ -14,7 +14,7 @@
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Laptops.xml b/code_igniter/application/controllers/groups/Laptops.xml
index ff7e09fdc..5be98c2e0 100644
--- a/code_igniter/application/controllers/groups/Laptops.xml
+++ b/code_igniter/application/controllers/groups/Laptops.xml
@@ -8,13 +8,13 @@
 		device
 		computer
 		Any items that have their status attribute set to 'production' and have their class attribute set to 'laptop'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/NonProductionDevices.xml b/code_igniter/application/controllers/groups/NonProductionDevices.xml
index f5ffe56f2..e8b39e1a8 100644
--- a/code_igniter/application/controllers/groups/NonProductionDevices.xml
+++ b/code_igniter/application/controllers/groups/NonProductionDevices.xml
@@ -8,13 +8,13 @@
 		device
 		devices
 		Any items that have their status attribute not set to 'production'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Open-AudITEnterpriseManagedDevices.xml b/code_igniter/application/controllers/groups/Open-AudITEnterpriseManagedDevices.xml
index 3faabfbdf..c15ad700a 100644
--- a/code_igniter/application/controllers/groups/Open-AudITEnterpriseManagedDevices.xml
+++ b/code_igniter/application/controllers/groups/Open-AudITEnterpriseManagedDevices.xml
@@ -7,14 +7,14 @@
 		1
 		Any items that have their status attribute set to 'production' and their oae_manage attribute set to 'y'.
 		device
-		
+		
 		devices
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/OracleUnbreakableLinuxSystems.xml b/code_igniter/application/controllers/groups/OracleUnbreakableLinuxSystems.xml
index 891138ca9..6671098ee 100644
--- a/code_igniter/application/controllers/groups/OracleUnbreakableLinuxSystems.xml
+++ b/code_igniter/application/controllers/groups/OracleUnbreakableLinuxSystems.xml
@@ -8,13 +8,13 @@
 		os
 		oracle
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'RedHat' and the os_name contains 'Oracle'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Phones.xml b/code_igniter/application/controllers/groups/Phones.xml
index fb11f5ef9..2ee804401 100644
--- a/code_igniter/application/controllers/groups/Phones.xml
+++ b/code_igniter/application/controllers/groups/Phones.xml
@@ -8,13 +8,13 @@
 		device
 		cell_phone
 		Any items that have their status attribute set to 'production' and have their type attribute set to 'phone', 'smart phone' or 'ip phone'.
-		
+		
 	
 	
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/PublicIpDevices.xml b/code_igniter/application/controllers/groups/PublicIpDevices.xml
index 4bedacd34..ffdd18bf3 100644
--- a/code_igniter/application/controllers/groups/PublicIpDevices.xml
+++ b/code_igniter/application/controllers/groups/PublicIpDevices.xml
@@ -7,14 +7,14 @@
 		1
 		Any items that have a public ip address and their status attribute set to production.
 		device
-		
+		
 		devices
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/RedHatSystems.xml b/code_igniter/application/controllers/groups/RedHatSystems.xml
index d2094ac3b..1e37e7f65 100644
--- a/code_igniter/application/controllers/groups/RedHatSystems.xml
+++ b/code_igniter/application/controllers/groups/RedHatSystems.xml
@@ -8,13 +8,13 @@
 		os
 		redhat
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'RedHat'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Routers.xml b/code_igniter/application/controllers/groups/Routers.xml
index 303e1a33f..7d5573fb0 100644
--- a/code_igniter/application/controllers/groups/Routers.xml
+++ b/code_igniter/application/controllers/groups/Routers.xml
@@ -8,7 +8,7 @@
 		device
 		router
 		Any items that have their status attribute set to 'production' and have their type attribute set to 'router'.
-		
+		
 	
 	
 		
diff --git a/code_igniter/application/controllers/groups/SSHServers.xml b/code_igniter/application/controllers/groups/SSHServers.xml
index 3fe757f31..937dc9da0 100644
--- a/code_igniter/application/controllers/groups/SSHServers.xml
+++ b/code_igniter/application/controllers/groups/SSHServers.xml
@@ -8,13 +8,13 @@
 		application
 		ssh
 		Any items that have their status attribute set to 'production' and have software installed called 'openssh-server'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Switches.xml b/code_igniter/application/controllers/groups/Switches.xml
index 5ed8717f4..3e6d26871 100644
--- a/code_igniter/application/controllers/groups/Switches.xml
+++ b/code_igniter/application/controllers/groups/Switches.xml
@@ -8,7 +8,7 @@
 		device
 		switch
 		Any items that have their status attribute set to 'production' and have their type attribute set to 'switch'.
-		
+		
 	
 	
 		
diff --git a/code_igniter/application/controllers/groups/UbuntuSystems.xml b/code_igniter/application/controllers/groups/UbuntuSystems.xml
index fb5c5621d..791eaf5c2 100644
--- a/code_igniter/application/controllers/groups/UbuntuSystems.xml
+++ b/code_igniter/application/controllers/groups/UbuntuSystems.xml
@@ -8,13 +8,13 @@
 		os
 		ubuntu
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Ubuntu'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/UnAssignedSystems.xml b/code_igniter/application/controllers/groups/UnAssignedSystems.xml
index 191b639ba..bb3c7ebab 100644
--- a/code_igniter/application/controllers/groups/UnAssignedSystems.xml
+++ b/code_igniter/application/controllers/groups/UnAssignedSystems.xml
@@ -8,13 +8,13 @@
 		general
 		contact
 		Any items that have their status attribute set to 'production' and have their type org_id set to '0'. These items have not been assigned to an Organisation.
-		
+		
 	
 	
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
@@ -54,7 +54,7 @@
 		
 			4
 			Type
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/UnClassedsystems.xml b/code_igniter/application/controllers/groups/UnClassedsystems.xml
index f3ba490e1..41c291c1c 100644
--- a/code_igniter/application/controllers/groups/UnClassedsystems.xml
+++ b/code_igniter/application/controllers/groups/UnClassedsystems.xml
@@ -8,13 +8,13 @@
 		general
 		contact
 		Any items that have their status attribute set to 'production' and have their type attribute set to 'computer' and their class attribute is ''. These are computers not classed as 'server'. 'laptop', 'desktop', etc.
-		
+		
 	
 	
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/UnSerialsystems.xml b/code_igniter/application/controllers/groups/UnSerialsystems.xml
index d42322b81..7a80f08eb 100644
--- a/code_igniter/application/controllers/groups/UnSerialsystems.xml
+++ b/code_igniter/application/controllers/groups/UnSerialsystems.xml
@@ -8,13 +8,13 @@
 		general
 		contact
 		Any items that have their status attribute set to 'production' and have their serial or man_serial attribute set to ''.
-		
+		
 	
 	
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
@@ -54,7 +54,7 @@
 		
 			4
 			Type
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/UnixSystems.xml b/code_igniter/application/controllers/groups/UnixSystems.xml
index 7a6202d4d..2ec701b3c 100644
--- a/code_igniter/application/controllers/groups/UnixSystems.xml
+++ b/code_igniter/application/controllers/groups/UnixSystems.xml
@@ -7,14 +7,14 @@
 		1
 		Any items that have their status attribute set to 'production' and have their os_group attribute set to 'unix'.
 		os
-		
+		
 		unix
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/UnknownDevices.xml b/code_igniter/application/controllers/groups/UnknownDevices.xml
index 440e3ce29..297c19afa 100644
--- a/code_igniter/application/controllers/groups/UnknownDevices.xml
+++ b/code_igniter/application/controllers/groups/UnknownDevices.xml
@@ -8,7 +8,7 @@
 		device
 		switch
 		Any items that have their status attribute set to 'production' and have their type attribute set to 'unknown' or '' or 'general purpose'.
-		
+		
 	
 	
 		
diff --git a/code_igniter/application/controllers/groups/VirtualGuests.xml b/code_igniter/application/controllers/groups/VirtualGuests.xml
index 552a1becf..f00893d86 100644
--- a/code_igniter/application/controllers/groups/VirtualGuests.xml
+++ b/code_igniter/application/controllers/groups/VirtualGuests.xml
@@ -8,13 +8,13 @@
 		device
 		vmware
 		Any items that have their status attribute set to 'production' and their manufacturer attribute contains 'VMware', 'Parallels' or 'KVM' and their OS Name does not contain ESX.
-		
+		
 	
 	
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/VirtualHosts.xml b/code_igniter/application/controllers/groups/VirtualHosts.xml
index 2d39bea43..0e01919fb 100644
--- a/code_igniter/application/controllers/groups/VirtualHosts.xml
+++ b/code_igniter/application/controllers/groups/VirtualHosts.xml
@@ -8,13 +8,13 @@
 		device
 		vmware
 		Any items that have their status attribute set to 'production' and have their class attribute set to 'hypervisor'.
-		
+		
 	
 	
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/WebServers.xml b/code_igniter/application/controllers/groups/WebServers.xml
index 8cf1cad35..635aadada 100644
--- a/code_igniter/application/controllers/groups/WebServers.xml
+++ b/code_igniter/application/controllers/groups/WebServers.xml
@@ -6,7 +6,7 @@
 		
 		1
 		application
-		
+		
 		web
 		Any items that have their status attribute set to 'production' and have their os_name attribute containing 'server' and have rows in the server table that is of type 'web'.
 	
@@ -14,7 +14,7 @@
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Windows2000Systems.xml b/code_igniter/application/controllers/groups/Windows2000Systems.xml
index 7e8c942d3..6bf5022c1 100644
--- a/code_igniter/application/controllers/groups/Windows2000Systems.xml
+++ b/code_igniter/application/controllers/groups/Windows2000Systems.xml
@@ -8,13 +8,13 @@
 		os
 		windows
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Windows 2000'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Windows2003Systems.xml b/code_igniter/application/controllers/groups/Windows2003Systems.xml
index 42a1e0183..16a6e5e0a 100644
--- a/code_igniter/application/controllers/groups/Windows2003Systems.xml
+++ b/code_igniter/application/controllers/groups/Windows2003Systems.xml
@@ -8,13 +8,13 @@
 		os
 		windows
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Windows 2003'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Windows2008Systems.xml b/code_igniter/application/controllers/groups/Windows2008Systems.xml
index 877037810..6b8c1d924 100644
--- a/code_igniter/application/controllers/groups/Windows2008Systems.xml
+++ b/code_igniter/application/controllers/groups/Windows2008Systems.xml
@@ -8,13 +8,13 @@
 		os
 		windows_2008
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Windows 2008'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Windows2012Systems.xml b/code_igniter/application/controllers/groups/Windows2012Systems.xml
index 4cc8f25e7..7bcc91e90 100644
--- a/code_igniter/application/controllers/groups/Windows2012Systems.xml
+++ b/code_igniter/application/controllers/groups/Windows2012Systems.xml
@@ -8,13 +8,13 @@
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Windows 2012'.
 		os
 		windows_2012
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Windows7Systems.xml b/code_igniter/application/controllers/groups/Windows7Systems.xml
index acd51de29..0c68146c2 100644
--- a/code_igniter/application/controllers/groups/Windows7Systems.xml
+++ b/code_igniter/application/controllers/groups/Windows7Systems.xml
@@ -8,13 +8,13 @@
 		os
 		windows_7
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Windows 7'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Windows8Systems.xml b/code_igniter/application/controllers/groups/Windows8Systems.xml
index 2bf74d561..78ae57f64 100644
--- a/code_igniter/application/controllers/groups/Windows8Systems.xml
+++ b/code_igniter/application/controllers/groups/Windows8Systems.xml
@@ -8,13 +8,13 @@
 		os
 		windows_8
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Windows 8'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/WindowsComputers.xml b/code_igniter/application/controllers/groups/WindowsComputers.xml
index 02fdba954..81edaea63 100644
--- a/code_igniter/application/controllers/groups/WindowsComputers.xml
+++ b/code_igniter/application/controllers/groups/WindowsComputers.xml
@@ -8,13 +8,13 @@
 		Any items that have their status attribute set to 'production' and have their os_name attribute containing 'windows'.
 		os
 		windows
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/WindowsServers.xml b/code_igniter/application/controllers/groups/WindowsServers.xml
index 15759af9e..ed0d37ce8 100644
--- a/code_igniter/application/controllers/groups/WindowsServers.xml
+++ b/code_igniter/application/controllers/groups/WindowsServers.xml
@@ -8,13 +8,13 @@
 		os
 		windows
 		Any items that have their status attribute set to 'production' and have their os_name attribute containing 'windows server'.
-		
+		
 	
 	
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/WindowsXPSystems.xml b/code_igniter/application/controllers/groups/WindowsXPSystems.xml
index dec029dfe..62028aa3f 100644
--- a/code_igniter/application/controllers/groups/WindowsXPSystems.xml
+++ b/code_igniter/application/controllers/groups/WindowsXPSystems.xml
@@ -8,13 +8,13 @@
 		os
 		windows
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Windows XP'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/groups/Workstations.xml b/code_igniter/application/controllers/groups/Workstations.xml
index 735adc8fe..228914934 100644
--- a/code_igniter/application/controllers/groups/Workstations.xml
+++ b/code_igniter/application/controllers/groups/Workstations.xml
@@ -8,13 +8,13 @@
 		os
 		windows
 		Any items that have their status attribute set to 'production' and have their os_family attribute set to 'Windows XP', 'Windows Vista', Windows 7' or 'Windows 8'.
-		
+		
 	
 	
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family

From bf3987d9e0c43db1c2d096f31cb06729bdcdf852 Mon Sep 17 00:00:00 2001
From: Mark Unwin 
Date: Fri, 1 Apr 2016 12:13:01 +1000
Subject: [PATCH 07/98] All man_icon in report definitions replaced by icon.

---
 .../application/controllers/reports/ConsumedIPAddresses.xml   | 4 ++--
 .../application/controllers/reports/DeviceDetails.xml         | 4 ++--
 .../application/controllers/reports/DeviceHardware.xml        | 4 ++--
 .../application/controllers/reports/DeviceLocations.xml       | 4 ++--
 .../controllers/reports/DevicesWithoutCredentials.xml         | 4 ++--
 .../application/controllers/reports/SpecificClass.xml         | 4 ++--
 .../application/controllers/reports/SpecificFormFactor.xml    | 4 ++--
 .../application/controllers/reports/SpecificNetwork.xml       | 4 ++--
 .../application/controllers/reports/SpecificOSFamily.xml      | 4 ++--
 .../application/controllers/reports/SpecificOSGroup.xml       | 4 ++--
 .../application/controllers/reports/SpecificOSName.xml        | 4 ++--
 code_igniter/application/controllers/reports/SpecificOU.xml   | 4 ++--
 .../application/controllers/reports/SystemLocations.xml       | 2 +-
 .../controllers/reports/WindowsPCswithMissingDetails.xml      | 4 ++--
 .../application/controllers/reports/WorkstationHardware.xml   | 4 ++--
 .../application/controllers/reports/WorkstationReport.xml     | 4 ++--
 16 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/code_igniter/application/controllers/reports/ConsumedIPAddresses.xml b/code_igniter/application/controllers/reports/ConsumedIPAddresses.xml
index 2f9de9541..d981dac47 100644
--- a/code_igniter/application/controllers/reports/ConsumedIPAddresses.xml
+++ b/code_igniter/application/controllers/reports/ConsumedIPAddresses.xml
@@ -3,7 +3,7 @@
 	

 		Consumed IP Addresses
 		y
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/reports/DeviceDetails.xml b/code_igniter/application/controllers/reports/DeviceDetails.xml
index bc222b122..7423516eb 100644
--- a/code_igniter/application/controllers/reports/DeviceDetails.xml
+++ b/code_igniter/application/controllers/reports/DeviceDetails.xml
@@ -3,7 +3,7 @@
 	

 		Device Details
 		y
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_type
diff --git a/code_igniter/application/controllers/reports/DeviceHardware.xml b/code_igniter/application/controllers/reports/DeviceHardware.xml
index b62a0c785..17ee6f49c 100644
--- a/code_igniter/application/controllers/reports/DeviceHardware.xml
+++ b/code_igniter/application/controllers/reports/DeviceHardware.xml
@@ -3,7 +3,7 @@
 	

 		Device Hardware
 		y
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/reports/DeviceLocations.xml b/code_igniter/application/controllers/reports/DeviceLocations.xml
index e38ab9a36..dadd47130 100644
--- a/code_igniter/application/controllers/reports/DeviceLocations.xml
+++ b/code_igniter/application/controllers/reports/DeviceLocations.xml
@@ -3,7 +3,7 @@
 	

 		Device Locations
 		y
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_type
diff --git a/code_igniter/application/controllers/reports/DevicesWithoutCredentials.xml b/code_igniter/application/controllers/reports/DevicesWithoutCredentials.xml
index b2ddf1ed2..115bde391 100644
--- a/code_igniter/application/controllers/reports/DevicesWithoutCredentials.xml
+++ b/code_igniter/application/controllers/reports/DevicesWithoutCredentials.xml
@@ -3,7 +3,7 @@
 	

 		Devices Without Credentials
 		y
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/reports/SpecificClass.xml b/code_igniter/application/controllers/reports/SpecificClass.xml
index 2c9596180..d6c5a388b 100644
--- a/code_igniter/application/controllers/reports/SpecificClass.xml
+++ b/code_igniter/application/controllers/reports/SpecificClass.xml
@@ -3,7 +3,7 @@
 	

 		Specific Class
 		n
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_type
diff --git a/code_igniter/application/controllers/reports/SpecificFormFactor.xml b/code_igniter/application/controllers/reports/SpecificFormFactor.xml
index cfd9f4719..6fbd3b117 100644
--- a/code_igniter/application/controllers/reports/SpecificFormFactor.xml
+++ b/code_igniter/application/controllers/reports/SpecificFormFactor.xml
@@ -3,7 +3,7 @@
 	

 		Specific Form Factor
 		n
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_type
diff --git a/code_igniter/application/controllers/reports/SpecificNetwork.xml b/code_igniter/application/controllers/reports/SpecificNetwork.xml
index 531a37562..116e60c02 100644
--- a/code_igniter/application/controllers/reports/SpecificNetwork.xml
+++ b/code_igniter/application/controllers/reports/SpecificNetwork.xml
@@ -3,7 +3,7 @@
 	

 		Specific Network
 		n
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_type
diff --git a/code_igniter/application/controllers/reports/SpecificOSFamily.xml b/code_igniter/application/controllers/reports/SpecificOSFamily.xml
index 6c26c5b4a..b6bd3bb57 100644
--- a/code_igniter/application/controllers/reports/SpecificOSFamily.xml
+++ b/code_igniter/application/controllers/reports/SpecificOSFamily.xml
@@ -3,7 +3,7 @@
 	

 		Specific OS Family
 		n
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_type
diff --git a/code_igniter/application/controllers/reports/SpecificOSGroup.xml b/code_igniter/application/controllers/reports/SpecificOSGroup.xml
index 2ba16eab0..442ae0ba0 100644
--- a/code_igniter/application/controllers/reports/SpecificOSGroup.xml
+++ b/code_igniter/application/controllers/reports/SpecificOSGroup.xml
@@ -3,7 +3,7 @@
 	

 		Specific OS Group
 		n
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_type
diff --git a/code_igniter/application/controllers/reports/SpecificOSName.xml b/code_igniter/application/controllers/reports/SpecificOSName.xml
index ac8a2ae36..4c5013b57 100644
--- a/code_igniter/application/controllers/reports/SpecificOSName.xml
+++ b/code_igniter/application/controllers/reports/SpecificOSName.xml
@@ -3,7 +3,7 @@
 	

 		Specific OS Name
 		n
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_type
diff --git a/code_igniter/application/controllers/reports/SpecificOU.xml b/code_igniter/application/controllers/reports/SpecificOU.xml
index a437de81d..ad056e161 100644
--- a/code_igniter/application/controllers/reports/SpecificOU.xml
+++ b/code_igniter/application/controllers/reports/SpecificOU.xml
@@ -3,7 +3,7 @@
 	

 		Specific OU
 		n
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			0
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_type
diff --git a/code_igniter/application/controllers/reports/SystemLocations.xml b/code_igniter/application/controllers/reports/SystemLocations.xml
index ee202c914..2859db0a4 100644
--- a/code_igniter/application/controllers/reports/SystemLocations.xml
+++ b/code_igniter/application/controllers/reports/SystemLocations.xml
@@ -3,7 +3,7 @@
 	

 		System Locations
 		y
-		
+		
 		v_report
 		
 		
diff --git a/code_igniter/application/controllers/reports/WindowsPCswithMissingDetails.xml b/code_igniter/application/controllers/reports/WindowsPCswithMissingDetails.xml
index 14eb7183b..3517b0899 100644
--- a/code_igniter/application/controllers/reports/WindowsPCswithMissingDetails.xml
+++ b/code_igniter/application/controllers/reports/WindowsPCswithMissingDetails.xml
@@ -3,7 +3,7 @@
 	

 		Windows PCs with Missing Details
 		y
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/reports/WorkstationHardware.xml b/code_igniter/application/controllers/reports/WorkstationHardware.xml
index 10300e131..9f6e8fb1e 100644
--- a/code_igniter/application/controllers/reports/WorkstationHardware.xml
+++ b/code_igniter/application/controllers/reports/WorkstationHardware.xml
@@ -3,7 +3,7 @@
 	

 		Workstation Hardware
 		y
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family
diff --git a/code_igniter/application/controllers/reports/WorkstationReport.xml b/code_igniter/application/controllers/reports/WorkstationReport.xml
index 9aa26ee08..744eb90ba 100644
--- a/code_igniter/application/controllers/reports/WorkstationReport.xml
+++ b/code_igniter/application/controllers/reports/WorkstationReport.xml
@@ -3,7 +3,7 @@
 	

 		Workstation Report
 		y
-		
+		
 		v_report
 		
 		
@@ -14,7 +14,7 @@
 		
 			1
 			Icon
-			man_icon
+			icon
 			image
 			
 			man_os_family

From 3ab609e254ab25bd6ae317e5a0664e9dea4cba25 Mon Sep 17 00:00:00 2001
From: Mark Unwin 
Date: Fri, 1 Apr 2016 14:32:19 +1000
Subject: [PATCH 08/98] Revised Add Group form to include the (now new) ip
 table. Fixed bug when creting group where if syste./column was selected, it
 tried to join system ointo system (in admin_group controller). Simple fix -
 test if we're creating based on a system table column, if so do this specific
 SQL generator.

---
 code_igniter/application/controllers/admin_group.php       | 2 ++
 code_igniter/application/views/theme-tango/v_add_group.php | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code_igniter/application/controllers/admin_group.php b/code_igniter/application/controllers/admin_group.php
index 26339c49e..cbd0954d6 100644
--- a/code_igniter/application/controllers/admin_group.php
+++ b/code_igniter/application/controllers/admin_group.php
@@ -318,6 +318,8 @@ public function process_add_group()
                 }
                 if ($details->dynamic_other_table == 'sys_man_additional_fields' or $details->dynamic_other_table == 'sys_man_additional_fields_data') {
                     $details->group_dynamic_select = "SELECT distinct(system.system_id) FROM ".$details->dynamic_other_table.$system_table." WHERE ".$details->dynamic_other_table.".system_id = system.system_id AND ".$details->dynamic_other_field." ".$condition." '".$like_wildcard.$selection.$like_wildcard."' AND system.man_status = 'production'";
+                } elseif ($details->dynamic_other_table == 'system') {
+                    $details->group_dynamic_select = "SELECT distinct(system.system_id) FROM system WHERE system.".$details->dynamic_other_field." ".$condition." '".$like_wildcard.$selection.$like_wildcard."' AND system.man_status = 'production'";
                 } else {
                     $details->group_dynamic_select = "SELECT distinct(system.system_id) FROM ".$details->dynamic_other_table." LEFT JOIN system ON ".$details->dynamic_other_table.".system_id = system.system_id WHERE ".$details->dynamic_other_table.'.'.$details->dynamic_other_field." ".$condition." '".$like_wildcard.$selection.$like_wildcard."' AND system.man_status = 'production' AND ".$details->dynamic_other_table.".current = 'y'";
                 }
diff --git a/code_igniter/application/views/theme-tango/v_add_group.php b/code_igniter/application/views/theme-tango/v_add_group.php
index 86049a49c..50940ea8c 100644
--- a/code_igniter/application/views/theme-tango/v_add_group.php
+++ b/code_igniter/application/views/theme-tango/v_add_group.php
@@ -68,7 +68,7 @@
 			

@@ -139,7 +139,7 @@
 		
 			
 			
-			
+			
 			".$os_family_form."<\/select>
";
+$os_family_form = "