Fix issue erikdubbelboer#59

Author: erikdubbelboer

edit.php

@@ -29,7 +29,7 @@
 
   // String
   if ($_POST['type'] == 'string') {
-    $redis->set($_POST['key'], $_POST['value']);
+    $redis->set(input_convert($_POST['key']), input_convert($_POST['value']));
   }
 
   // Hash
@@ -38,26 +38,26 @@
       die('ERROR: Your hash key is to long (max length is '.$config['maxkeylen'].')');
     }
 
-    if ($edit && !$redis->hExists($_POST['key'], $_POST['hkey'])) {
-      $redis->hDel($_POST['key'], $_GET['hkey']);
+    if ($edit && !$redis->hExists(input_convert($_POST['key']), input_convert($_POST['hkey']))) {
+      $redis->hDel(input_convert($_POST['key']), input_convert($_GET['hkey']));
     }
 
-    $redis->hSet($_POST['key'], $_POST['hkey'], $_POST['value']);
+    $redis->hSet(input_convert($_POST['key']), input_convert($_POST['hkey']), input_convert($_POST['value']));
   }
 
   // List
   else if (($_POST['type'] == 'list') && isset($_POST['index'])) {
-    $size = $redis->lLen($_POST['key']);
+    $size = $redis->lLen(input_convert($_POST['key']));
 
     if (($_POST['index'] == '') ||
         ($_POST['index'] == $size) ||
         ($_POST['index'] == -1)) {
       // Push it at the end
-      $redis->rPush($_POST['key'], $_POST['value']);
+      $redis->rPush(input_convert($_POST['key']), input_convert($_POST['value']));
     } else if (($_POST['index'] >= 0) &&
                ($_POST['index'] < $size)) {
       // Overwrite an index
-      $redis->lSet($_POST['key'], $_POST['index'], $_POST['value']);
+      $redis->lSet(input_convert($_POST['key']), input_convert($_POST['index']), input_convert($_POST['value']));
     } else {
       die('ERROR: Out of bounds index');
     }
@@ -67,17 +67,17 @@
   else if ($_POST['type'] == 'set') {
     if ($_POST['value'] != $_POST['oldvalue']) {
       // The only way to edit a Set value is to add it and remove the old value.
-      $redis->sRem($_POST['key'], $_POST['oldvalue']);
-      $redis->sAdd($_POST['key'], $_POST['value']);
+      $redis->sRem(input_convert($_POST['key']), input_convert($_POST['oldvalue']));
+      $redis->sAdd(input_convert($_POST['key']), input_convert($_POST['value']));
     }
   }
 
   // ZSet
   else if (($_POST['type'] == 'zset') && isset($_POST['score'])) {
     if ($_POST['value'] != $_POST['oldvalue']) {
       // The only way to edit a ZSet value is to add it and remove the old value.
-      $redis->zRem($_POST['key'], $_POST['oldvalue']);
-      $redis->zAdd($_POST['key'], $_POST['score'], $_POST['value']);
+      $redis->zRem(input_convert($_POST['key']), input_convert($_POST['oldvalue']));
+      $redis->zAdd(input_convert($_POST['key']), input_convert($_POST['score']), input_convert($_POST['value']));
     }
   }
 

includes/common.inc.php

@@ -55,7 +55,10 @@
 
 $server       = $config['servers'][$i];
 $server['id'] = $i;
-$server['charset'] = isset($server['charset']) && $server['charset'] ? $server['charset'] : mb_internal_encoding();
+$server['charset'] = isset($server['charset']) && $server['charset'] ? $server['charset'] : false;
+
+
+mb_internal_encoding('utf-8');
 
 
 if (isset($login, $login['servers'])) {

includes/config.sample.inc.php

@@ -4,9 +4,9 @@
 $config = array(
   'servers' => array(
     array(
-      'name' => 'local server', // Optional name.
-      'host' => '127.0.0.1',
-      'port' => 6379,
+      'name'   => 'local server', // Optional name.
+      'host'   => '127.0.0.1',
+      'port'   => 6379,
       'filter' => '*',
 
       // Optional Redis authentication.
@@ -19,14 +19,14 @@
     ),*/
 
     /*array(
-      'name' => 'local db 2',
-      'host' => 'localhost',
-      '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
-      'flush' => false, // Set to true to enable the flushdb button for this instance.
-      'encoding' => 'cp1251', // Set for view values in other encoding
+      'name'      => 'local db 2',
+      'host'      => 'localhost',
+      '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.
+      '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).
     ),*/
   ),
 

includes/functions.inc.php

@@ -1,11 +1,29 @@
 <?php
 
-function format_html($str, $from_encoding = FALSE) {
-  $res = $from_encoding ? mb_convert_encoding($str, 'utf-8', $from_encoding) : $str;
+function format_html($str) {
+  global $server;
+
+  if (isset($server['charset']) && $server['charset']) {
+    $res = mb_convert_encoding($str, 'utf-8', $server['charset']);
+  } else {
+    $res = $str;
+  }
+
   $res = htmlentities($res, defined('ENT_SUBSTITUTE') ? (ENT_QUOTES | ENT_SUBSTITUTE) : ENT_QUOTES, 'utf-8');
+
   return ($res || !$str) ? $res :  '(' . strlen($str) . ' bytes)';
 }
 
+
+function input_convert($str) {
+  if (isset($server['charset']) && $server['charset']) {
+    return mb_convert_encoding($str, $server['charset'], 'utf-8');
+  } else {
+    return $str;
+  }
+}
+
+
 function format_ago($time, $ago = false) {
   $minute = 60;
   $hour   = $minute * 60;

view.php

@@ -137,7 +137,7 @@
 if ($type == 'string') { ?>
 
 <table>
-<tr><td><div><?php echo nl2br(format_html($value, $server['charset']))?></div></td><td><div>
+<tr><td><div><?php echo nl2br(format_html($value))?></div></td><td><div>
   <a href="edit.php?s=<?php echo $server['id']?>&amp;type=string&amp;key=<?php echo urlencode($_GET['key'])?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a>
 </div></td><td><div>
   <a href="delete.php?s=<?php echo $server['id']?>&amp;type=string&amp;key=<?php echo urlencode($_GET['key'])?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a>
@@ -155,7 +155,7 @@
 <tr><th><div>Key</div></th><th><div>Value</div></th><th><div>&nbsp;</div></th><th><div>&nbsp;</div></th></tr>
 
 <?php foreach ($values as $hkey => $value) { ?>
-  <tr <?php echo $alt ? 'class="alt"' : ''?>><td><div><?php echo format_html($hkey, $server['charset'])?></div></td><td><div><?php echo nl2br(format_html($value, $server['charset']))?></div></td><td><div>
+  <tr <?php echo $alt ? 'class="alt"' : ''?>><td><div><?php echo format_html($hkey)?></div></td><td><div><?php echo nl2br(format_html($value))?></div></td><td><div>
     <a href="edit.php?s=<?php echo $server['id']?>&amp;type=hash&amp;key=<?php echo urlencode($_GET['key'])?>&amp;hkey=<?php echo urlencode($hkey)?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a>
   </div></td><td><div>
     <a href="delete.php?s=<?php echo $server['id']?>&amp;type=hash&amp;key=<?php echo urlencode($_GET['key'])?>&amp;hkey=<?php echo urlencode($hkey)?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a>
@@ -183,7 +183,7 @@
   for ($i = $start; $i < $end; ++$i) {
     $value = $redis->lIndex($_GET['key'], $i);
 ?>
-  <tr <?php echo $alt ? 'class="alt"' : ''?>><td><div><?php echo $i?></div></td><td><div><?php echo nl2br(format_html($value, $server['charset']))?></div></td><td><div>
+  <tr <?php echo $alt ? 'class="alt"' : ''?>><td><div><?php echo $i?></div></td><td><div><?php echo nl2br(format_html($value))?></div></td><td><div>
     <a href="edit.php?s=<?php echo $server['id']?>&amp;type=list&amp;key=<?php echo urlencode($_GET['key'])?>&amp;index=<?php echo $i?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a>
   </div></td><td><div>
     <a href="delete.php?s=<?php echo $server['id']?>&amp;type=list&amp;key=<?php echo urlencode($_GET['key'])?>&amp;index=<?php echo $i?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a>
@@ -202,7 +202,7 @@
 <tr><th><div>Value</div></th><th><div>&nbsp;</div></th><th><div>&nbsp;</div></th></tr>
 
 <?php foreach ($values as $value) {
-  $display_value = $redis->exists($value) ? '<a href="http://github.com/view.php?s=%3C/span%3E'.$server['id'].'&key='.urlencode($value).'">'.nl2br(format_html($value, $server['charset'])).'</a>' : nl2br(format_html($value, $server['charset']));
+  $display_value = $redis->exists($value) ? '<a href="http://github.com/view.php?s=%3C/span%3E'.$server['id'].'&key='.urlencode($value).'">'.nl2br(format_html($value)).'</a>' : nl2br(format_html($value));
 ?>
   <tr <?php echo $alt ? 'class="alt"' : ''?>><td><div><?php echo $display_value ?></div></td><td><div>
     <a href="edit.php?s=<?php echo $server['id']?>&amp;type=set&amp;key=<?php echo urlencode($_GET['key'])?>&amp;value=<?php echo urlencode($value)?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a>
@@ -223,7 +223,7 @@
 
 <?php foreach ($values as $value) {
   $score         = $redis->zScore($_GET['key'], $value);
-  $display_value = $redis->exists($value) ? '<a href="http://github.com/view.php?s=%3C/span%3E'.$server['id'].'&key='.urlencode($value).'">'.nl2br(format_html($value, $server['charset'])).'</a>' : nl2br(format_html($value, $server['charset']));
+  $display_value = $redis->exists($value) ? '<a href="http://github.com/view.php?s=%3C/span%3E'.$server['id'].'&key='.urlencode($value).'">'.nl2br(format_html($value)).'</a>' : nl2br(format_html($value));
 ?>
   <tr <?php echo $alt ? 'class="alt"' : ''?>><td><div><?php echo $score?></div></td><td><div><?php echo $display_value ?></div></td><td><div>
     <a href="edit.php?s=<?php echo $server['id']?>&amp;type=zset&amp;key=<?php echo urlencode($_GET['key'])?>&amp;score=<?php echo $score?>&amp;value=<?php echo urlencode($value)?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a>