Merge pull request #2007 from QuxLabs/qux-issue-8

Added working memcached support

html/pages/deleted-ports.inc.php

@@ -22,7 +22,7 @@ else if ($vars['purge']) {
 echo '<table cellpadding=5 cellspacing=0 border=0 width=100%>';
 echo "<tr><td></td><td></td><td></td><td><a href='deleted-ports/purge=all/'><img src='images/16/cross.png' align=absmiddle></img> Purge All</a></td></tr>";
 
-foreach (dbFetchRows("SELECT * FROM `ports` AS P, `devices` as D WHERE P.`deleted` = '1' AND D.device_id = P.device_id") as $interface) {
+foreach (dbFetchRows("SELECT * FROM `ports` AS P, `devices` as D WHERE P.`deleted` = '1' AND D.device_id = P.device_id",array(),true) as $interface) {
     $interface = ifLabel($interface, $interface);
     if (port_permitted($interface['port_id'], $interface['device_id'])) {
         echo '<tr class=list>';

html/pages/device/edit.inc.php

@@ -1,6 +1,7 @@
 <?php
 
 $no_refresh = TRUE;
+$config['memcached']['enable'] = false;
 
 $link_array = array('page'    => 'device',
     'device'  => $device['device_id'],

html/pages/device/health/mempool.inc.php

@@ -13,17 +13,6 @@ foreach (dbFetchRows('SELECT * FROM `mempools` WHERE device_id = ?', array($devi
         $row_colour = $list_colour_b;
     }
 
-    if ($config['memcached']['enable'] === true) {
-        $state = $memcache->get('mempool-'.$mempool['mempool_id'].'-state');
-        d_echo($state);
-
-        if (is_array($state)) {
-            $mempool = array_merge($mempool, $state);
-        }
-
-        unset($state);
-    }
-
     $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
 
     $mempool_url = 'graphs/id='.$mempool['mempool_id'].'/type=mempool_usage/';
@@ -55,4 +44,4 @@ foreach (dbFetchRows('SELECT * FROM `mempools` WHERE device_id = ?', array($devi
     echo "</div></div>";
 
     $i++;
-}//end foreach
+}//end foreach

html/pages/device/overview/generic/sensor.inc.php

@@ -12,10 +12,6 @@ if (count($sensors)) {
     echo '      </div>
         <table class="table table-hover table-condensed table-striped">';
     foreach ($sensors as $sensor) {
-        if ($config['memcached']['enable'] === true) {
-            $sensor['sensor_current'] = $memcache->get('sensor-'.$sensor['sensor_id'].'-value');
-        }
-
         if (empty($sensor['sensor_current'])) {
             $sensor['sensor_current'] = 'NaN';
         }

html/pages/device/overview/mempools.inc.php

@@ -19,17 +19,6 @@ if (count($mempools)) {
         ';
 
     foreach ($mempools as $mempool) {
-        if ($config['memcached']['enable'] === true) {
-            $state = $memcache->get('mempool-'.$mempool['mempool_id'].'-state');
-            d_echo($state);
-
-            if (is_array($state)) {
-                $mempool = array_merge($mempool, $state);
-            }
-
-            unset($state);
-        }
-
         $percent    = round($mempool['mempool_perc'], 0);
         $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
         $total      = formatStorage($mempool['mempool_total']);

html/pages/device/port.inc.php

@@ -6,17 +6,6 @@ if (!isset($vars['view'])) {
 
 $port = dbFetchRow('SELECT * FROM `ports` WHERE `port_id` = ?', array($vars['port']));
 
-if ($config['memcached']['enable'] === true) {
-    $state = $memcache->get('port-'.$port['port_id'].'-state');
-    d_echo($state);
-
-    if (is_array($state)) {
-        $port = array_merge($port, $state);
-    }
-
-    unset($state);
-}
-
 $port_details = 1;
 
 $hostname = $device['hostname'];

html/pages/device/ports.inc.php

@@ -136,19 +136,7 @@ else {
     }
 
     foreach ($ports as $port) {
-        if ($config['memcached']['enable'] === true) {
-            $state = $memcache->get('port-'.$port['port_id'].'-state');
-            d_echo($state);
-
-            if (is_array($state)) {
-                $port = array_merge($port, $state);
-            }
-
-            unset($state);
-        }
-
         include 'includes/print-interface.inc.php';
-
         $i++;
     }
 

html/pages/health/sensors.inc.php

@@ -22,11 +22,6 @@ echo '<tr class="tablehead">
       </tr>';
 
 foreach (dbFetchRows($sql, $param) as $sensor) {
-    if ($config['memcached']['enable'] === true) {
-        $sensor['sensor_current'] = $memcache->get('sensor-'.$sensor['sensor_id'].'-value');
-        d_echo('Memcached['.'sensor-'.$sensor['sensor_id'].'-value'.'='.$sensor['sensor_current'].']');
-    }
-
     if (empty($sensor['sensor_current'])) {
         $sensor['sensor_current'] = 'NaN';
     }

html/pages/settings.inc.php

@@ -24,6 +24,7 @@
  * @subpackage Page
  */
 $pagetitle[] = 'Global Settings';
+$config['memcached']['enable'] = false;
 ?>
 
 <div class="container-fluid">