Abstract schemas()

diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index 4fae3badd120bcb98834e47f0176bc44400ce160..1cb76ebddeec2e79c510023a96124fff5ece74ab 100644 (file)
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -125,7 +125,7 @@ if ($adminer->homepage()) {
                                : "")))
                                . (support("table") ? "<input type='submit' name='truncate' value='" . lang('Truncate') . "'" . confirm() . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . "> " : "")
                                . "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . on_help("'DROP TABLE'") . ">\n";
-                               $databases = (support("scheme") ? schemas() : $adminer->databases());
+                               $databases = (support("scheme") ? $adminer->schemas() : $adminer->databases());
                                if (count($databases) != 1 && $jush != "sqlite") {
                                        $db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
                                        echo "<p>" . lang('Move to other database') . ": ";

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 144ff3462ec855d9a1ef1c621a67259c804af20d..787fec8b7ed953e7562d1e76e632ce3e0ef37b73 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -43,6 +43,13 @@ class Adminer {
                return get_databases($flush);
        }
 
+       /** Get list of schemas
+       * @return array
+       */
+       function schemas() {
+               return schemas();
+       }
+
        /** Specify limit for waiting on some slow queries like DB list
        * @return float number of seconds
        */
@@ -806,7 +813,7 @@ username.form['auth[driver]'].onchange();
        * @return null
        */
        function databasesPrint($missing) {
-               global $connection;
+               global $adminer, $connection;
                $databases = $this->databases();
                ?>
 <form action="">
@@ -821,7 +828,7 @@ username.form['auth[driver]'].onchange();
                echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
                if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
                        if (support("scheme")) {
-                               echo "<br><select name='ns'$db_events>" . optionlist(array("" => "(" . lang('schema') . ")") + schemas(), $_GET["ns"]) . "</select>";
+                               echo "<br><select name='ns'$db_events>" . optionlist(array("" => "(" . lang('schema') . ")") + $adminer->schemas(), $_GET["ns"]) . "</select>";
                                if ($_GET["ns"] != "") {
                                        set_schema($_GET["ns"]);
                                }

diff --git a/changes.txt b/changes.txt
index d3bcfa5578e0dd5d674a24724868cc6053444f50..adea07ce4bbc2d71bd33e3482fdf55a5f5f4aa78 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -21,6 +21,7 @@ SQLite: Allow editing primary key
 SQLite: Allow editing foreign keys
 PostgreSQL: Fix handling of nextval() default values
 PostgreSQL: Support creating array columns
+Customization: Provide schemas()
 Thai translation
 
 Adminer 3.7.1 (released 2013-06-29):

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 94c9b749de04ba721450dc0cc002b2e963440ba2..2f8bcb98082fe390070f0c779a5bc66cf8fa027a 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -28,6 +28,10 @@ class Adminer {
                }
        }
 
+       function schemas() {
+               return schemas();
+       }
+
        function databases($flush = true) {
                return get_databases($flush);
        }

diff --git a/plugins/plugin.php b/plugins/plugin.php
index 0137b6b36e5c397066d214229bef3a9d4f0476ae..c0a0bd5b8207a8fb907077b78ba8ee62deaa6c61 100644 (file)
--- a/plugins/plugin.php
+++ b/plugins/plugin.php
@@ -107,6 +107,11 @@ class AdminerPlugin extends Adminer {
                return $this->_applyPlugin(__FUNCTION__, $args);
        }
 
+       function schemas() {
+               $args = func_get_args();
+               return $this->_applyPlugin(__FUNCTION__, $args);
+       }
+
        function databases() {
                $args = func_get_args();
                return $this->_applyPlugin(__FUNCTION__, $args);