diff --git a/includes/polling/applications.inc.php b/includes/polling/applications.inc.php
index e3fbdc603f..dcbf7982f3 100644
--- a/includes/polling/applications.inc.php
+++ b/includes/polling/applications.inc.php
@@ -10,7 +10,7 @@ if (mysql_affected_rows())
   while ($app = mysql_fetch_array($app_data))
   {
     $app_include = $config['install_dir'].'/includes/polling/applications/'.$app['app_type'].'.inc.php';
-    if (is_file($app_include)) 
+    if (is_file($app_include))
     {
       include($app_include);
     }
diff --git a/includes/polling/cisco-entity-sensors.inc.php b/includes/polling/cisco-entity-sensors.inc.php
index cc4a2ebbfb..66227406ca 100755
--- a/includes/polling/cisco-entity-sensors.inc.php
+++ b/includes/polling/cisco-entity-sensors.inc.php
@@ -6,7 +6,7 @@ while ($sensor = mysql_fetch_array($sensors))
 {
   echo("Checking Entity Sensor " . $sensor['entPhysicalName'] . " - " . $sensor['cempsensorName']);
 
-  $oid = $sensor['entPhysicalIndex']; 
+  $oid = $sensor['entPhysicalIndex'];
 
   $sensor_cmd  = $config['snmpget'] . " -M ".$config['mibdir']." -m CISCO-ENTITY-SENSOR-MIB -O Uqnv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   $sensor_cmd .= " entSensorValue.$oid entSensorStatus.$oid";
diff --git a/includes/polling/cisco-ipsec-flow-monitor.inc.php b/includes/polling/cisco-ipsec-flow-monitor.inc.php
index 06f7b02bcd..e911386a0c 100755
--- a/includes/polling/cisco-ipsec-flow-monitor.inc.php
+++ b/includes/polling/cisco-ipsec-flow-monitor.inc.php
@@ -81,10 +81,10 @@ if ($device['os_group'] == "ios")
 
   if (is_file($rrd_filename) || $data['cipSecGlobalActiveTunnels'])
   {
-    if (!file_exists($rrd_filename))  
+    if (!file_exists($rrd_filename))
     {
       rrdtool_create($rrd_filename, $rrd_create);
-    } 
+    }
 
     $rrd_update  = "N";
     $rrd_update .= ":".$data['cipSecGlobalActiveTunnels'];
diff --git a/includes/polling/cisco-mac-accounting.inc.php b/includes/polling/cisco-mac-accounting.inc.php
index 82ca0a8d78..6ab1109804 100755
--- a/includes/polling/cisco-mac-accounting.inc.php
+++ b/includes/polling/cisco-mac-accounting.inc.php
@@ -4,10 +4,10 @@ $cip_oids = array('cipMacHCSwitchedBytes', 'cipMacHCSwitchedPkts');
 echo("Caching OID: ");
 $cip_array = array();
 
-foreach ($cip_oids as $oid) 
-{ 
-  echo("$oid "); 
-  $cip_array = snmpwalk_cache_cip($device, $oid, $cip_array, "CISCO-IP-STAT-MIB"); 
+foreach ($cip_oids as $oid)
+{
+  echo("$oid ");
+  $cip_array = snmpwalk_cache_cip($device, $oid, $cip_array, "CISCO-IP-STAT-MIB");
 }
 
 $polled = time();
@@ -37,7 +37,7 @@ while ($acc = mysql_fetch_assoc($mac_accounting_query))
     $p_in = $cip_array[$ifIndex][$mac]['cipMacHCSwitchedPkts']['input'];
     $p_out = $cip_array[$ifIndex][$mac]['cipMacHCSwitchedPkts']['output'];
 
-    $this_ma = &$cip_array[$ifIndex][$mac]; 
+    $this_ma = &$cip_array[$ifIndex][$mac];
 
     /// Update metrics
     foreach ($cip_oids as $oid)
diff --git a/includes/polling/cisco-remote-access-monitor.inc.php b/includes/polling/cisco-remote-access-monitor.inc.php
index dc2cdc7817..3702de8ed6 100755
--- a/includes/polling/cisco-remote-access-monitor.inc.php
+++ b/includes/polling/cisco-remote-access-monitor.inc.php
@@ -63,10 +63,10 @@ if ($device['os_group'] == "ios")
 
   if (is_file($rrd_filename) || $data['crasEmailNumSessions'] || $data['crasIPSecNumSessions'] || $data['crasL2LNumSessions'] || $data['crasLBNumSessions'] || $data['crasSVCNumSessions'] || $data['crasWebvpnSessions'])
   {
-    if (!file_exists($rrd_filename))  
+    if (!file_exists($rrd_filename))
     {
       rrdtool_create($rrd_filename, $rrd_create);
-    } 
+    }
 
     $rrd_update  = "N";
     $rrd_update .= ":".$data['crasEmailNumSessions'];
diff --git a/includes/polling/hr-mib.inc.php b/includes/polling/hr-mib.inc.php
index 43c30c1799..847f5f033f 100755
--- a/includes/polling/hr-mib.inc.php
+++ b/includes/polling/hr-mib.inc.php
@@ -24,7 +24,7 @@ if (is_numeric($hrSystem[0]['hrSystemProcesses']))
     RRA:MAX:0.5:24:800 \
     RRA:MAX:0.5:288:800");
   }
-  
+
   rrdtool_update($rrd_file,  "N:".$hrSystem[0]['hrSystemProcesses']);
   $graphs['hr_processes'] = TRUE;
   echo(" Processes");
@@ -46,7 +46,7 @@ if (is_numeric($hrSystem[0]['hrSystemNumUsers']))
     RRA:MAX:0.5:24:800 \
     RRA:MAX:0.5:288:800");
   }
-  
+
   rrdtool_update($rrd_file,  "N:".$hrSystem[0]['hrSystemNumUsers']);
   $graphs['hr_users'] = TRUE;
   echo(" Users");
diff --git a/includes/polling/interfaces.inc.php b/includes/polling/interfaces.inc.php
index f32145e83b..3b5551d347 100644
--- a/includes/polling/interfaces.inc.php
+++ b/includes/polling/interfaces.inc.php
@@ -2,9 +2,9 @@
 
 /* FIXME: dead file */
 
-if ($device['os_group'] == "ios") { 
+if ($device['os_group'] == "ios") {
   $portifIndex = array();
-  $cmd = ($device['snmpver'] == 'v1' ? $config['snmpwalk'] : $config['snmpbulkwalk']) . " -M ".$config['mibdir']. " -CI -m CISCO-STACK-MIB -O q -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " portIfIndex"; 
+  $cmd = ($device['snmpver'] == 'v1' ? $config['snmpwalk'] : $config['snmpbulkwalk']) . " -M ".$config['mibdir']. " -CI -m CISCO-STACK-MIB -O q -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " portIfIndex";
   #echo("$cmd");
   $portifIndex_output = trim(shell_exec($cmd));
   foreach (explode("\n", $portifIndex_output) as $entry){
@@ -54,7 +54,7 @@ while ($interface = mysql_fetch_array($interface_query)) {
    $ifDescr = trim($ifDescr);
 
    $ifIndex = $interface['ifIndex'];
-   if ($portifIndex[$ifIndex]) { 
+   if ($portifIndex[$ifIndex]) {
      if ($device['os'] == "CatOS") {
        $cmd = $config['snmpget'] . " -M ".$config['mibdir'] . " -m CISCO-STACK-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " portName." . $portifIndex[$ifIndex];
        $ifAlias = trim(shell_exec($cmd));
@@ -63,7 +63,7 @@ while ($interface = mysql_fetch_array($interface_query)) {
 
    if ($config['os'][$device[os]]['ifname']) { $ifDescr = $ifName; }
 
-   $rrdfile = $host_rrd . "/" . safename($interface['ifIndex'] . ".rrd"); 
+   $rrdfile = $host_rrd . "/" . safename($interface['ifIndex'] . ".rrd");
 
    if (!is_file($rrdfile)) {
      rrdtool_create($rrdfile,"DS:INOCTETS:COUNTER:600:0:12500000000 \
@@ -97,7 +97,7 @@ while ($interface = mysql_fetch_array($interface_query)) {
      $seperator = ", ";
      eventlog("ifName -> $ifName", $interface['device_id'], $interface['interface_id']);
    }
- 
+
    if ($interface['ifAlias'] != $ifAlias && $ifAlias != "" ) {
      $update .= $seperator . "`ifAlias` = '".mres($ifAlias)."'";
      $seperator = ", ";
diff --git a/includes/polling/ipSystemStats.inc.php b/includes/polling/ipSystemStats.inc.php
index c0e9e4f357..01bb68f417 100755
--- a/includes/polling/ipSystemStats.inc.php
+++ b/includes/polling/ipSystemStats.inc.php
@@ -83,14 +83,14 @@ if ($ipSystemStats)
       if (strstr($stats[$oid], "No") || strstr($stats[$oid], "d") || strstr($stats[$oid], "s")) { $stats[$oid] = "0"; }
       $rrdupdate  .= ":".$stats[$oid];
     }
-    
+
     if (!file_exists($rrdfile)) { rrdtool_create($rrdfile,$rrd_create); }
     rrdtool_update($rrdfile, $rrdupdate);
-    
+
     unset($rrdupdate, $rrd_create);
 
     ## FIXME per-AF?
-   
+
     $graphs['ipsystemstats_'.$af] = TRUE;
     $graphs['ipsystemstats_'.$af.'_frag'] = TRUE;
   }
diff --git a/includes/polling/mempools/hpGlobal.inc.php b/includes/polling/mempools/hpGlobal.inc.php
index 9402261f0c..20cecbb13e 100755
--- a/includes/polling/mempools/hpGlobal.inc.php
+++ b/includes/polling/mempools/hpGlobal.inc.php
@@ -12,7 +12,7 @@ if (!is_array($mempool_cache['hpGlobal']))
 {
   $mempool_cache['hpGlobal'] = snmpwalk_cache_oid($device, "hpGlobal", NULL, "NETSWITCH-MIB", $config['mibdir'].":".$config['mibdir']."/hp");
   if ($debug) { print_r($mempool_cache); }
-} 
+}
 else
 {
   if ($debug) { echo("Cached!"); }
diff --git a/includes/polling/port-poe.inc.php b/includes/polling/port-poe.inc.php
index 84d6909743..7bee62fda5 100755
--- a/includes/polling/port-poe.inc.php
+++ b/includes/polling/port-poe.inc.php
@@ -1,26 +1,26 @@
 <?php
 
-$cpe_oids = array('cpeExtPsePortEnable', 'cpeExtPsePortDiscoverMode', 'cpeExtPsePortDeviceDetected', 'cpeExtPsePortIeeePd', 
-'cpeExtPsePortAdditionalStatus', 'cpeExtPsePortPwrMax', 'cpeExtPsePortPwrAllocated', 'cpeExtPsePortPwrAvailable', 'cpeExtPsePortPwrConsumption', 
-'cpeExtPsePortMaxPwrDrawn', 'cpeExtPsePortEntPhyIndex', 'cpeExtPsePortEntPhyIndex', 'cpeExtPsePortPolicingCapable', 'cpeExtPsePortPolicingEnable', 
+$cpe_oids = array('cpeExtPsePortEnable', 'cpeExtPsePortDiscoverMode', 'cpeExtPsePortDeviceDetected', 'cpeExtPsePortIeeePd',
+'cpeExtPsePortAdditionalStatus', 'cpeExtPsePortPwrMax', 'cpeExtPsePortPwrAllocated', 'cpeExtPsePortPwrAvailable', 'cpeExtPsePortPwrConsumption',
+'cpeExtPsePortMaxPwrDrawn', 'cpeExtPsePortEntPhyIndex', 'cpeExtPsePortEntPhyIndex', 'cpeExtPsePortPolicingCapable', 'cpeExtPsePortPolicingEnable',
 'cpeExtPsePortPolicingAction', 'cpeExtPsePortPwrManAlloc');
 
-$peth_oids = array('pethPsePortAdminEnable', 'pethPsePortPowerPairsControlAbility', 'pethPsePortPowerPairs', 'pethPsePortDetectionStatus', 
-'pethPsePortPowerPriority', 'pethPsePortMPSAbsentCounter', 'pethPsePortType', 'pethPsePortPowerClassifications', 'pethPsePortInvalidSignatureCounter', 
+$peth_oids = array('pethPsePortAdminEnable', 'pethPsePortPowerPairsControlAbility', 'pethPsePortPowerPairs', 'pethPsePortDetectionStatus',
+'pethPsePortPowerPriority', 'pethPsePortMPSAbsentCounter', 'pethPsePortType', 'pethPsePortPowerClassifications', 'pethPsePortInvalidSignatureCounter',
 'pethPsePortPowerDeniedCounter', 'pethPsePortOverLoadCounter', 'pethPsePortShortCounter', 'pethMainPseConsumptionPower');
 
-$port_stats = snmpwalk_cache_oid($device, "pethPsePortEntry", $port_stats, "POWER-ETHERNET-MIB"); 
-$port_stats = snmpwalk_cache_oid($device, "cpeExtPsePortEntry", $port_stats, "CISCO-POWER-ETHERNET-EXT-MIB"); 
+$port_stats = snmpwalk_cache_oid($device, "pethPsePortEntry", $port_stats, "POWER-ETHERNET-MIB");
+$port_stats = snmpwalk_cache_oid($device, "cpeExtPsePortEntry", $port_stats, "CISCO-POWER-ETHERNET-EXT-MIB");
 
-if ($port_stats[$port['ifIndex']] && $port['ifType'] == "ethernetCsmacd" 
-   && isset($port_stats[$port['ifIndex']]['dot3StatsIndex'])) 
+if ($port_stats[$port['ifIndex']] && $port['ifType'] == "ethernetCsmacd"
+   && isset($port_stats[$port['ifIndex']]['dot3StatsIndex']))
   { // Check to make sure Port data is cached.
 
     $this_port = &$port_stats[$port['ifIndex']];
 
     $rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("port-".$port['ifIndex']."-poe.rrd");
 
-    if (!file_exists($rrdfile)) 
+    if (!file_exists($rrdfile))
     {
       $rrd_create .= "RRA:AVERAGE:0.5:1:600 RRA:AVERAGE:0.5:6:700 RRA:AVERAGE:0.5:24:775 RRA:AVERAGE:0.5:288:797 RRA:MAX:0.5:1:600 \
                       RRA:MAX:0.5:6:700 RRA:MAX:0.5:24:775 RRA:MAX:0.5:288:797";