From d30facef28deb05451693878e95142fb56cea355 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 1 May 2009 10:41:33 +0000 Subject: [PATCH] Remove useless table attributes (thanks to Juraj Krivda) git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@595 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- auth.inc.php | 2 +- call.inc.php | 2 +- create.inc.php | 4 ++-- dump.inc.php | 4 ++-- edit.inc.php | 2 +- event.inc.php | 2 +- foreign.inc.php | 2 +- functions.inc.php | 2 +- index.php | 6 +++--- indexes.inc.php | 2 +- privileges.inc.php | 2 +- procedure.inc.php | 2 +- processlist.inc.php | 2 +- select.inc.php | 2 +- table.inc.php | 8 ++++---- trigger.inc.php | 2 +- user.inc.php | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/auth.inc.php b/auth.inc.php index 038605bf..5db786de 100644 --- a/auth.inc.php +++ b/auth.inc.php @@ -42,7 +42,7 @@ function auth_error() { page_header(lang('Login'), (isset($username) ? lang('Invalid credentials.') : (isset($_POST["server"]) ? lang('Sessions must be enabled.') : ($_POST ? lang('Session expired, please login again.') : ""))), null); ?>
- +
diff --git a/call.inc.php b/call.inc.php index 709c65ea..950fd7f8 100644 --- a/call.inc.php +++ b/call.inc.php @@ -49,7 +49,7 @@ if (!$error && $_POST) { \n"; + echo "
" />
\n"; foreach ($in as $key) { $field = $routine["fields"][$key]; echo "
" . htmlspecialchars($field["field"]) . ""; diff --git a/create.inc.php b/create.inc.php index 58af43b1..6c5a991a 100644 --- a/create.inc.php +++ b/create.inc.php @@ -122,7 +122,7 @@ if ($suhosin && count($row["fields"]) > $suhosin) {

- +
@@ -155,7 +155,7 @@ if ($mysql->server_info >= 5.1) { (" />) : " />

-> +> $val) { diff --git a/dump.inc.php b/dump.inc.php index 06f75ec5..32d633fa 100644 --- a/dump.inc.php +++ b/dump.inc.php @@ -145,7 +145,7 @@ function check(td, name, value) {

\n"; +echo "\n"; foreach (array('', 'USE', 'DROP, CREATE', 'CREATE', 'CREATE, ALTER') as $val) { echo ""; } @@ -161,7 +161,7 @@ foreach ((strlen($_GET["db"]) ? array($_GET["db"]) : get_databases()) as $db) { } echo "
" . lang('Database') . "" . ($val ? $val : lang('skip')) . "
\n"; -echo "\n"; +echo "
" . lang('Tables') . "" . lang('Structure') . "" . lang('Data') . "
\n"; foreach (array('', 'DROP, CREATE', 'CREATE', 'CREATE, ALTER') as $val) { echo ""; } diff --git a/edit.inc.php b/edit.inc.php index 7e4b533a..32eccf85 100644 --- a/edit.inc.php +++ b/edit.inc.php @@ -64,7 +64,7 @@ if ($_POST) { \n"; + echo "
" . lang('Tables') . "" . lang('Structure') . "" . lang('Data') . "
" . ($val ? $val : lang('skip')) . "
\n"; foreach ($fields as $name => $field) { echo "
" . htmlspecialchars($name) . ""; $value = (!isset($row) ? $field["default"] : diff --git a/event.inc.php b/event.inc.php index 23b2596f..a4e31bf1 100644 --- a/event.inc.php +++ b/event.inc.php @@ -36,7 +36,7 @@ if ($_POST) { ?> - +
diff --git a/foreign.inc.php b/foreign.inc.php index f160c873..8100a60b 100644 --- a/foreign.inc.php +++ b/foreign.inc.php @@ -68,7 +68,7 @@ function add_row(field) {

-
" maxlength="64" />
" />
" />
+
num_rows) { echo "

" . lang('No rows.') . "

\n"; } else { - echo "
\n"; + echo "
\n"; $links = array(); $indexes = array(); $columns = array(); diff --git a/index.php b/index.php index 253aa864..e213d7ff 100644 --- a/index.php +++ b/index.php @@ -180,7 +180,7 @@ if (isset($_GET["download"])) { echo "

" . lang('No tables.') . "

\n"; } else { echo "\n"; - echo "
\n"; + echo "
\n"; echo '\n"; while ($row = $result->fetch_assoc()) { table_comment($row); @@ -204,7 +204,7 @@ if (isset($_GET["download"])) { echo "

" . lang('Routines') . "

\n"; $result = $mysql->query("SELECT * FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = '" . $mysql->escape_string($_GET["db"]) . "'"); if ($result->num_rows) { - echo "
' . lang('Table') . '' . lang('Engine') . '' . lang('Comment') . '' . lang('Collation') . '' . lang('Data Length') . '' . lang('Index Length') . '' . lang('Data Free') . '' . lang('Auto Increment') . '' . lang('Rows') . "
\n"; + echo "
\n"; while ($row = $result->fetch_assoc()) { echo ""; echo ""; @@ -221,7 +221,7 @@ if (isset($_GET["download"])) { if ($mysql->server_info >= 5.1 && ($result = $mysql->query("SHOW EVENTS"))) { echo "

" . lang('Events') . "

\n"; if ($result->num_rows) { - echo "
" . htmlspecialchars($row["ROUTINE_TYPE"]) . "
\n"; + echo "
\n"; echo "\n"; while ($row = $result->fetch_assoc()) { echo ""; diff --git a/indexes.inc.php b/indexes.inc.php index b482712e..f8c5b32b 100644 --- a/indexes.inc.php +++ b/indexes.inc.php @@ -94,7 +94,7 @@ function add_column(field) { // ]]> -
" . lang('Name') . "" . lang('Schedule') . "" . lang('Start') . "" . lang('End') . "
+
query("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1) AS User, SUBSTRING_INDEX(CURRENT_USER, '@', -1) AS Host"); } -echo "
\n"; +echo "
\n"; echo "\n"; while ($row = $result->fetch_assoc()) { echo '\n"; diff --git a/procedure.inc.php b/procedure.inc.php index 050d3b82..a74a0035 100644 --- a/procedure.inc.php +++ b/procedure.inc.php @@ -37,7 +37,7 @@ if ($_POST) { ?> -
 " . lang('Username') . "" . lang('Server') . "
' . lang('edit') . '' . htmlspecialchars($row["User"]) . "" . htmlspecialchars($row["Host"]) . "
+
diff --git a/processlist.inc.php b/processlist.inc.php index 32e5c642..f4f1c6a8 100644 --- a/processlist.inc.php +++ b/processlist.inc.php @@ -12,7 +12,7 @@ page_header(lang('Process list'), $error); ?> - +
query("SHOW PROCESSLIST"); for ($i=0; $row = $result->fetch_assoc(); $i++) { diff --git a/select.inc.php b/select.inc.php index 0b45b1eb..63f25662 100644 --- a/select.inc.php +++ b/select.inc.php @@ -270,7 +270,7 @@ for (var i=0; > i; i++) { } } - echo "
\n"; + echo "
\n"; for ($j=0; $row = $result->fetch_assoc(); $j++) { if (!$j) { echo ''; diff --git a/table.inc.php b/table.inc.php index 9b489fb5..5754b677 100644 --- a/table.inc.php +++ b/table.inc.php @@ -8,7 +8,7 @@ page_header(lang('Table') . ": " . htmlspecialchars($_GET["table"]), $error); if ($result) { $table_status = table_status($_GET["table"]); $auto_increment_only = true; - echo "
\n"; + echo "
\n"; while ($row = $result->fetch_assoc()) { if (!$row["auto_increment"]) { $auto_increment_only = false; @@ -28,7 +28,7 @@ if ($result) { echo "

" . lang('Indexes') . "

\n"; $indexes = indexes($_GET["table"]); if ($indexes) { - echo "
\n"; + echo "
\n"; foreach ($indexes as $index) { ksort($index["columns"]); $print = array(); @@ -45,7 +45,7 @@ if ($result) { echo "

" . lang('Foreign keys') . "

\n"; $foreign_keys = foreign_keys($_GET["table"]); if ($foreign_keys) { - echo "
\n"; + echo "
\n"; foreach ($foreign_keys as $name => $foreign_key) { echo ""; echo ""; @@ -65,7 +65,7 @@ if ($mysql->server_info >= 5) { echo "

" . lang('Triggers') . "

\n"; $result = $mysql->query("SHOW TRIGGERS LIKE '" . $mysql->escape_string(addcslashes($_GET["table"], "%_")) . "'"); if ($result->num_rows) { - echo "
" . implode(", ", array_map('htmlspecialchars', $foreign_key["source"])) . "
\n"; + echo "
\n"; while ($row = $result->fetch_assoc()) { echo "\n"; } diff --git a/trigger.inc.php b/trigger.inc.php index b880db81..52e09f77 100644 --- a/trigger.inc.php +++ b/trigger.inc.php @@ -30,7 +30,7 @@ if ($_POST) { ?> -
$row[Timing]$row[Event]" . htmlspecialchars($row["Trigger"]) . "' . lang('Alter') . "
+
diff --git a/user.inc.php b/user.inc.php index 52bdc1d7..0488afcb 100644 --- a/user.inc.php +++ b/user.inc.php @@ -131,7 +131,7 @@ if ($_POST) { ?> -
" maxlength="64" />
+
@@ -139,7 +139,7 @@ if ($_POST) { \n"; +echo "
" />
" />
" />
\n"; echo ""; $i = 0; foreach ($grants as $object => $grant) {
" . lang('Privileges') . "