From f73b33f3f9e50d6e245fb8ad37021f7ac00439d0 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Thu, 24 Jun 2010 16:23:37 +0000
Subject: [PATCH] Add environment device type

git-svn-id: http://www.observium.org/svn/observer/trunk@1259 61d68cd4-352d-0410-923a-c4978735b2b8
---
 discovery.php                         |   5 +++++
 html/images/icons/environment.png     | Bin 0 -> 626 bytes
 html/includes/print-menubar.php       |   1 +
 html/pages/device/edit/device.inc.php |   2 --
 includes/static-config.php            |   1 +
 poller.php                            |   2 +-
 6 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100755 html/images/icons/environment.png

diff --git a/discovery.php b/discovery.php
index cb232aaaa..b4558f50a 100755
--- a/discovery.php
+++ b/discovery.php
@@ -161,6 +161,11 @@ while ($device = mysql_fetch_array($device_query))
       case "netmanplus":
         $device['type'] = 'power'; 
         break;
+      case "akcp":
+      case "minkelsrms":
+      case "papouch-tme":
+        $device['type'] = 'environment';
+        break;
     }
   }
 
diff --git a/html/images/icons/environment.png b/html/images/icons/environment.png
new file mode 100755
index 0000000000000000000000000000000000000000..cb3d54d064a1bbfe5b3e9eabd68a27cb940737c8
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!1W80eR5;7M
zQ@?B5KomY%b!-`fU2xhYb&1m<#u>b1=~CRSYnKceL_LH+CwnM`4yJ49kFhue97LB6
z_K?9#hng$~K`Gt*7nH_0PE<*@PCxEP->Gh}a5DvZ@bOOX?)&t;cXtx!9NlEZ&<)3}
z>lQkl&f_2mb^%X(-$#JYfKT;${d9hx^sf@y?Y1DlD;A5}>2w+qLeO|TM!K$l1CbYv
zM&oqBLATpo1JXWV2e4Wym2M}KNn}}8C?MwLa(TPo@9)C)MFCLW&*$^6Gnovclp@db
zkYN~TW<SiOQYn$&tJP`=$Q?GDO?_TqN7$WCrwC(wMFclj(Y9?=sZ?U7X+G=qdV&@a
z2qDO>>xO?6B;iCv@h#RTlL^Y@a$^28a*VLCJsb}IoNX+I9LEWT6h#Ta7(<dIp=>sb
zMx&7sIEnNC1daxSL0HPn%~ya7cr+{FJ3s+E1e`!)4;PNHrk%Zs$w*-oVG&)AW5$^>
z@i``hDW1zPC0ucA^76~UCXSTw{P^d}Rz6X61K!$PO;j&z(%QHiubvx0>%pCP_1A^p
zDnQ=6^bY=#BM#~x&)yTtWjA2dCtSuJqcmVp0;9xdasUzfD7y}QrGMDMk+-mS^yA+8
za$G&Ph*nr$QVk=}3M)&hc^PQ;*Al8_5^a4Wr2_fwJo(zI{9j+=Zxg9)Ryp#|fB*mh
M07*qoM6N<$f`<VU^Z)<=

literal 0
HcmV?d00001

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 1c0b3d7cf..077458df4 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -58,6 +58,7 @@ if (isset($config['enable_printers']) && $config['enable_printers'])
 }
 ?>
         <li><a href="devices/power/"><img src="images/icons/power.png" border="0" align="absmiddle" /> Power</a></li>
+        <li><a href="devices/environment/"><img src="images/icons/environment.png" border="0" align="absmiddle" /> Environment</a></li>
         <li><hr width="140" /></li>
         <li><a href="devices/alerted/"><img src="images/16/server_error.png" border="0" align="absmiddle" /> Alerts (<?php echo $device_alerts ?>)</a></li>
 <?php
diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php
index a0269b9a7..5d81d40c5 100644
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -15,8 +15,6 @@ if($updated && $update_message) {
   print_error($update_message);
 }
 
-$device_types = array('server','network','firewall','workstation','printer','power');
-
 echo("<table cellpadding=0 cellspacing=0><tr><td>
 
 <h5>
diff --git a/includes/static-config.php b/includes/static-config.php
index 67f1f3057..e0be161a1 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -95,6 +95,7 @@ if(!$config['graph_colours']['mixed']) {
   $config['graph_colours']['mixed']  = array("CC0000", "008C00", "4096EE", "73880A", "D01F3C", "36393D", "FF0084");
 }
 
+$device_types = array('server','network','firewall','workstation','printer','power', 'environment');
 
 ##############################
 # No changes below this line #
diff --git a/poller.php b/poller.php
index 78237089e..bed7120ee 100755
--- a/poller.php
+++ b/poller.php
@@ -259,7 +259,7 @@ $poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time =
 
 $string = $argv[0] . " $doing " .  date("F j, Y, G:i") . " - $polled_devices devices polled in $poller_time secs";
 if ($debug) echo("$string\n");
-shell_exec("echo '".$string."' >> ".$config['install_dir']."/observer.log");
+shell_exec("echo '".$string."' >> ".$config['install_dir']."/observer.log"); # FIXME EWW
 
 
 ?>