mirror of
https://github.com/vrana/adminer.git
synced 2025-08-25 23:36:20 +02:00
Move constants to namespace
This commit is contained in:
@@ -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 {
|
||||
|
@@ -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;
|
||||
|
@@ -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 {
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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 {
|
||||
|
@@ -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) . '&' : '')
|
||||
|
@@ -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
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user