Browse files

Deferred operations by AJAX instead of JS (doesn't require sending to…

…ken)
  • Loading branch information...
1 parent c5ee977 commit c313dd83a23e87bd18dc20f045a037b8ae9c07a4 @vrana committed Oct 19, 2010
Showing with 43 additions and 14 deletions.
  1. +1 −3 adminer/db.inc.php
  2. +1 −1 adminer/include/connect.inc.php
  3. +19 −0 adminer/include/functions.inc.php
  4. +9 −10 adminer/script.inc.php
  5. +13 −0 adminer/static/functions.js
View
4 adminer/db.inc.php
@@ -155,8 +155,6 @@
}
if ($tables_list) {
- page_footer();
- echo "<script type='text/javascript' src='" . h(ME . "script=db&token=$token") . "'></script>\n";
- exit; // page_footer() already called
+ echo "<script type='text/javascript'>ajaxSetHtml('" . addcslashes(ME, "\\'/") . "script=db');</script>\n";
}
}
View
2 adminer/include/connect.inc.php
@@ -45,7 +45,7 @@ function connect_error() {
}
page_footer("db");
if ($databases) {
- echo "<script type='text/javascript' src='" . h(ME . "script=connect&token=$token") . "'></script>\n";
+ echo "<script type='text/javascript'>ajaxSetHtml('" . addcslashes(ME, "\\'/") . "script=connect');</script>\n";
}
}
View
19 adminer/include/functions.inc.php
@@ -482,6 +482,25 @@ function odd($return = ' class="odd"') {
return ($i++ % 2 ? $return : '');
}
+/** Print one row in JSON object
+* @param string or "" to close the object
+* @param string
+* @return null
+*/
+function json_row($key, $val = null) {
+ static $first = true;
+ if ($first) {
+ echo "{";
+ }
+ if ($key != "") {
+ echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, '\\"') . '": ' . (isset($val) ? '"' . addcslashes($val, '\\"') . '"' : 'undefined');
+ $first = false;
+ } else {
+ echo "\n}\n";
+ $first = true;
+ }
+}
+
/** Check whether the string is in UTF-8
* @param string
* @return bool
View
19 adminer/script.inc.php
@@ -1,38 +1,37 @@
<?php
header("Content-Type: text/javascript; charset=utf-8");
-if ($_GET["token"] != $token) { // CSRF protection
- exit;
-}
if ($_GET["script"] == "db") {
$sums = array("Data_length" => 0, "Index_length" => 0, "Data_free" => 0);
foreach (table_status() as $row) {
- $id = addcslashes($row["Name"], "\\'/");
- echo "setHtml('Comment-$id', '" . addcslashes(nbsp($row["Comment"]), "'\\") . "');\n";
+ $id = $row["Name"];
+ json_row("Comment-$id", nbsp($row["Comment"]));
if (!is_view($row)) {
foreach (array("Engine", "Collation") as $key) {
- echo "setHtml('$key-$id', '" . addcslashes(nbsp($row[$key]), "'\\") . "');\n";
+ json_row("$key-$id", nbsp($row[$key]));
}
foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
if ($row[$key] != "") {
$val = number_format($row[$key], 0, '.', lang(','));
- echo "setHtml('$key-$id', '" . ($key == "Rows" && $row["Engine"] == "InnoDB" && $val ? "~ $val" : $val) . "');\n";
+ json_row("$key-$id", ($key == "Rows" && $row["Engine"] == "InnoDB" && $val ? "~ $val" : $val));
if (isset($sums[$key])) {
$sums[$key] += ($row["Engine"] != "InnoDB" || $key != "Data_free" ? $row[$key] : 0);
}
} elseif (array_key_exists($key, $row)) {
- echo "setHtml('$key-$id');\n";
+ json_row("$key-$id");
}
}
}
}
foreach ($sums as $key => $val) {
- echo "setHtml('sum-$key', '" . number_format($val, 0, '.', lang(',')) . "');\n";
+ json_row("sum-$key", number_format($val, 0, '.', lang(',')));
}
+ json_row("");
} else { // connect
foreach (count_tables(get_databases()) as $db => $val) {
- echo "setHtml('tables-" . addcslashes($db, "\\'/") . "', '$val');\n";
+ json_row("tables-$db", $val);
}
+ json_row("");
}
exit; // don't print footer
View
13 adminer/static/functions.js
@@ -187,6 +187,19 @@ function ajax(url, callback, data) {
return xmlhttp;
}
+/** Use setHtml(key, value) for JSON response
+* @param string
+* @return XMLHttpRequest or false in case of an error
+*/
+function ajaxSetHtml(url) {
+ return ajax(url, function (text) {
+ var data = eval('(' + text + ')');
+ for (var key in data) {
+ setHtml(key, data[key]);
+ }
+ });
+}
+
var ajaxState = 0;
var ajaxTimeout;

0 comments on commit c313dd8

Please sign in to comment.