From dd9a4a2b657632e10677542f1fe9aa2d50d477e9 Mon Sep 17 00:00:00 2001 From: Peter Knut Date: Tue, 15 Oct 2024 22:47:48 +0200 Subject: [PATCH] Remove deprecated HTML table parameters --- adminer/db.inc.php | 8 ++++---- adminer/include/adminer.inc.php | 4 ++-- adminer/include/functions.inc.php | 2 +- adminer/privileges.inc.php | 2 +- adminer/table.inc.php | 6 +++--- adminer/user.inc.php | 2 +- adminer/variables.inc.php | 2 +- coverage.php | 2 +- plugins/table-indexes-structure.php | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/adminer/db.inc.php b/adminer/db.inc.php index ffc0bf17..078904a5 100644 --- a/adminer/db.inc.php +++ b/adminer/db.inc.php @@ -163,7 +163,7 @@ if ($adminer->homepage()) { echo "

" . lang('Routines') . "

\n"; $routines = routines(); if ($routines) { - echo "\n"; + echo "
\n"; echo '\n"; odd(''); foreach ($routines as $row) { @@ -186,7 +186,7 @@ if ($adminer->homepage()) { echo "

" . lang('Sequences') . "

\n"; $sequences = get_vals("SELECT sequence_name FROM information_schema.sequences WHERE sequence_schema = current_schema() ORDER BY sequence_name"); if ($sequences) { - echo "
' . lang('Name') . '' . lang('Type') . '' . lang('Return type') . "
\n"; + echo "
\n"; echo "\n"; odd(''); foreach ($sequences as $val) { @@ -201,7 +201,7 @@ if ($adminer->homepage()) { echo "

" . lang('User types') . "

\n"; $user_types = types(); if ($user_types) { - echo "
" . lang('Name') . "
\n"; + echo "
\n"; echo "\n"; odd(''); foreach ($user_types as $val) { @@ -216,7 +216,7 @@ if ($adminer->homepage()) { echo "

" . lang('Events') . "

\n"; $rows = get_rows("SHOW EVENTS"); if ($rows) { - echo "
" . lang('Name') . "
\n"; + echo "
\n"; echo "\n"; foreach ($rows as $row) { echo ""; diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index ccdc267b..269e9594 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -358,7 +358,7 @@ class Adminer { echo "

"; if ($showList) { - echo "
" . lang('Name') . "" . lang('Schedule') . "" . lang('Start') . "" . lang('End') . "
\n"; + echo "
\n"; echo "\n"; foreach ($partition_info["partition_names"] as $key => $name) { @@ -374,7 +374,7 @@ class Adminer { * @return null */ function tableIndexesPrint($indexes) { - echo "
" . lang('Partition') . "" . lang('Values') . "
\n"; + echo "
\n"; echo "\n"; foreach ($indexes as $name => $index) { diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index 9f5cb210..b7d1d5ef 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -1318,7 +1318,7 @@ function select_value($val, $link, $field, $text_length) { . "
" . lang('Type') . "" . lang('Column (length)') . "
" . select_value($v, $link, $field, $text_length) ; } - return "$return
"; + return "$return
"; } if (!$link) { $link = $adminer->selectLink($val, $field); diff --git a/adminer/privileges.inc.php b/adminer/privileges.inc.php index 6e1e31aa..c8182a89 100644 --- a/adminer/privileges.inc.php +++ b/adminer/privileges.inc.php @@ -14,7 +14,7 @@ echo "

\n"; hidden_fields_get(); echo "\n"; echo ($grant ? "" : "\n"); -echo "\n"; +echo "
\n"; echo "\n"; while ($row = $result->fetch_assoc()) { diff --git a/adminer/table.inc.php b/adminer/table.inc.php index 569808f5..c68e8369 100644 --- a/adminer/table.inc.php +++ b/adminer/table.inc.php @@ -59,7 +59,7 @@ if (!is_view($table_status)) { echo "

" . lang('Foreign keys') . "

\n"; $foreign_keys = foreign_keys($TABLE); if ($foreign_keys) { - echo "
" . lang('Username') . "" . lang('Server') . "
\n"; + echo "
\n"; echo "\n"; foreach ($foreign_keys as $name => $foreign_key) { echo ""; @@ -83,9 +83,9 @@ if (support(is_view($table_status) ? "view_trigger" : "trigger")) { echo "

" . lang('Triggers') . "

\n"; $triggers = triggers($TABLE); if ($triggers) { - echo "
" . lang('Source') . "" . lang('Target') . "" . lang('ON DELETE') . "" . lang('ON UPDATE') . "
\n"; + echo "
\n"; foreach ($triggers as $key => $val) { - echo "
" . h($val[0]) . "" . h($val[1]) . "" . h($key) . "" . lang('Alter') . "\n"; + echo "
" . h($val[0]) . "" . h($val[1]) . "" . h($key) . "" . lang('Alter') . "\n"; } echo "
\n"; } diff --git a/adminer/user.inc.php b/adminer/user.inc.php index 6b4d2e19..8180d257 100644 --- a/adminer/user.inc.php +++ b/adminer/user.inc.php @@ -148,7 +148,7 @@ if ($_POST) { \n"; +echo "\n"; echo ""; $i = 0; diff --git a/adminer/variables.inc.php b/adminer/variables.inc.php index 3976440d..46604f8b 100644 --- a/adminer/variables.inc.php +++ b/adminer/variables.inc.php @@ -6,7 +6,7 @@ $variables = ($status ? show_status() : show_variables()); if (!$variables) { echo "

" . lang('No rows.') . "\n"; } else { - echo "

" . lang('Privileges') . doc_link(array('sql' => "grant.html#priv_level")) . "
\n"; + echo "
\n"; foreach ($variables as $key => $val) { echo ""; echo "
" . h($key) . ""; diff --git a/coverage.php b/coverage.php index f10fc7fa..7258ab0d 100644 --- a/coverage.php +++ b/coverage.php @@ -62,7 +62,7 @@ if (!extension_loaded("xdebug")) { if (file_exists($coverage_filename)) { // display list of files $coverage = unserialize(file_get_contents($coverage_filename)); - echo "\n"; + echo "
\n"; foreach (array_merge(glob("adminer/*.php"), glob("adminer/include/*.php"), glob("editor/*.php"), glob("editor/include/*.php")) as $filename) { $cov = $coverage[realpath($filename)]; $ratio = 0; diff --git a/plugins/table-indexes-structure.php b/plugins/table-indexes-structure.php index 28923955..e0d2b714 100644 --- a/plugins/table-indexes-structure.php +++ b/plugins/table-indexes-structure.php @@ -13,7 +13,7 @@ class AdminerTableIndexesStructure { * @return bool */ function tableIndexesPrint($indexes) { - echo "
\n"; + echo "
\n"; echo "\n"; foreach ($indexes as $name => $index) { echo "
" . lang('Name') . "" . lang('Type') . "" . lang('Columns') . "
" . h($name) . "" . $index['type'];