Use prefix for cookies

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

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index a335f3bf24b528ba59548cd82303e70ac70b31e2..27892673cd8010680d3cefc6ea85d33483362de5 100644 (file)
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -64,7 +64,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
                        query_redirect("ALTER TABLE " . idf_escape($_GET["create"]) . implode(",", $fields) . ",\nRENAME TO " . idf_escape($_POST["name"]) . ",\n$status", $location, lang('Table has been altered.'));
                } else {
                        $path = preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]);
-                       setcookie("Engine", $_POST["Engine"], strtotime("+1 month"), $path);
+                       setcookie("adminer_engine", $_POST["Engine"], strtotime("+1 month"), $path);
                        query_redirect("CREATE TABLE " . idf_escape($_POST["name"]) . " (" . implode(",", $fields) . "\n) $status", $location, lang('Table has been created.'));
                }
        }
@@ -108,7 +108,7 @@ if ($_POST) {
        }
 } else {
        $row = array(
-               "Engine" => $_COOKIE["Engine"],
+               "Engine" => $_COOKIE["adminer_engine"],
                "fields" => array(array("field" => "")),
                "partition_names" => array(""),
        );

diff --git a/adminer/functions.js b/adminer/functions.js
index 101725385b151c93e0f7c4d4c60df8727b54efb2..164797c7b0b981f008401cd37c536b12ea445f32 100644 (file)
--- a/adminer/functions.js
+++ b/adminer/functions.js
@@ -254,6 +254,6 @@ function schema_mouseup(ev) {
                for (var key in table_pos) {
                        s += '_' + key + ':' + Math.round(table_pos[key][0] * 10000) / 10000 + 'x' + Math.round(table_pos[key][1] * 10000) / 10000;
                }
-               document.cookie = 'schema=' + encodeURIComponent(s.substr(1)) + '; expires=' + date + '; path=' + location.pathname + location.search;
+               document.cookie = 'adminer_schema=' + encodeURIComponent(s.substr(1)) + '; expires=' + date + '; path=' + location.pathname + location.search;
        }
 }

diff --git a/adminer/include/lang.inc.php b/adminer/include/lang.inc.php
index b62c1cda338a554c852bc682abfd4befc8a6fb08..7dc6ede52e891d7f700e6cd82a628e6f1e2fa6ca 100644 (file)
--- a/adminer/include/lang.inc.php
+++ b/adminer/include/lang.inc.php
@@ -39,14 +39,14 @@ function switch_lang() {
 }
 
 if (isset($_GET["lang"])) {
-       $_COOKIE["lang"] = $_GET["lang"];
+       $_COOKIE["adminer_lang"] = $_GET["lang"];
        $_SESSION["lang"] = $_GET["lang"]; // cookies may be disabled
 }
 
 $LANG = "en";
-if (isset($langs[$_COOKIE["lang"]])) {
-       setcookie("lang", $_GET["lang"], strtotime("+1 month"), preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]));
-       $LANG = $_COOKIE["lang"];
+if (isset($langs[$_COOKIE["adminer_lang"]])) {
+       setcookie("adminer_lang", $_GET["lang"], strtotime("+1 month"), preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]));
+       $LANG = $_COOKIE["adminer_lang"];
 } elseif (isset($langs[$_SESSION["lang"]])) {
        $LANG = $_SESSION["lang"];
 } else {

diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index 5af1f4772f3b0be6da7316b1b605130554159256..05032ff17183fe853721240a7129048c38ec0874 100644 (file)
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -4,7 +4,7 @@ page_header(lang('Database schema'), "", array(), $_GET["db"]);
 $table_pos = array();
 $table_pos_js = array();
 // saved in one cookie because there is a limit of 20 cookies per domain
-preg_match_all('~([^:]+):([-0-9.]+)x([-0-9.]+)(_|$)~', $_COOKIE["schema"], $matches, PREG_SET_ORDER); //! ':' in table name
+preg_match_all('~([^:]+):([-0-9.]+)x([-0-9.]+)(_|$)~', $_COOKIE["adminer_schema"], $matches, PREG_SET_ORDER); //! ':' in table name
 foreach ($matches as $i => $match) {
        $table_pos[$match[1]] = array($match[2], $match[3]);
        $table_pos_js[] = "\n\t'" . addcslashes($match[1], "\r\n'\\") . "': [ $match[2], $match[3] ]";

diff --git a/compile.php b/compile.php
index fde6bee7ab9abf4ac06eac7d5bd5da97ae00b57f..3f2ce468776c2944b9024f578271a253d3034349 100644 (file)
--- a/compile.php
+++ b/compile.php
@@ -25,7 +25,7 @@ function lang_ids($match) {
 function put_file($match) {
        global $lang_ids;
        if ($match[2] == './lang/$LANG.inc.php') {
-               if ($_COOKIE["lang"]) {
+               if ($_COOKIE["adminer_lang"]) {
                        return "";
                }
                $return = "";
@@ -53,12 +53,12 @@ function put_file($match) {
                return "switch (\$LANG) {\n$return}\n";
        }
        $return = file_get_contents(dirname(__FILE__) . "/adminer/$match[2]");
-       if ($match[2] != "./include/lang.inc.php" || !$_COOKIE["lang"]) {
+       if ($match[2] != "./include/lang.inc.php" || !$_COOKIE["adminer_lang"]) {
                $tokens = token_get_all($return); // to find out the last token
                return "?>\n$return" . (in_array($tokens[count($tokens) - 1][0], array(T_CLOSE_TAG, T_INLINE_HTML), true) ? "<?php" : "");
        } elseif (preg_match('~\\s*(\\$pos = .*)~', $return, $match2)) {
                // single language lang() is used for plural
-               return "function lang(\$translation, \$number) {\n\t" . str_replace('$LANG', "'$_COOKIE[lang]'", $match2[1]) . "\n\treturn sprintf(\$translation[\$pos], \$number);\n}\n";
+               return "function lang(\$translation, \$number) {\n\t" . str_replace('$LANG', "'$_COOKIE[adminer_lang]'", $match2[1]) . "\n\treturn sprintf(\$translation[\$pos], \$number);\n}\n";
        } else {
                echo "lang() not found\n";
        }
@@ -160,24 +160,24 @@ function php_shrink($input) {
 
 error_reporting(E_ALL & ~E_NOTICE);
 if ($_SERVER["argc"] > 1) {
-       $_COOKIE["lang"] = $_SERVER["argv"][1]; // Adminer functions read language from cookie
+       $_COOKIE["adminer_lang"] = $_SERVER["argv"][1]; // Adminer functions read language from cookie
        include dirname(__FILE__) . "/adminer/include/lang.inc.php";
-       if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["lang"]])) {
+       if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["adminer_lang"]])) {
                echo "Usage: php compile.php [lang]\nPurpose: Compile adminer[-lang].php from index.php.\n";
                exit(1);
        }
-       include dirname(__FILE__) . "/adminer/lang/$_COOKIE[lang].inc.php";
+       include dirname(__FILE__) . "/adminer/lang/$_COOKIE[adminer_lang].inc.php";
 }
 
-$filename = "adminer" . ($_COOKIE["lang"] ? "-$_COOKIE[lang]" : "") . ".php";
+$filename = "adminer" . ($_COOKIE["adminer_lang"] ? "-$_COOKIE[adminer_lang]" : "") . ".php";
 $file = file_get_contents(dirname(__FILE__) . "/adminer/index.php");
 $file = preg_replace_callback('~\\b(include|require) "([^"]*)";~', 'put_file', $file);
 $file = preg_replace("~if \\(isset\\(\\\$_SESSION\\[\"coverage.*\n}\n| && !isset\\(\\\$_SESSION\\[\"coverage\"\\]\\)~sU", '', $file);
-if ($_COOKIE["lang"]) {
+if ($_COOKIE["adminer_lang"]) {
        // single language version
        $file = preg_replace_callback("~(<\\?php\\s*echo )?lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])(;\\s*\\?>)?~s", 'remove_lang', $file);
        $file = str_replace("<?php switch_lang(); ?>\n", "", $file);
-       $file = str_replace('<?php echo $LANG; ?>', $_COOKIE["lang"], $file);
+       $file = str_replace('<?php echo $LANG; ?>', $_COOKIE["adminer_lang"], $file);
 } else {
        $file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
 }

diff --git a/lang.php b/lang.php
index b82ad83d30328216cb21fe47e5516e83351f6104..0f4a361f5a35a1fdf8c3710583006fd622e37c9a 100644 (file)
--- a/lang.php
+++ b/lang.php
@@ -1,9 +1,9 @@
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
 if ($_SERVER["argc"] > 1) {
-       $_COOKIE["lang"] = $_SERVER["argv"][1]; // Adminer functions read language from cookie
+       $_COOKIE["adminer_lang"] = $_SERVER["argv"][1]; // Adminer functions read language from cookie
        include dirname(__FILE__) . "/adminer/include/lang.inc.php";
-       if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["lang"]])) {
+       if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["adminer_lang"]])) {
                echo "Usage: php lang.php [lang]\nPurpose: Update adminer/lang/*.inc.php from source code messages.\n";
                exit(1);
        }
@@ -17,7 +17,7 @@ foreach (array_merge(glob(dirname(__FILE__) . "/adminer/*.php"), glob(dirname(__
        }
 }
 
-foreach (glob(dirname(__FILE__) . "/adminer/lang/" . ($_COOKIE["lang"] ? $_COOKIE["lang"] : "*") . ".inc.php") as $filename) {
+foreach (glob(dirname(__FILE__) . "/adminer/lang/" . ($_COOKIE["adminer_lang"] ? $_COOKIE["adminer_lang"] : "*") . ".inc.php") as $filename) {
        $messages = $messages_all;
        preg_match_all("~^(\\s*)(?:// )?(('(?:[^\\\\']+|\\\\.)*') => .*[^,\n]),?~m", file_get_contents($filename), $matches, PREG_SET_ORDER);
        $s = "";