Merge pull request erikdubbelboer#36 from toubsen/master

Added per server configuration for seperator

Author: erikdubbelboer

includes/common.inc.php

@@ -78,6 +78,10 @@
   $server['filter'] = '*';
 }
 
+if (!isset($server['seperator'])) {
+  $server['seperator'] = $config['seperator'];
+}
+
 // Setup a connection to Redis.
 $redis = new Predis\Client('tcp://'.$server['host'].':'.$server['port']);
 

includes/config.sample.inc.php

@@ -7,7 +7,7 @@
       'name' => 'local server', // Optional name.
       'host' => '127.0.0.1',
       'port' => 6379,
-      'filter' => '*'
+      'filter' => '*',
 
       // Optional Redis authentication.
       //'auth' => 'redispasswordhere' // Warning: The password is sent in plain-text to the Redis server.
@@ -24,6 +24,7 @@
       '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
     )*/
   ),
 

index.php

@@ -21,7 +21,7 @@
     continue;
   }
 
-  $key = explode($config['seperator'], $key);
+  $key = explode($server['seperator'], $key);
 
   // $d will be a reference to the current namespace.
   $d = &$namespaces;
@@ -132,7 +132,7 @@ function print_namespace($item, $name, $fullkey, $islast) {
       if ($fullkey === '') {
         $childfullkey = $childname;
       } else {
-        $childfullkey = $fullkey.$config['seperator'].$childname;
+        $childfullkey = $fullkey.$server['seperator'].$childname;
       }
 
       print_namespace($childitem, $childname, $childfullkey, (--$l == 0));