Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Support Editor

  • Loading branch information...
commit ef0cb38aa1ca1a4ddf02114a086df3e394fe0377 1 parent ea6d6e0
@vrana authored
View
3  adminer/include/functions.inc.php
@@ -905,7 +905,8 @@ function is_url($string) {
*/
function slow_query($query) {
global $adminer, $token;
- if (support("kill") && is_object($connection2 = connect()) && (DB == "" || $connection2->select_db(DB))) {
+ $db = $adminer->database();
+ if (support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
$kill = $connection2->result("SELECT CONNECTION_ID()"); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
?>
<script type="text/javascript">
View
4 editor/include/adminer.inc.php
@@ -30,6 +30,10 @@ function databases($flush = true) {
return get_databases($flush);
}
+ function queryTimeout() {
+ return 5;
+ }
+
function headers() {
return true;
}
View
5 editor/script.inc.php
@@ -1,5 +1,8 @@
<?php
-if (list($table, $id, $name) = $adminer->_foreignColumn(column_foreign_keys($_GET["source"]), $_GET["field"])) {
+if ($_GET["script"] == "kill") {
+ $connection->query("KILL " . (+$_POST["kill"]));
+
+} elseif (list($table, $id, $name) = $adminer->_foreignColumn(column_foreign_keys($_GET["source"]), $_GET["field"])) {
$result = $connection->query("SELECT $id, $name FROM " . table($table) . " WHERE " . (ereg('^[0-9]+$', $_GET["value"]) ? "$id = $_GET[value] OR " : "") . "$name LIKE " . q("$_GET[value]%") . " ORDER BY 2 LIMIT 11");
for ($i=0; $i < 10 && ($row = $result->fetch_row()); $i++) {
echo "<a href='" . h(ME . "edit=" . urlencode($table) . "&where" . urlencode("[" . bracket_escape(idf_unescape($id)) . "]") . "=" . urlencode($row[0])) . "'>" . h($row[1]) . "</a><br>\n";
Please sign in to comment.
Something went wrong with that request. Please try again.