diff --git a/adminer/drivers/mongo.inc.php b/adminer/drivers/mongo.inc.php index e51a712f..a64f214b 100644 --- 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 869ed24c..d564207c 100644 --- 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 9b9aefae..2ef77f65 100644 --- 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 1a8dfaf0..518f217e 100644 --- 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 57224600..62274c1e 100644 --- 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 4e5083a8..d5539388 100644 --- 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 86a63240..73bd26d8 100644 --- 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 600fdcb6..55ca6baa 100644 --- a/adminer/include/design.inc.php +++ b/adminer/include/design.inc.php @@ -109,7 +109,7 @@ var thousandsSeparator = ''; $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 ac6e7afb..e11707c0 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -394,7 +394,7 @@ function get_rows($query, $connection2 = null, $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 59f30909..fb71a332 100644 --- 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 f2ee4987..579b8bc3 100644 --- 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 89d317ce..46ce2468 100644 --- 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 404f009c..e2c7309a 100644 --- 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 d73c33bc..6c638826 100644 --- 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 "

" . error() . "\n"; } return $return; diff --git a/plugins/dump-alter.php b/plugins/dump-alter.php index 8c828521..bfc559eb 100644 --- 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 1dd2bf92..56a2bc56 100644 --- 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 b9bc6205..1ab9be04 100644 --- 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 "\n"; + echo "\n"; register_shutdown_function(array($this, '_database')); } $connection = Adminer\connection(); diff --git a/plugins/foreign-system.php b/plugins/foreign-system.php index 53af6ff2..27ba976b 100644 --- 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 709c1d3c..360a23e0 100644 --- 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 cda09de2..42b94224 100644 --- 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 . "\n"; + return $heading . "\n"; } } } diff --git a/plugins/master-slave.php b/plugins/master-slave.php index dcf8e320..0f52fbb6 100644 --- 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")); } }