+
+ scanned keys 0 && count($keys) >= $server['scanmax']) ? ', reached scanmax' : '' ?>
+
diff --git a/info.php b/info.php
index d657533..77c6a3d 100644
--- a/info.php
+++ b/info.php
@@ -1,9 +1,7 @@
config('resetstat');
@@ -12,15 +10,10 @@
die;
}
-
-
// Fetch the info
$info = $redis->info();
$alt = false;
-
-
-
$page['css'][] = 'frame';
$page['js'][] = 'frame';
diff --git a/js/frame.js b/js/frame.js
index b3b84b5..0196452 100644
--- a/js/frame.js
+++ b/js/frame.js
@@ -3,14 +3,12 @@ $(function() {
window.parent.history.replaceState({}, '', document.location.href.replace('?', '&').replace(/\/([a-z]*)\.php/, '/?$1'));
}
-
$('#type').change(function(e) {
$('#hkeyp' ).css('display', e.target.value == 'hash' ? 'block' : 'none');
$('#indexp').css('display', e.target.value == 'list' ? 'block' : 'none');
$('#scorep').css('display', e.target.value == 'zset' ? 'block' : 'none');
}).change();
-
$('.delkey, .delval').click(function(e) {
e.preventDefault();
@@ -18,7 +16,7 @@ $(function() {
$.ajax({
type: "POST",
url: this.href,
- data: 'post=1',
+ data: 'post=1&csrf=' + phpRedisAdmin_csrfToken,
success: function(url) {
top.location.href = top.location.pathname+url;
}
diff --git a/js/index.js b/js/index.js
index 3557014..a3f3414 100644
--- a/js/index.js
+++ b/js/index.js
@@ -14,13 +14,13 @@ $(function() {
})
$('#sidebar').on('click', 'a', function(e) {
- if (e.currentTarget.className.indexOf('batch_del') !== -1){
+ if (e.currentTarget.className.indexOf('batch_del') !== -1) {
e.preventDefault();
- var selected_keys = '';
+ var selected_keys = [];
$('input[name=checked_keys]:checked').each(function () {
- selected_keys += $(this).val() + ',';
+ selected_keys.push($(this).val());
});
- if (!selected_keys) {
+ if (selected_keys.length == 0) {
alert('Please select the keys you want to delete.');
return;
}
@@ -28,20 +28,27 @@ $(function() {
$.ajax({
type: "POST",
url: this.href,
- data: 'post=1&selected_keys=' + selected_keys,
+ data: {
+ post: 1,
+ selected_keys: JSON.stringify(selected_keys),
+ csrf: phpRedisAdmin_csrfToken
+ },
success: function(url) {
top.location.href = top.location.pathname+url;
}
});
}
- }else if (e.currentTarget.className.indexOf('deltree') !== -1) {
+ } else if (e.currentTarget.className.indexOf('deltree') !== -1) {
e.preventDefault();
if (confirm('Are you sure you want to delete this whole tree and all it\'s keys?')) {
$.ajax({
type: "POST",
url: this.href,
- data: 'post=1',
+ data: {
+ post: 1,
+ csrf: phpRedisAdmin_csrfToken
+ },
success: function(url) {
top.location.href = top.location.pathname+url;
}
@@ -74,7 +81,10 @@ $(function() {
$.ajax({
type: "POST",
url: href,
- data: 'post=1',
+ data: {
+ post: 1,
+ csrf: phpRedisAdmin_csrfToken
+ },
success: function() {
window.location.reload();
}
diff --git a/login.php b/login.php
index 82c5514..5c12301 100644
--- a/login.php
+++ b/login.php
@@ -2,6 +2,7 @@
define('LOGIN_PAGE', true);
require_once 'includes/common.inc.php';
+global $redis, $config, $csrfToken, $server;
$page['css'][] = 'login';
@@ -13,6 +14,7 @@
phpRedisAdmin
diff --git a/logout.php b/logout.php
index 44b1785..07e10ae 100644
--- a/logout.php
+++ b/logout.php
@@ -1,12 +1,17 @@
');
} else {
// HTTP Digest auth
$needed_parts = array(
diff --git a/overview.php b/overview.php
index 007e2d6..5c67370 100644
--- a/overview.php
+++ b/overview.php
@@ -1,9 +1,7 @@
'unix', 'path' => $server['path']));
+
+ if (isset($config['login_as_acl_auth'])) {
+ // Currently only support one server at a time
+ if ($i > 0) {
+ break;
+ }
} else {
- $redis = !$server['port'] ? new Predis\Client($server['host']) : new Predis\Client('tcp://'.$server['host'].':'.$server['port']);
- }
- try {
- $redis->connect();
- } catch (Predis\CommunicationException $exception) {
- $redis = false;
+ // Setup a connection to Redis.
+ if(isset($server['scheme']) && $server['scheme'] === 'unix' && $server['path']) {
+ $redis = new Predis\Client(array('scheme' => 'unix', 'path' => $server['path']));
+ } else {
+ $redis = !$server['port'] ? new Predis\Client($server['host']) : new Predis\Client('tcp://'.$server['host'].':'.$server['port']);
+ }
+ try {
+ $redis->connect();
+ } catch (Predis\CommunicationException $exception) {
+ $redis = false;
+ }
}
if(!$redis) {
@@ -40,6 +46,9 @@
$info[$i] = $redis->info();
$info[$i]['size'] = $redis->dbSize();
+ if (isset($config['login_as_acl_auth'])) {
+ $info[$i]['username'] = $redis->acl->whoami();
+ }
if (!isset($info[$i]['Server'])) {
$info[$i]['Server'] = array(
@@ -85,6 +94,10 @@
Uptime: | |
+
+
Username: | |
+
+
Last save: |
-Redis Documentation
+Redis Documentation
$config['maxkeylen']) {
@@ -36,6 +34,7 @@
?>
Edit Name of
Edit TTL
Invalid key
@@ -18,17 +17,23 @@
die;
}
-
-
-$type = $redis->type($_GET['key']);
-$exists = $redis->exists($_GET['key']);
+$type = '';
+$exists = false;
+try {
+ $type = $redis->type($_GET['key']);
+ $exists = $redis->exists($_GET['key']);
+} catch (\Predis\Response\ServerException $th) {
+ ?>
+
+ getMessage() ?>
+
+
@@ -48,8 +53,6 @@
die;
}
-
-
$alt = false;
$ttl = $redis->ttl($_GET['key']);
@@ -59,7 +62,6 @@
$encoding = null;
}
-
switch ($type) {
case 'string':
$value = $redis->get($_GET['key']);
@@ -96,6 +98,9 @@
}
$size = count($values);
break;
+
+ default:
+ $size = -1;
}
if (isset($values) && ($count_elements_page !== false)) {
@@ -113,7 +118,19 @@
Encoding: | |
-Size: | |
+Size: |
+
+ |
|