Move constants to namespace

diff --git a/adminer/drivers/mongo.inc.php b/adminer/drivers/mongo.inc.php
index e51a712f5e124050038199e96a2b99e4ad732b50..a64f214bcd9abb9e624958c95fc7ad4392fa4f64 100644 (file)
--- a/adminer/drivers/mongo.inc.php
+++ b/adminer/drivers/mongo.inc.php
@@ -4,7 +4,7 @@ namespace Adminer;
 $drivers["mongo"] = "MongoDB (alpha)";
 
 if (isset($_GET["mongo"])) {
-       define("DRIVER", "mongo");
+       define('Adminer\DRIVER', "mongo");
 
        if (class_exists('MongoDB\Driver\Manager')) {
                class Db {

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index 869ed24c6d645895f67a9cc1341766d18e6cd9c6..d564207cb0b57a10cb61ed239479998eb0cbdd7c 100644 (file)
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -10,7 +10,7 @@ namespace Adminer;
 $drivers["mssql"] = "MS SQL";
 
 if (isset($_GET["mssql"])) {
-       define("DRIVER", "mssql");
+       define('Adminer\DRIVER', "mssql");
        if (extension_loaded("sqlsrv")) {
                class Db {
                        var $extension = "sqlsrv", $_link, $_result, $server_info, $affected_rows, $errno, $error;

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 9b9aefae365feb47a7e423316df7f637a9f288e1..2ef77f655461a19522be45927293bec1f2b135ec 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -3,8 +3,8 @@ namespace Adminer;
 
 $drivers = array("server" => "MySQL") + $drivers;
 
-if (!defined("DRIVER")) {
-       define("DRIVER", "server"); // server - backwards compatibility
+if (!defined('Adminer\DRIVER')) {
+       define('Adminer\DRIVER', "server"); // server - backwards compatibility
        // MySQLi supports everything, MySQL doesn't support multiple result sets, PDO_MySQL doesn't support orgtable
        if (extension_loaded("mysqli")) {
                class Db extends \MySQLi {

diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
index 1a8dfaf0d9083170d00daf596e2673885d4a5ebc..518f217e0c7d328194e8ea8332df890c84c76fe7 100644 (file)
--- a/adminer/drivers/oracle.inc.php
+++ b/adminer/drivers/oracle.inc.php
@@ -4,7 +4,7 @@ namespace Adminer;
 $drivers["oracle"] = "Oracle (beta)";
 
 if (isset($_GET["oracle"])) {
-       define("DRIVER", "oracle");
+       define('Adminer\DRIVER', "oracle");
        if (extension_loaded("oci8")) {
                class Db {
                        var $extension = "oci8", $_link, $_result, $server_info, $affected_rows, $errno, $error;

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 572246004c71b8377e47d128d4c5b9deb2fe16dc..62274c1e055fc802b698f26253900d62448fb918 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -4,7 +4,7 @@ namespace Adminer;
 $drivers["pgsql"] = "PostgreSQL";
 
 if (isset($_GET["pgsql"])) {
-       define("DRIVER", "pgsql");
+       define('Adminer\DRIVER', "pgsql");
        if (extension_loaded("pgsql")) {
                class Db {
                        var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error, $timeout;

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 4e5083a8fec4dfa5207449f971e9d77065a342f7..d5539388a3b383143ecf25953033d1b3eca2da22 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -4,7 +4,7 @@ namespace Adminer;
 $drivers["sqlite"] = "SQLite";
 
 if (isset($_GET["sqlite"])) {
-       define("DRIVER", "sqlite");
+       define('Adminer\DRIVER', "sqlite");
        if (class_exists("SQLite3")) {
 
                class SqliteDb {

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 86a63240762174fea3d2923e279df8c7f7772e0c..73bd26d8739f5c85ccf96cd379076118dc34b367 100644 (file)
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -80,10 +80,10 @@ include "../adminer/drivers/mysql.inc.php"; // must be included as last driver
 
 $jush = Driver::$jush;
 
-define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost
-define("DB", $_GET["db"]); // for the sake of speed and size
+define('Adminer\SERVER', $_GET[DRIVER]); // read from pgsql=localhost
+define('Adminer\DB', $_GET["db"]); // for the sake of speed and size
 define(
-       "ME",
+       'Adminer\ME',
        preg_replace('~\?.*~', '', relative_uri()) . '?'
                . (sid() ? SID . '&' : '')
                . (SERVER !== null ? DRIVER . "=" . urlencode(SERVER) . '&' : '')

diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 600fdcb691ceb0960a7df12dd61603ab7e53f8f9..55ca6baad50b1958a6db386a71967d34b266ba5c 100644 (file)
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -109,7 +109,7 @@ var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
                $databases = null;
        }
        stop_session();
-       define("PAGE_HEADER", 1);
+       define('Adminer\PAGE_HEADER', 1);
 }
 
 /** Send HTTP headers

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index ac6e7afb331db3292a7ef80561819cc897a88fe4..e11707c02777df1c0d1afcf2465dc787886f1c8b 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -394,7 +394,7 @@ function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
                while ($row = $result->fetch_assoc()) {
                        $return[] = $row;
                }
-       } elseif (!$result && !is_object($connection2) && $error && (defined("PAGE_HEADER") || $error == "-- ")) {
+       } elseif (!$result && !is_object($connection2) && $error && (defined('Adminer\PAGE_HEADER') || $error == "-- ")) {
                echo $error . error() . "\n";
        }
        return $return;

diff --git a/plugins/drivers/clickhouse.php b/plugins/drivers/clickhouse.php
index 59f30909979543f3a0747eea0842793c88bbfad5..fb71a3326c6430922be242d2636fd4a504a0d36e 100644 (file)
--- a/plugins/drivers/clickhouse.php
+++ b/plugins/drivers/clickhouse.php
@@ -4,7 +4,7 @@ namespace Adminer;
 add_driver("clickhouse", "ClickHouse (alpha)");
 
 if (isset($_GET["clickhouse"])) {
-       define("DRIVER", "clickhouse");
+       define('Adminer\DRIVER', "clickhouse");
 
        if (ini_bool('allow_url_fopen')) {
                class Db {

diff --git a/plugins/drivers/elastic.php b/plugins/drivers/elastic.php
index f2ee4987bca4c6ebdcdafb4b7fa39b908b195876..579b8bc320476de05ca00fde012da70480349ffb 100644 (file)
--- a/plugins/drivers/elastic.php
+++ b/plugins/drivers/elastic.php
@@ -4,10 +4,9 @@ namespace Adminer;
 add_driver("elastic", "Elasticsearch 7 (beta)");
 
 if (isset($_GET["elastic"])) {
-       define("DRIVER", "elastic");
+       define('Adminer\DRIVER', "elastic");
 
        if (ini_bool('allow_url_fopen')) {
-               define("ELASTIC_DB_NAME", "elastic");
 
                class Db {
                        var $extension = "JSON", $server_info, $errno, $error, $_url;
@@ -316,7 +315,7 @@ if (isset($_GET["elastic"])) {
        }
 
        function get_databases() {
-               return array(ELASTIC_DB_NAME);
+               return array("elastic");
        }
 
        function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -337,15 +336,7 @@ if (isset($_GET["elastic"])) {
 
        function count_tables($databases) {
                $return = connection()->rootQuery('_aliases');
-               if (empty($return)) {
-                       return array(
-                               ELASTIC_DB_NAME => 0
-                       );
-               }
-
-               return array(
-                       ELASTIC_DB_NAME => count($return)
-               );
+               return array("elastic" => ($return ? count($return) : 0));
        }
 
        function tables_list() {

diff --git a/plugins/drivers/elastic5.php b/plugins/drivers/elastic5.php
index 89d317ce0a909913aabeec4f87a40f76235f8a1a..46ce2468aeb5365398b77f5e516cfca74309e7e5 100644 (file)
--- a/plugins/drivers/elastic5.php
+++ b/plugins/drivers/elastic5.php
@@ -4,7 +4,7 @@ namespace Adminer;
 add_driver("elastic5", "Elasticsearch 5 (beta)");
 
 if (isset($_GET["elastic5"])) {
-       define("DRIVER", "elastic5");
+       define('Adminer\DRIVER', "elastic5");
 
        if (ini_bool('allow_url_fopen')) {
                class Db {

diff --git a/plugins/drivers/firebird.php b/plugins/drivers/firebird.php
index 404f009cf72b9369b8e027843e0e41ab3723c17f..e2c7309a5ad2f923f8f282b6a6dbdc309a12297c 100644 (file)
--- a/plugins/drivers/firebird.php
+++ b/plugins/drivers/firebird.php
@@ -8,7 +8,7 @@ namespace Adminer;
 add_driver('firebird', 'Firebird (alpha)');
 
 if (isset($_GET["firebird"])) {
-       define("DRIVER", "firebird");
+       define('Adminer\DRIVER', "firebird");
 
        if (extension_loaded("interbase")) {
                class Db {

diff --git a/plugins/drivers/simpledb.php b/plugins/drivers/simpledb.php
index d73c33bcfdf7348f10d25fbf6d993f9b519f0b63..6c6388263aae8ed15314e898029fcdf488e783db 100644 (file)
--- a/plugins/drivers/simpledb.php
+++ b/plugins/drivers/simpledb.php
@@ -4,7 +4,7 @@ namespace Adminer;
 add_driver("simpledb", "SimpleDB");
 
 if (isset($_GET["simpledb"])) {
-       define("DRIVER", "simpledb");
+       define('Adminer\DRIVER', "simpledb");
 
        if (class_exists('SimpleXMLElement') && ini_bool('allow_url_fopen')) {
                class Db {
@@ -290,7 +290,7 @@ if (isset($_GET["simpledb"])) {
                foreach (sdb_request_all('ListDomains', 'DomainName') as $table) {
                        $return[(string) $table] = 'table';
                }
-               if ($connection->error && defined("PAGE_HEADER")) {
+               if ($connection->error && defined('Adminer\PAGE_HEADER')) {
                        echo "<p class='error'>" . error() . "\n";
                }
                return $return;

diff --git a/plugins/dump-alter.php b/plugins/dump-alter.php
index 8c8285219eb626fcde15da6a842b074cb9d94459..bfc559eb6278000993680840d091f1decea46c9f 100644 (file)
--- a/plugins/dump-alter.php
+++ b/plugins/dump-alter.php
@@ -9,7 +9,7 @@
 class AdminerDumpAlter {
 
        function dumpFormat() {
-               if (DRIVER == 'server') {
+               if (Adminer\DRIVER == 'server') {
                        return array('sql_alter' => 'Alter');
                }
        }

diff --git a/plugins/dump-date.php b/plugins/dump-date.php
index 1dd2bf92a8aaf9c373cb0091b44973a3b0d695c9..56a2bc56a5f8bf6e27b39979b9c42d738f606383 100644 (file)
--- a/plugins/dump-date.php
+++ b/plugins/dump-date.php
@@ -10,6 +10,6 @@ class AdminerDumpDate {
 
        function dumpFilename($identifier) {
                $connection = Adminer\connection();
-               return Adminer\friendly_url(($identifier != "" ? $identifier : (SERVER != "" ? SERVER : "localhost")) . "-" . $connection->result("SELECT NOW()"));
+               return Adminer\friendly_url(($identifier != "" ? $identifier : (Adminer\SERVER != "" ? Adminer\SERVER : "localhost")) . "-" . $connection->result("SELECT NOW()"));
        }
 }

diff --git a/plugins/dump-xml.php b/plugins/dump-xml.php
index b9bc62053a87015154b863ae135d2ce785de7ad4..1ab9be04e283c42ed27338b0aaa7f73941d905a2 100644 (file)
--- a/plugins/dump-xml.php
+++ b/plugins/dump-xml.php
@@ -28,7 +28,7 @@ class AdminerDumpXml {
                if ($_POST["format"] == "xml") {
                        if (!$this->database) {
                                $this->database = true;
-                               echo "<database name='" . Adminer\h(DB) . "'>\n";
+                               echo "<database name='" . Adminer\h(Adminer\DB) . "'>\n";
                                register_shutdown_function(array($this, '_database'));
                        }
                        $connection = Adminer\connection();

diff --git a/plugins/foreign-system.php b/plugins/foreign-system.php
index 53af6ff224d2db57364053836fa8f46a32c7c351..27ba976bcf597352abc959f085b306e1fa960ca5 100644 (file)
--- a/plugins/foreign-system.php
+++ b/plugins/foreign-system.php
@@ -9,7 +9,7 @@
 class AdminerForeignSystem {
 
        function foreignKeys($table) {
-               if (DRIVER == "server" && DB == "mysql") {
+               if (Adminer\DRIVER == "server" && Adminer\DB == "mysql") {
                        $return = array(
                                "columns_priv" => array(array("table" => "user", "source" => array("Host", "User"), "target" => array("Host", "User"))),
                                "db" => array(array("table" => "user", "source" => array("Host", "User"), "target" => array("Host", "User"))),
@@ -23,7 +23,7 @@ class AdminerForeignSystem {
                                "time_zone_transition_type" => array(array("table" => "time_zone", "source" => array("Time_zone_id"), "target" => array("Time_zone_id"))),
                        );
                        return $return[$table];
-               } elseif (DB == "information_schema") {
+               } elseif (Adminer\DB == "information_schema") {
                        $schemata = array("table" => "SCHEMATA", "source" => array("TABLE_CATALOG", "TABLE_SCHEMA"), "target" => array("CATALOG_NAME", "SCHEMA_NAME"));
                        $tables = array("table" => "TABLES", "source" => array("TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME"), "target" => array("TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME"));
                        $columns = array("table" => "COLUMNS", "source" => array("TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME", "COLUMN_NAME"), "target" => array("TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME", "COLUMN_NAME"));

diff --git a/plugins/login-password-less.php b/plugins/login-password-less.php
index 709c1d3c8d9a3a6d249dc6d31390c5f8a571bdbc..360a23e005c6c5da29a0c3f0f21d30b72ee98047 100644 (file)
--- a/plugins/login-password-less.php
+++ b/plugins/login-password-less.php
@@ -19,7 +19,7 @@ class AdminerLoginPasswordLess {
 
        function credentials() {
                $password = Adminer\get_password();
-               return array(SERVER, $_GET["username"], (password_verify($password, $this->password_hash) ? "" : $password));
+               return array(Adminer\SERVER, $_GET["username"], (password_verify($password, $this->password_hash) ? "" : $password));
        }
 
        function login($login, $password) {

diff --git a/plugins/login-servers.php b/plugins/login-servers.php
index cda09de27d59f0585a469b91ff3fc0757d2d2ea9..42b94224b2963f18cd1e5a537803b4caba09eec8 100644 (file)
--- a/plugins/login-servers.php
+++ b/plugins/login-servers.php
@@ -22,11 +22,11 @@ class AdminerLoginServers {
        }
 
        function credentials() {
-               return array($this->servers[SERVER]["server"], $_GET["username"], Adminer\get_password());
+               return array($this->servers[Adminer\SERVER]["server"], $_GET["username"], Adminer\get_password());
        }
 
        function login($login, $password) {
-               if (!$this->servers[SERVER]) {
+               if (!$this->servers[Adminer\SERVER]) {
                        return false;
                }
        }
@@ -35,7 +35,7 @@ class AdminerLoginServers {
                if ($name == 'driver') {
                        return '';
                } elseif ($name == 'server') {
-                       return $heading . "<select name='auth[server]'>" . Adminer\optionlist(array_keys($this->servers), SERVER) . "</select>\n";
+                       return $heading . "<select name='auth[server]'>" . Adminer\optionlist(array_keys($this->servers), Adminer\SERVER) . "</select>\n";
                }
        }
 }

diff --git a/plugins/master-slave.php b/plugins/master-slave.php
index dcf8e320a03fd1628aa6bf44cce0c41a8a32d104..0f52fbb6ad2f34a0e7ae1b327d0b3178a4dc38af 100644 (file)
--- a/plugins/master-slave.php
+++ b/plugins/master-slave.php
@@ -17,8 +17,8 @@ class AdminerMasterSlave {
        }
 
        function credentials() {
-               if ($_POST && isset($this->masters[SERVER])) {
-                       return array($this->masters[SERVER], $_GET["username"], get_session("pwds"));
+               if ($_POST && isset($this->masters[Adminer\SERVER])) {
+                       return array($this->masters[Adminer\SERVER], $_GET["username"], get_session("pwds"));
                }
        }