Fix erikdubbelboer#35 and possibly erikdubbelboer#52

Author: erikdubbelboer

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "erik-dubbelboer/php-redis-admin",
     "description": "Simple web interface to manage Redis databases.",
-    "version": "1.1.2",
+    "version": "1.2.0",
     "license": "CC-BY-ND",
     "homepage": "https://github.com/ErikDubbelboer/phpRedisAdmin",
     "authors": [
@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "predis/predis": "0.8.*"
+        "predis/predis": "1.0.1"
     },
     "minimum-stability": "stable",
     "target-dir": "ErikDubbelboer/phpRedisAdmin"    

composer.lock

@@ -46,7 +46,7 @@
   }
 
 
-  die('?view&s='.$server['id'].'&key='.urlencode($_GET['key']));
+  die('?view&s='.$server['id'].'&d='.$server['db'].'&key='.urlencode($_GET['key']));
 }
 
 
@@ -57,7 +57,7 @@
     $redis->del($key);
   }
 
-  die('?view&s='.$server['id']);
+  die('?view&s='.$server['id'].'&d='.$server['db']);
 }
 
 ?>

delete.php

@@ -86,7 +86,7 @@
 
   ?>
   <script>
-  top.location.href = top.location.pathname+'?view&s=<?php echo $server['id']?>&key=<?php echo urlencode($_POST['key'])?>';
+  top.location.href = top.location.pathname+'?view&s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&key=<?php echo urlencode($_POST['key'])?>';
   </script>
   <?php
 

edit.php

@@ -73,7 +73,7 @@
 
   ?>
   <script>
-  top.location.href = top.location.pathname+'?overview&s=<?php echo $server['id']?>';
+  top.location.href = top.location.pathname+'?overview&s=<?php echo $server['id']?>&d=<?php echo $server['db']?>';
   </script>
   <?php
 

import.php

@@ -40,8 +40,6 @@
 }
 
 
-
-
 if (isset($login['servers'])) {
   $i = current($login['servers']);
 } else {
@@ -53,8 +51,8 @@
   $i = $_GET['s'];
 }
 
-$server       = $config['servers'][$i];
-$server['id'] = $i;
+$server            = $config['servers'][$i];
+$server['id']      = $i;
 $server['charset'] = isset($server['charset']) && $server['charset'] ? $server['charset'] : false;
 
 
@@ -75,9 +73,14 @@
 
 
 if (!isset($server['db'])) {
-  $server['db'] = 0;
+  if (isset($_GET['d']) && is_numeric($_GET['d'])) {
+    $server['db'] = $_GET['d'];
+  } else {
+    $server['db'] = 0;
+  }
 }
 
+
 if (!isset($server['filter'])) {
   $server['filter'] = '*';
 }
@@ -94,6 +97,14 @@
   $server['seperator'] = $config['seperator'];
 }
 
+if (!isset($server['keys'])) {
+  $server['keys'] = $config['keys'];
+}
+
+if (!isset($server['scansize'])) {
+  $server['scansize'] = $config['scansize'];
+}
+
 // Setup a connection to Redis.
 $redis = !$server['port'] ? new Predis\Client($server['host']) : new Predis\Client('tcp://'.$server['host'].':'.$server['port']);
 try {

includes/common.inc.php

@@ -24,9 +24,11 @@
       'port'      => 6379,
       'db'        => 1,             // Optional database number, see http://redis.io/commands/select
       'filter'    => 'something:*', // Show only parts of database for speed or security reasons.
-      'seperator' => '/',           // Use a different seperator on this database.
+      'seperator' => '/',           // Use a different seperator on this database (default uses config default).
       'flush'     => false,         // Set to true to enable the flushdb button for this instance.
       'charset'   => 'cp1251',      // Keys and values are stored in redis using this encoding (default utf-8).
+      'keys'      => false,         // Use the old KEYS command instead of SCAN to fetch all keys for this server (default uses config default).
+      'scansize'  => 1000           // How many entries to fetch using each SCAN command for this server (default uses config default).
     ),*/
   ),
 
@@ -55,7 +57,14 @@
   // You can ignore settings below this point.
 
   'maxkeylen'           => 100,
-  'count_elements_page' => 100
+  'count_elements_page' => 100,
+
+
+  // Use the old KEYS command instead of SCAN to fetch all keys.
+  'keys' => false,
+
+  // How many entries to fetch using each SCAN command.
+  'scansize' => 1000
 );
 
 ?>

includes/config.sample.inc.php

@@ -4,7 +4,23 @@
 
 if($redis) {
 
-    $keys = $redis->keys($server['filter']);
+    if (!empty($server['keys'])) {
+        $keys = $redis->keys($server['filter']);
+    } else {
+        $next = 0;
+        $keys = array();
+
+        while (true) {
+            $r = $redis->scan($next, 'MATCH', $server['filter'], 'COUNT', $server['scansize']);
+
+            $next = $r[0];
+            $keys = array_merge($keys, $r[1]);
+
+            if ($next == 0) {
+                break;
+            }
+        }
+    }
 
     sort($keys);
 
@@ -83,7 +99,7 @@ function print_namespace($item, $name, $fullkey, $islast) {
 
         ?>
         <li<?php echo empty($class) ? '' : ' class="'.implode(' ', $class).'"'?>>
-        <a href="http://github.com/?view&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;key=<?php echo urlencode($fullkey)?>"><?php echo format_html($name)?><?php if ($len !== false) { ?><span class="info">(<?php echo $len?>)</span><?php } ?></a>
+        <a href="http://github.com/?view&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;d=<?php echo $server['db']?>&amp;key=<?php echo urlencode($fullkey)?>"><?php echo format_html($name)?><?php if ($len !== false) { ?><span class="info">(<?php echo $len?>)</span><?php } ?></a>
         </li>
         <?php
       }
@@ -93,7 +109,7 @@ function print_namespace($item, $name, $fullkey, $islast) {
         ?>
         <li class="folder<?php echo ($fullkey === '') ? '' : ' collapsed'?><?php echo $islast ? ' last' : ''?>">
         <div class="icon"><?php echo format_html($name)?>&nbsp;<span class="info">(<?php echo count($item)?>)</span>
-        <?php if ($fullkey !== '') { ?><a href="http://github.com/delete.php?s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;tree=<?php echo urlencode($fullkey)?>:" class="deltree"><img src="http://github.com/images/delete.png" width="10" height="10" title="Delete tree" alt="[X]"></a><?php } ?>
+        <?php if ($fullkey !== '') { ?><a href="http://github.com/delete.php?s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;d=<?php echo $server['db']?>&amp;tree=<?php echo urlencode($fullkey)?>:" class="deltree"><img src="http://github.com/images/delete.png" width="10" height="10" title="Delete tree" alt="[X]"></a><?php } ?>
         </div><ul>
         <?php
 
@@ -144,32 +160,43 @@ function print_namespace($item, $name, $fullkey, $islast) {
 ?>
 <div id="sidebar">
 
-<h1 class="logo"><a href="http://github.com/?overview&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>">phpRedisAdmin</a></h1>
+<h1 class="logo"><a href="http://github.com/?overview&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;d=<?php echo $server['db']?>">phpRedisAdmin</a></h1>
 
 <p>
 <select id="server">
 <?php foreach ($config['servers'] as $i => $srv) { ?>
 <option value="<?php echo $i?>" <?php echo ($server['id'] == $i) ? 'selected="selected"' : ''?>><?php echo isset($srv['name']) ? format_html($srv['name']) : $srv['host'].':'.$srv['port']?></option>
 <?php } ?>
 </select>
-</p>
 
-<?php if($redis): ?>
+<?php if($redis) { ?>
+
+<?php
+$databases = $redis->config('GET', 'databases');
+$databases = $databases['databases'];
+if ($databases > 1) { ?>
+  <select id="database">
+  <?php for ($d = 0; $d < $databases; ++$d) { ?>
+  <option value="<?php echo $d?>" <?php echo ($server['db'] == $d) ? 'selected="selected"' : ''?>>database <?php echo $d?></option>
+  <?php } ?>
+  </select>
+<?php } ?>
+</p>
 
 <p>
 <?php if (isset($login)) { ?>
 <a href="logout.php"><img src="images/logout.png" width="16" height="16" title="Logout" alt="[L]"></a>
 <?php } ?>
-<a href="http://github.com/?info&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>"><img src="http://github.com/images/info.png" width="16" height="16" title="Info" alt="[I]"></a>
-<a href="http://github.com/?export&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>"><img src="http://github.com/images/export.png" width="16" height="16" title="Export" alt="[E]"></a>
-<a href="http://github.com/?import&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>"><img src="http://github.com/images/import.png" width="16" height="16" title="Import" alt="[I]"></a>
+<a href="http://github.com/?info&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;d=<?php echo $server['db']?>"><img src="http://github.com/images/info.png" width="16" height="16" title="Info" alt="[I]"></a>
+<a href="http://github.com/?export&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;d=<?php echo $server['db']?>"><img src="http://github.com/images/export.png" width="16" height="16" title="Export" alt="[E]"></a>
+<a href="http://github.com/?import&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;d=<?php echo $server['db']?>"><img src="http://github.com/images/import.png" width="16" height="16" title="Import" alt="[I]"></a>
 <?php if (isset($server['flush']) && $server['flush']) { ?>
-<a href="http://github.com/?flush&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>" id="flush"><img src="http://github.com/images/flush.png" width="16" height="16" title="Flush" alt="[F]"></a>
+<a href="http://github.com/?flush&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;d=<?php echo $server['db']?>" id="flush"><img src="http://github.com/images/flush.png" width="16" height="16" title="Flush" alt="[F]"></a>
 <?php } ?>
 </p>
 
 <p>
-<a href="http://github.com/?edit&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>" class="add">Add another key</a>
+<a href="http://github.com/?edit&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;d=<?php echo $server['db']?>" class="add">Add another key</a>
 </p>
 
 <p>
@@ -187,9 +214,10 @@ function print_namespace($item, $name, $fullkey, $islast) {
 </ul>
 </div><!-- #keys -->
 
-<?php else: ?>
+<?php } else { ?>
+</p>
 <div style="color:red">Can't connect to this server</div>
-<?php endif; ?>
+<?php } ?>
 
 <div id="frame">
 <iframe src="<?php echo format_html($iframe)?>" id="iframe" frameborder="0" scrolling="0"></iframe>

index.php

@@ -31,7 +31,7 @@
 
 <?php if (method_exists($redis, 'resetStat')) { ?>
 <p>
-<a href="http://github.com/?reset&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>" class="reset">Reset usage statistics</a>
+<a href="http://github.com/?reset&amp;s=%3Cspan%20class="pl-ent"><?php echo $server['id']?>&amp;d=<?php echo $server['db']?>" class="reset">Reset usage statistics</a>
 </p>
 <?php } ?>
 

info.php

@@ -49,6 +49,17 @@ $(function() {
   });
 
 
+  $('#database').change(function(e) {
+    if (location.href.indexOf('?') == -1) {
+      location.href = location.href+'?d='+e.target.value;
+    } else if (location.href.indexOf('&d=') == -1) {
+      location.href = location.href+'&d='+e.target.value;
+    } else {
+      location.href = location.href.replace(/d=[0-9]*/, 'd='+e.target.value);
+    }
+  });
+
+
   $('li.current').parents('li.folder').removeClass('collapsed');
 
   $('li.folder').click(function(e) {
@@ -71,7 +82,7 @@ $(function() {
 
   $('#btn_server_filter').click(function() {
     var filter = $('#server_filter').val();
-    location.href = top.location.pathname + '?overview&s=' + $('#server').val() + '&filter=' + filter;
+    location.href = top.location.pathname + '?overview&s=' + $('#server').val() + '&d=' + ($('#database').val() || '') + '&filter=' + filter;
   });
 
   $('#server_filter').keydown(function(e){