mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-08 07:36:44 +02:00
Code Issues Releases Wiki Activity

Move constants to namespace

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-06 17:34:21 +01:00
parent 5a84ff7647
commit 0541680d73
21 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/drivers/mongo.inc.php
View File

@@ -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 {

2
adminer/drivers/mssql.inc.php
View File

@@ -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;

4
adminer/drivers/mysql.inc.php
View File

@@ -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 {

2
adminer/drivers/oracle.inc.php
View File

@@ -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;

2
adminer/drivers/pgsql.inc.php
View File

@@ -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;

2
adminer/drivers/sqlite.inc.php
View File

@@ -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 {

6
adminer/include/bootstrap.inc.php
View File

@@ -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) . '&' : '')

2
adminer/include/design.inc.php
View File

@@ -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

2
adminer/include/functions.inc.php
View File

@@ -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;

2
plugins/drivers/clickhouse.php
View File

@@ -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 {

15
plugins/drivers/elastic.php
View File

@@ -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() {

2
plugins/drivers/elastic5.php
View File

@@ -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 {

2
plugins/drivers/firebird.php
View File

@@ -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 {

4
plugins/drivers/simpledb.php
View File

@@ -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;

2
plugins/dump-alter.php
View File

@@ -9,7 +9,7 @@
class AdminerDumpAlter {
function dumpFormat() {
if (DRIVER == 'server') {
if (Adminer\DRIVER == 'server') {
return array('sql_alter' => 'Alter');
}
}

2
plugins/dump-date.php
View File

@@ -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()"));
}
}

2
plugins/dump-xml.php
View File

@@ -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();

4
plugins/foreign-system.php
View File

@@ -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"));

2
plugins/login-password-less.php
View File

@@ -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) {

6
plugins/login-servers.php
View File

@@ -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";
}
}
}

4
plugins/master-slave.php
View File

@@ -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"));
}
}