From ed229500bf0c5f22e6a152a2d1fe959b5ce1ab67 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 3 Jul 2009 05:44:44 +0000 Subject: [PATCH] More separation git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@785 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/database.inc.php | 2 +- adminer/include/adminer.inc.php | 18 ++++++++++++++++++ adminer/include/design.inc.php | 10 +++++----- adminer/include/editing.inc.php | 10 +++++----- adminer/include/mysql.inc.php | 3 ++- adminer/index.php | 1 - adminer/schema.inc.php | 2 +- 7 files changed, 32 insertions(+), 14 deletions(-) diff --git a/adminer/database.inc.php b/adminer/database.inc.php index 759c6ea3..5f9780c7 100644 --- a/adminer/database.inc.php +++ b/adminer/database.inc.php @@ -77,7 +77,7 @@ if ($_POST) { if (strlen($_GET["db"])) { echo "\n"; } elseif (!$_POST["add_x"]) { - echo "\n"; + echo "\n"; } ?>

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 7aaf2d67..640478d4 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -1,6 +1,22 @@ ' . lang('select') . ' '; @@ -16,3 +32,5 @@ class AdminerBase { } } + +$adminer = (class_exists("Adminer") ? new Adminer : new AdminerBase); diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php index 402bd30b..a7ed6157 100644 --- a/adminer/include/design.inc.php +++ b/adminer/include/design.inc.php @@ -1,6 +1,6 @@ @@ -9,16 +9,16 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") { -<?php echo $title . (strlen($title2) ? ": " . htmlspecialchars($title2) : "") . (strlen($_GET["server"]) && $_GET["server"] != "localhost" ? htmlspecialchars("- $_GET[server]") : "") . " - " . lang('Adminer'); ?> +<?php echo $title . (strlen($title2) ? ": " . htmlspecialchars($title2) : "") . (strlen($_GET["server"]) && $_GET["server"] != "localhost" ? htmlspecialchars("- $_GET[server]") : "") . " - " . $adminer->name(); ?> - + "> - +