- multi server support

- fixed some bug
- code cleanup

1 files changed, 39 insertions, 13 deletions

diff --git a/overview.php b/overview.php
index 9be11d6..0a11bb3 100644
--- a/overview.php
+++ b/overview.php
@@ -1,11 +1,34 @@
 <?
 
-require 'common.inc.php';
+require_once 'common.inc.php';
 
 
 
 
-$info = $redis->info();
+$info = array();
+
+foreach ($config['servers'] as $i => $server) {
+  // Setup a connection to this Redis server.
+  $redis->close();
+
+  try {
+    $redis->connect($server['host'], $server['port']);
+  } catch (Exception $e) {
+    die('ERROR: Could not connect to Redis ('.$server['host'].':'.$server['port'].')');
+  }
+
+
+  if (isset($server['auth'])) {
+    if (!$redis->auth($server['auth'])) {
+      die('ERROR: Authentication failed ('.$server['host'].':'.$server['port'].')');
+    }
+  }
+
+  $info[$i]         = $redis->info();
+  $info[$i]['size'] = $redis->dbSize();
+}
+
+
 
 
 $page['css'][] = 'frame';
@@ -14,25 +37,28 @@ $page['js'][]  = 'frame';
 require 'header.inc.php';
 
 ?>
-<h2><?=format_html($config['host'])?></h2>
 
-<p>
-<table>
+<? foreach ($config['servers'] as $i => $server) { ?>
+  <div class="server">
+  <h2><?=isset($server['name']) ? $server['name'] : format_html($server['host'])?></h2>
 
-<tr><td><div>Redis version:</div></td><td><div><?=$info['redis_version']?></div></td></tr>
+  <table>
 
-<tr><td><div>Keys:</div></td><td><div><?=$redis->dbSize()?></div></td></tr>
+  <tr><td><div>Redis version:</div></td><td><div><?=$info[$i]['redis_version']?></div></td></tr>
 
-<tr><td><div>Memory used:</div></td><td><div><?=format_size($info['used_memory'])?></div></td></tr>
+  <tr><td><div>Keys:</div></td><td><div><?=$info[$i]['size']?></div></td></tr>
 
-<tr><td><div>Uptime:</div></td><td><div><?=format_ago($info['uptime_in_seconds'])?></div></td></tr>
+  <tr><td><div>Memory used:</div></td><td><div><?=format_size($info[$i]['used_memory'])?></div></td></tr>
 
-<tr><td><div>Last save:</div></td><td><div><?=format_ago(time() - $info['last_save_time'], true)?> <a href="save.php"><img src="images/save.png" width="16" height="16" title="Save Now" alt="[S]" class="imgbut"></a></div></td></tr>
+  <tr><td><div>Uptime:</div></td><td><div><?=format_ago($info[$i]['uptime_in_seconds'])?></div></td></tr>
 
-</table>
-</p>
+  <tr><td><div>Last save:</div></td><td><div><?=format_ago(time() - $info[$i]['last_save_time'], true)?> <a href="save.php?s=<?=$i?>"><img src="images/save.png" width="16" height="16" title="Save Now" alt="[S]" class="imgbut"></a></div></td></tr>
 
-<p>
+  </table>
+  </div>
+<? } ?>
+
+<p class="clear">
 <a href="https://github.com/ErikDubbelboer/phpRedisAdmin" target="_blank">phpRedisAdmin on GitHub</a>
 </p>