From 6e7239e82c47e743d02bd7c44c07be5a83a87a53 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sun, 15 Apr 2012 22:21:57 +0000
Subject: [PATCH] clean up ipoman power discovery dupe contents

git-svn-id: http://www.observium.org/svn/observer/trunk@3037 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/functions.inc.php    |  2 +-
 includes/discovery/power/ipoman.inc.php | 56 -------------------------
 2 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index 5f9592178..e8e51c8ee 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -56,7 +56,7 @@ function discover_device($device, $options = NULL)
       $device['os']= getHostOS($device);
       if ($device['os'] != 'generic')
       {
-          echo "Device os was updated to ".$device['os']."!";
+          echo "\nDevice os was updated to ".$device['os']."!";
           dbUpdate(array('os' => $device['os']), 'devices', '`device_id` = ?', array($device['device_id']));
       }
   }
diff --git a/includes/discovery/power/ipoman.inc.php b/includes/discovery/power/ipoman.inc.php
index adfb2608e..cb8709a25 100644
--- a/includes/discovery/power/ipoman.inc.php
+++ b/includes/discovery/power/ipoman.inc.php
@@ -54,59 +54,3 @@ if ($device['os'] == "ipoman")
 }
 
 ?>
-<?php
-
-## IPOMANII-MIB
-if ($device['os'] == "ipoman")
-{
-  echo(" IPOMANII-MIB ");
-
-### Inlet Disabled due to the fact thats it's Kwh instead of just Watt
-
-  if (!is_array($cache['ipoman']))
-  {
-    echo("outletConfigDesc ");
-    $cache['ipoman']['out'] = snmpwalk_cache_multi_oid($device, "outletConfigDesc", $cache['ipoman']['out'], "IPOMANII-MIB");
-    echo("outletConfigLocation ");
-    $cache['ipoman']['out'] = snmpwalk_cache_multi_oid($device, "outletConfigLocation", $cache['ipoman']['out'], "IPOMANII-MIB");
-#    echo("inletConfigDesc ");
-#    $cache['ipoman']['in'] = snmpwalk_cache_multi_oid($device, "inletConfigDesc", $cache['ipoman'], "IPOMANII-MIB");
-  }
-
-#  $oids_in = array();
-  $oids_out = array();
-
-#  echo("inletStatusWH ");
-#  $oids_in = snmpwalk_cache_multi_oid($device, "inletStatusWH", $oids_in, "IPOMANII-MIB");
-  echo("outletStatusWH ");
-  $oids_out = snmpwalk_cache_multi_oid($device, "outletStatusWH", $oids_out, "IPOMANII-MIB");
-
-#  if (is_array($oids_in))
-#  {
-#    foreach ($oids_in as $index => $entry)
-#    {
-#      $cur_oid = '.1.3.6.1.4.1.2468.1.4.2.1.3.1.3.1.5.' . $index;
-#      $divisor = 10;
-#      $descr = (trim($cache['ipoman']['in'][$index]['inletConfigDesc'],'"') != '' ? trim($cache['ipoman']['in'][$index]['inletConfigDesc'],'"') : "Inlet $index");
-#      $power = $entry['inletStatusWH'] / $divisor;
-#
-#      discover_sensor($valid['sensor'], 'power', $device, $cur_oid, '1.3.1.3.'.$index, 'ipoman', $descr, $divisor, '1', NULL, NULL, NULL, NULL, $power);
-#      # FIXME: iPoMan 1201 also says it has 2 inlets, at least until firmware 1.06 - wtf?
-#    }
-#  }
-
-  if (is_array($oids_out))
-  {
-    foreach ($oids_out as $index => $entry)
-    {
-      $cur_oid = '.1.3.6.1.4.1.2468.1.4.2.1.3.2.3.1.5.' . $index;
-      $divisor = 10;
-      $descr = (trim($cache['ipoman']['out'][$index]['outletConfigDesc'],'"') != '' ? trim($cache['ipoman']['out'][$index]['outletConfigDesc'],'"') : "Output $index");
-      $power = $entry['outletStatusWH'] / $divisor;
-
-      discover_sensor($valid['sensor'], 'power', $device, $cur_oid, '2.3.1.3.'.$index, 'ipoman', $descr, $divisor, '1', NULL, NULL, NULL, NULL, $power);
-    }
-  }
-}
-
-?>
\ No newline at end of file