diff options
| author | Erik Dubbelboer <erik@dubbelboer.com> | 2015-03-22 20:25:53 +0300 |
|---|---|---|
| committer | Erik Dubbelboer <erik@dubbelboer.com> | 2015-03-22 20:35:34 +0300 |
| commit | f419e7fb95652b0c429e01d50c32586733face1b (patch) | |
| tree | 2b8ea983dc6d90e06fc4c2dd7d255020b707cf22 /view.php | |
| parent | 5c91646ca2729385de984962f52de70788a452cb (diff) | |
Fix #35 and possibly #52v1.2.0
Diffstat (limited to 'view.php')
| -rw-r--r-- | view.php | 34 |
1 files changed, 17 insertions, 17 deletions
@@ -32,9 +32,9 @@ $page_num_request = $page_num_request === 0 ? 1 : $page_num_request; ?> <h2><?php echo format_html($_GET['key'])?> <?php if ($exists) { ?> - <a href="rename.php?s=<?php echo $server['id']?>&key=<?php echo urlencode($_GET['key'])?>"><img src="images/edit.png" width="16" height="16" title="Rename" alt="[R]"></a> - <a href="delete.php?s=<?php echo $server['id']?>&key=<?php echo urlencode($_GET['key'])?>" class="delkey"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> - <a href="export.php?s=<?php echo $server['id']?>&key=<?php echo urlencode($_GET['key'])?>"><img src="images/export.png" width="16" height="16" title="Export" alt="[E]"></a> + <a href="rename.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&key=<?php echo urlencode($_GET['key'])?>"><img src="images/edit.png" width="16" height="16" title="Rename" alt="[R]"></a> + <a href="delete.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&key=<?php echo urlencode($_GET['key'])?>" class="delkey"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> + <a href="export.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&key=<?php echo urlencode($_GET['key'])?>"><img src="images/export.png" width="16" height="16" title="Export" alt="[E]"></a> <?php } ?> </h2> <?php @@ -95,7 +95,7 @@ if (isset($values) && ($count_elements_page !== false)) { <tr><td><div>Type:</div></td><td><div><?php echo format_html($type)?></div></td></tr> -<tr><td><div><abbr title="Time To Live">TTL</abbr>:</div></td><td><div><?php echo ($ttl == -1) ? 'does not expire' : $ttl?> <a href="ttl.php?s=<?php echo $server['id']?>&key=<?php echo urlencode($_GET['key'])?>&ttl=<?php echo $ttl?>"><img src="images/edit.png" width="16" height="16" title="Edit TTL" alt="[E]" class="imgbut"></a></div></td></tr> +<tr><td><div><abbr title="Time To Live">TTL</abbr>:</div></td><td><div><?php echo ($ttl == -1) ? 'does not expire' : $ttl?> <a href="ttl.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&key=<?php echo urlencode($_GET['key'])?>&ttl=<?php echo $ttl?>"><img src="images/edit.png" width="16" height="16" title="Edit TTL" alt="[E]" class="imgbut"></a></div></td></tr> <?php if (!is_null($encoding)) { ?> <tr><td><div>Encoding:</div></td><td><div><?php echo format_html($encoding)?></div></td></tr> @@ -173,9 +173,9 @@ if ($type == 'string') { ?> <table> <tr><td><div><?php echo nl2br(format_html($value))?></div></td><td><div> - <a href="edit.php?s=<?php echo $server['id']?>&type=string&key=<?php echo urlencode($_GET['key'])?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a> + <a href="edit.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=string&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']?>&type=string&key=<?php echo urlencode($_GET['key'])?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> + <a href="delete.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=string&key=<?php echo urlencode($_GET['key'])?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> </div></td></tr> </table> @@ -191,9 +191,9 @@ else if ($type == 'hash') { ?> <?php foreach ($values as $hkey => $value) { ?> <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']?>&type=hash&key=<?php echo urlencode($_GET['key'])?>&hkey=<?php echo urlencode($hkey)?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a> + <a href="edit.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=hash&key=<?php echo urlencode($_GET['key'])?>&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']?>&type=hash&key=<?php echo urlencode($_GET['key'])?>&hkey=<?php echo urlencode($hkey)?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> + <a href="delete.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=hash&key=<?php echo urlencode($_GET['key'])?>&hkey=<?php echo urlencode($hkey)?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> </div></td></tr> <?php $alt = !$alt; } ?> @@ -219,9 +219,9 @@ else if ($type == 'list') { ?> $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))?></div></td><td><div> - <a href="edit.php?s=<?php echo $server['id']?>&type=list&key=<?php echo urlencode($_GET['key'])?>&index=<?php echo $i?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a> + <a href="edit.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=list&key=<?php echo urlencode($_GET['key'])?>&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']?>&type=list&key=<?php echo urlencode($_GET['key'])?>&index=<?php echo $i?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> + <a href="delete.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=list&key=<?php echo urlencode($_GET['key'])?>&index=<?php echo $i?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> </div></td></tr> <?php $alt = !$alt; } ?> @@ -237,12 +237,12 @@ else if ($type == 'set') { <tr><th><div>Value</div></th><th><div> </div></th><th><div> </div></th></tr> <?php foreach ($values as $value) { - $display_value = $redis->exists($value) ? '<a href="view.php?s='.$server['id'].'&key='.urlencode($value).'">'.nl2br(format_html($value)).'</a>' : nl2br(format_html($value)); + $display_value = $redis->exists($value) ? '<a href="view.php?s='.$server['id'].'&d='.$server['db'].'&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']?>&type=set&key=<?php echo urlencode($_GET['key'])?>&value=<?php echo urlencode($value)?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a> + <a href="edit.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=set&key=<?php echo urlencode($_GET['key'])?>&value=<?php echo urlencode($value)?>"><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']?>&type=set&key=<?php echo urlencode($_GET['key'])?>&value=<?php echo urlencode($value)?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> + <a href="delete.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=set&key=<?php echo urlencode($_GET['key'])?>&value=<?php echo urlencode($value)?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> </div></td></tr> <?php $alt = !$alt; } ?> @@ -258,11 +258,11 @@ else if ($type == 'zset') { ?> <?php foreach ($values as $value) { $score = $redis->zScore($_GET['key'], $value); - $display_value = $redis->exists($value) ? '<a href="view.php?s='.$server['id'].'&key='.urlencode($value).'">'.nl2br(format_html($value)).'</a>' : nl2br(format_html($value)); + $display_value = $redis->exists($value) ? '<a href="view.php?s='.$server['id'].'&d='.$server['db'].'&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']?>&type=zset&key=<?php echo urlencode($_GET['key'])?>&score=<?php echo $score?>&value=<?php echo urlencode($value)?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a> - <a href="delete.php?s=<?php echo $server['id']?>&type=zset&key=<?php echo urlencode($_GET['key'])?>&value=<?php echo urlencode($value)?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> + <a href="edit.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=zset&key=<?php echo urlencode($_GET['key'])?>&score=<?php echo $score?>&value=<?php echo urlencode($value)?>"><img src="images/edit.png" width="16" height="16" title="Edit" alt="[E]"></a> + <a href="delete.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=zset&key=<?php echo urlencode($_GET['key'])?>&value=<?php echo urlencode($value)?>" class="delval"><img src="images/delete.png" width="16" height="16" title="Delete" alt="[X]"></a> </div></td></tr> <?php $alt = !$alt; } ?> @@ -272,7 +272,7 @@ if ($type != 'string') { ?> </table> <p> - <a href="edit.php?s=<?php echo $server['id']?>&type=<?php echo $type?>&key=<?php echo urlencode($_GET['key'])?>" class="add">Add another value</a> + <a href="edit.php?s=<?php echo $server['id']?>&d=<?php echo $server['db']?>&type=<?php echo $type?>&key=<?php echo urlencode($_GET['key'])?>" class="add">Add another value</a> </p> <?php } |