[adminer-svn] SF.net SVN: adminer:[1412] branches/sqlite
Database management in a single PHP file
Brought to you by:
jakubvrana
From: <jak...@us...> - 2010-04-10 23:01:32
|
Revision: 1412 http://adminer.svn.sourceforge.net/adminer/?rev=1412&view=rev Author: jakubvrana Date: 2010-04-10 23:01:25 +0000 (Sat, 10 Apr 2010) Log Message: ----------- Pass pgsql=localhost instead of driver=pgsql&server=localhost Modified Paths: -------------- branches/sqlite/adminer/drivers/mssql.inc.php branches/sqlite/adminer/drivers/mysql.inc.php branches/sqlite/adminer/drivers/pgsql.inc.php branches/sqlite/adminer/drivers/sqlite.inc.php branches/sqlite/adminer/include/adminer.inc.php branches/sqlite/adminer/include/auth.inc.php branches/sqlite/adminer/include/bootstrap.inc.php branches/sqlite/adminer/include/design.inc.php branches/sqlite/adminer/include/functions.inc.php branches/sqlite/adminer/lang/cs.inc.php branches/sqlite/compile.php branches/sqlite/editor/db.inc.php branches/sqlite/editor/include/adminer.inc.php Modified: branches/sqlite/adminer/drivers/mssql.inc.php =================================================================== --- branches/sqlite/adminer/drivers/mssql.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/drivers/mssql.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -11,7 +11,8 @@ $drivers["mssql"] = "MS SQL"; } -if ($_GET["driver"] == "mssql") { +if (isset($_GET["mssql"])) { + $_GET["driver"] = "mssql"; if (extension_loaded("sqlsrv")) { class Min_DB { var $extension = "sqlsrv", $_link, $_result, $server_info, $affected_rows, $error; Modified: branches/sqlite/adminer/drivers/mysql.inc.php =================================================================== --- branches/sqlite/adminer/drivers/mysql.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/drivers/mysql.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -3,10 +3,11 @@ $possible_drivers[] = "MySQL"; $possible_drivers[] = "PDO_MySQL"; if (extension_loaded("mysqli") || extension_loaded("mysql") || extension_loaded("pdo_mysql")) { - $drivers[""] = "MySQL"; + $drivers = array("server" => "MySQL") + $drivers; } if (!$_GET["driver"]) { + $_GET["driver"] = "server"; // backwards compatibility // MySQLi supports everything, MySQL doesn't support multiple result sets, PDO_MySQL doesn't support orgtable if (extension_loaded("mysqli")) { class Min_DB extends MySQLi { Modified: branches/sqlite/adminer/drivers/pgsql.inc.php =================================================================== --- branches/sqlite/adminer/drivers/pgsql.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/drivers/pgsql.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -5,7 +5,8 @@ $drivers["pgsql"] = "PostgreSQL"; } -if ($_GET["driver"] == "pgsql") { +if (isset($_GET["pgsql"])) { + $_GET["driver"] = "pgsql"; if (extension_loaded("pgsql")) { class Min_DB { var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error; Modified: branches/sqlite/adminer/drivers/sqlite.inc.php =================================================================== --- branches/sqlite/adminer/drivers/sqlite.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/drivers/sqlite.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -8,8 +8,14 @@ if (extension_loaded("sqlite") || extension_loaded("pdo_sqlite")) { $drivers["sqlite2"] = "SQLite 2"; } +if (isset($_GET["sqlite"])) { + $_GET["driver"] = "sqlite"; +} +if (isset($_GET["sqlite2"])) { + $_GET["driver"] = "sqlite2"; +} -if ($_GET["driver"] == "sqlite2" || $_GET["driver"] == "sqlite") { +if (ereg('^sqlite2?$', $_GET["driver"])) { if (extension_loaded($_GET["driver"] == "sqlite2" ? "sqlite" : "sqlite3")) { if ($_GET["driver"] == "sqlite2") { Modified: branches/sqlite/adminer/include/adminer.inc.php =================================================================== --- branches/sqlite/adminer/include/adminer.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/include/adminer.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -42,10 +42,10 @@ * @return null */ function loginForm() { - global $drivers; + global $drivers, $possible_drivers; ?> <table cellspacing="0"> -<tr><th><?php echo lang('Driver'); ?><td><?php echo (count($drivers) > 1 ? html_select("driver", $drivers, $_GET["driver"]) : "<input type='hidden' name='driver' value='" . key($drivers) . "'>" . reset($drivers)); ?></tr> +<tr><th><?php echo lang('System'); ?><td><?php echo (count($possible_drivers) > 3 ? html_select("driver", $drivers, $_GET["driver"]) : "<input type='hidden' name='driver' value='" . key($drivers) . "'>" . reset($drivers)); ?></tr> <tr><th><?php echo lang('Server'); ?><td><input name="server" value="<?php echo h($_GET["server"]); ?>"> <tr><th><?php echo lang('Username'); ?><td><input name="username" value="<?php echo h($_GET["username"]); ?>"> <tr><th><?php echo lang('Password'); ?><td><input type="password" name="password"> Modified: branches/sqlite/adminer/include/auth.inc.php =================================================================== --- branches/sqlite/adminer/include/auth.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/include/auth.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -19,7 +19,7 @@ } $same_connection = ((string) $_GET["driver"] === $_POST["driver"] && (string) $_GET["server"] === $_POST["server"] && $_GET["username"] === $_POST["username"]); if (count($_POST) == ($_POST["permanent"] ? 5 : 4) || !$same_connection) { // 4 - driver, server, username, password - $location = ($same_connection ? remove_from_uri(session_name()) : preg_replace('~\\?.*~', '', ME) . "?" . ($_POST["driver"] ? "driver=" . urlencode($_POST["driver"]) . "&" : "") . ($_POST["server"] != "" ? "server=" . urlencode($_POST["server"]) . "&" : "") . "username=" . urlencode($_POST["username"])); + $location = ($same_connection ? remove_from_uri(session_name()) : preg_replace('~\\?.*~', '', ME) . "?" . ($_POST["driver"] != "server" || $_POST["server"] != "" ? urlencode($_POST["driver"]) . "=" . urlencode($_POST["server"]) . "&" : "") . "username=" . urlencode($_POST["username"])); if (SID_FORM) { $location = substr_replace($location, SID . "&", strpos($location, '?') + 1, 0); } Modified: branches/sqlite/adminer/include/bootstrap.inc.php =================================================================== --- branches/sqlite/adminer/include/bootstrap.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/include/bootstrap.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -75,22 +75,23 @@ } @set_time_limit(0); // @ - can be disabled -include "../adminer/include/version.inc.php"; include "../adminer/include/functions.inc.php"; +include "../adminer/include/lang.inc.php"; +include "../adminer/lang/$LANG.inc.php"; +include "../adminer/include/pdo.inc.php"; +include "../adminer/drivers/sqlite.inc.php"; +include "../adminer/drivers/pgsql.inc.php"; +include "../adminer/drivers/mssql.inc.php"; +include "../adminer/drivers/mysql.inc.php"; // must be included as last driver +$_GET["server"] = $_GET[$_GET["driver"]]; // translate pgsql=localhost to driver=pgsql&server=localhost define("DB", $_GET["db"]); // for the sake of speed and size define("SID_FORM", SID && !ini_get("session.use_only_cookies") ? '<input type="hidden" name="' . session_name() . '" value="' . h(session_id()) . '">' : ''); -define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?' . (SID_FORM ? SID . '&' : '') . ($_GET["driver"] ? "driver=" . urlencode($_GET["driver"]) . '&' : '') . ($_GET["server"] != "" ? "server=" . urlencode($_GET["server"]) . '&' : '') . (isset($_GET["username"]) ? "username=" . urlencode($_GET["username"]) . '&' : '') . (DB != "" ? 'db=' . urlencode(DB) . '&' : '')); +define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?' . (SID_FORM ? SID . '&' : '') . (isset($_GET["server"]) ? urlencode($_GET["driver"]) . "=" . urlencode($_GET["server"]) . '&' : '') . (isset($_GET["username"]) ? "username=" . urlencode($_GET["username"]) . '&' : '') . (DB != "" ? 'db=' . urlencode(DB) . '&' : '')); -include "../adminer/include/lang.inc.php"; -include "../adminer/lang/$LANG.inc.php"; +include "../adminer/include/version.inc.php"; include "./include/adminer.inc.php"; include "../adminer/include/design.inc.php"; -include "../adminer/include/pdo.inc.php"; -include "../adminer/drivers/mysql.inc.php"; -include "../adminer/drivers/sqlite.inc.php"; -include "../adminer/drivers/pgsql.inc.php"; -include "../adminer/drivers/mssql.inc.php"; include "../adminer/include/xxtea.inc.php"; include "../adminer/include/auth.inc.php"; include "./include/connect.inc.php"; Modified: branches/sqlite/adminer/include/design.inc.php =================================================================== --- branches/sqlite/adminer/include/design.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/include/design.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -34,7 +34,7 @@ $link = substr(preg_replace('~(username|db)=[^&]*&~', '', ME), 0, -1); echo '<p id="breadcrumb"><a href="' . ($link ? h($link) : ".") . '">' . $drivers[$_GET["driver"]] . '</a> » '; //! hide in Editor $link = substr(preg_replace('~db=[^&]*&~', '', ME), 0, -1); - $server = (isset($_GET["server"]) ? h($_GET["server"]) : lang('Server')); + $server = ($_GET["server"] != "" ? h($_GET["server"]) : lang('Server')); if ($breadcrumb === false) { echo "$server\n"; } else { Modified: branches/sqlite/adminer/include/functions.inc.php =================================================================== --- branches/sqlite/adminer/include/functions.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/include/functions.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -437,8 +437,7 @@ */ function hidden_fields_get() { echo SID_FORM; - echo ($_GET["driver"] != "" ? '<input type="hidden" name="driver" value="' . h($_GET["driver"]) . '">' : ""); - echo ($_GET["server"] != "" ? '<input type="hidden" name="server" value="' . h($_GET["server"]) . '">' : ""); + echo (isset($_GET["server"]) ? '<input type="hidden" name="' . h($_GET["driver"]) . '" value="' . h($_GET["server"]) . '">' : ""); echo '<input type="hidden" name="username" value="' . h($_GET["username"]) . '">'; } Modified: branches/sqlite/adminer/lang/cs.inc.php =================================================================== --- branches/sqlite/adminer/lang/cs.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/adminer/lang/cs.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -229,7 +229,7 @@ 'Permanent login' => 'Trvalé přihlášení', '%d in total' => '%d celkem', 'Attachments' => 'Přílohy', - 'Driver' => 'Ovladač', + 'System' => 'Systém', 'last' => 'poslední', 'Network' => 'Síť', 'Geometry' => 'Geometrie', Modified: branches/sqlite/compile.php =================================================================== --- branches/sqlite/compile.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/compile.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -157,9 +157,9 @@ return call_user_func($match[2], file_get_contents(dirname(__FILE__) . "/$project/$match[1]")); } -$_GET["driver"] = ""; +$DRIVER = ""; if (file_exists(dirname(__FILE__) . "/adminer/drivers/" . $_SERVER["argv"][1] . ".inc.php")) { - $_GET["driver"] = $_SERVER["argv"][1]; + $DRIVER = $_SERVER["argv"][1]; array_shift($_SERVER["argv"]); } @@ -179,7 +179,7 @@ preg_match_all('~\\bfunction ([^(]+)~', file_get_contents($filename), $matches); //! respect context (extension, class) $functions = array_combine($matches[1], $matches[0]); unset($functions["__destruct"], $functions["Min_DB"], $functions["Min_Result"]); -foreach (glob(dirname(__FILE__) . "/adminer/drivers/" . ($_GET["driver"] ? $_GET["driver"] : "*") . ".inc.php") as $filename) { +foreach (glob(dirname(__FILE__) . "/adminer/drivers/" . ($DRIVER ? $DRIVER : "*") . ".inc.php") as $filename) { if ($filename != "mysql.inc.php") { $file = file_get_contents($filename); foreach ($functions as $val) { @@ -193,8 +193,9 @@ foreach (array("adminer", "editor") as $project) { $lang_ids = array(); // global variable simplifies usage in a callback function $file = file_get_contents(dirname(__FILE__) . "/$project/index.php"); - if ($_GET["driver"] && $_GET["driver"] != "mysql") { - include_once dirname(__FILE__) . "/adminer/drivers/$_GET[driver].inc.php"; + if ($DRIVER && $DRIVER != "mysql") { + $_GET[$DRIVER] = true; // to load the driver + include_once dirname(__FILE__) . "/adminer/drivers/$DRIVER.inc.php"; foreach (array("view", "event", "privileges", "user", "processlist", "variables", "trigger") as $feature) { if (!support($feature)) { $file = str_replace("} elseif (isset(\$_GET[\"$feature\"])) {\n\tinclude \"./$feature.inc.php\";\n", "", $file); @@ -208,8 +209,8 @@ } $file = preg_replace_callback('~\\b(include|require) "([^"]*)";~', 'put_file', $file); $file = str_replace('include "../adminer/include/coverage.inc.php";', '', $file); - if ($_GET["driver"]) { - $file = preg_replace('(include "../adminer/drivers/(?!' . preg_quote($_GET["driver"]) . ').*\\s*)', '', $file); + if ($DRIVER) { + $file = preg_replace('(include "../adminer/drivers/(?!' . preg_quote($DRIVER) . ').*\\s*)', '', $file); } $file = preg_replace_callback('~\\b(include|require) "([^"]*)";~', 'put_file', $file); // bootstrap.inc.php $file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file); @@ -229,7 +230,7 @@ $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file); $file = php_shrink($file); - $filename = $project . ($_GET["driver"] ? "-$_GET[driver]" : "") . ($_SESSION["lang"] ? "-$_SESSION[lang]" : "") . ".php"; // . "-$VERSION" + $filename = $project . ($DRIVER ? "-$DRIVER" : "") . ($_SESSION["lang"] ? "-$_SESSION[lang]" : "") . ".php"; // . "-$VERSION" fwrite(fopen($filename, "w"), $file); // file_put_contents() since PHP 5 echo "$filename created (" . strlen($file) . " B).\n"; } Modified: branches/sqlite/editor/db.inc.php =================================================================== --- branches/sqlite/editor/db.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/editor/db.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -3,8 +3,7 @@ ?> <form action=""><p> -<?php echo SID_FORM; ?> -<input type="hidden" name="username" value="<?php echo h($_GET["username"]); ?>"> +<?php hidden_fields_get(); ?> <input name="where[0][val]" value="<?php echo h($_GET["where"][0]["val"]); ?>"> <input type="submit" value="<?php echo lang('Search'); ?>" /> </form> Modified: branches/sqlite/editor/include/adminer.inc.php =================================================================== --- branches/sqlite/editor/include/adminer.inc.php 2010-04-10 21:43:23 UTC (rev 1411) +++ branches/sqlite/editor/include/adminer.inc.php 2010-04-10 23:01:25 UTC (rev 1412) @@ -29,7 +29,7 @@ function loginForm() { ?> <table cellspacing="0"> -<tr><th><?php echo lang('Username'); ?><td><input type="hidden" name="driver" value=""><input type="hidden" name="server" value=""><input name="username" value="<?php echo h($_GET["username"]); ?>"> +<tr><th><?php echo lang('Username'); ?><td><input type="hidden" name="driver" value="server"><input type="hidden" name="server" value=""><input name="username" value="<?php echo h($_GET["username"]); ?>"> <tr><th><?php echo lang('Password'); ?><td><input type="password" name="password"> </table> <?php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |