diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 2cbe23d0..fa69fdd5 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -1,7 +1,12 @@ ", "<=", ">=", "!=", "LIKE", "REGEXP", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL"); /** Name in title and navigation diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php index bd260734..f3afd9aa 100644 --- a/adminer/include/bootstrap.inc.php +++ b/adminer/include/bootstrap.inc.php @@ -76,7 +76,6 @@ if (function_exists("set_magic_quotes_runtime")) { define("DB", $_GET["db"]); // for the sake of speed and size define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?' . (SID ? SID . '&' : '') . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen(DB) ? 'db=' . urlencode(DB) . '&' : '')); -$on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); // used in foreign_keys() include "../adminer/include/version.inc.php"; include "../adminer/include/functions.inc.php"; @@ -96,8 +95,10 @@ if (!ini_get("session.use_cookies") || @ini_set("session.use_cookies", false) != session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later } -$confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\""; -$token = $_SESSION["tokens"][$_GET["server"]]; +$on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); ///< @var array used in foreign_keys() +$confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\""; ///< @var string +$token = $_SESSION["tokens"][$_GET["server"]]; ///< @var string CSRF protection +/** @var string */ $error = ($_POST ? ($_POST["token"] == $token ? "" : lang('Invalid CSRF token. Send the form again.')) : ($_SERVER["REQUEST_METHOD"] != "POST" ? "" : lang('Too big POST data. Reduce the data or increase the %s configuration directive.', '"post_max_size"')) // posted form with no data means that post_max_size exceeded because Adminer always sends token at least