Document variables

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1278 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 2cbe23d0df02ad5a4a50e70c28fdf7971694b27d..fa69fdd540bde9a49dbc7d9fc389f65e9fd56823 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1,7 +1,12 @@
 <?php
 class Adminer {
+       /** @var array functions used in select */
        var $functions = array("char_length", "from_unixtime", "hex", "lower", "round", "sec_to_time", "time_to_sec", "unix_timestamp", "upper");
+       
+       /** @var array grouping functions used in select */
        var $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
+       
+       /** @var array operators used in select */
        var $operators = array("=", "<", ">", "<=", ">=", "!=", "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 bd26073409596f3fe13d156782a9123aba286182..f3afd9aa281b85441e2a5ce080c5562077a0d10f 100644 (file)
--- 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