From e1079bee2a730b47d17021c893e50379a1249844 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Sun, 8 Dec 2002 20:41:58 +0000 Subject: [PATCH] Started working on a new interface to server related pages. --- ChangeLog | 7 + Documentation.html | 4 +- header.inc.php3 | 36 ++- header_printview.inc.php3 | 2 +- lang/afrikaans-iso-8859-1.inc.php3 | 23 ++ lang/afrikaans-utf-8.inc.php3 | 23 ++ lang/albanian-iso-8859-1.inc.php3 | 23 ++ lang/albanian-utf-8.inc.php3 | 23 ++ lang/arabic-utf-8.inc.php3 | 23 ++ lang/arabic-windows-1256.inc.php3 | 23 ++ lang/brazilian_portuguese-iso-8859-1.inc.php3 | 23 ++ lang/brazilian_portuguese-utf-8.inc.php3 | 23 ++ lang/bulgarian-koi8-r.inc.php3 | 23 ++ lang/bulgarian-utf-8.inc.php3 | 23 ++ lang/bulgarian-windows-1251.inc.php3 | 23 ++ lang/catalan-iso-8859-1.inc.php3 | 23 ++ lang/catalan-utf-8.inc.php3 | 23 ++ lang/chinese_big5-utf-8.inc.php3 | 23 ++ lang/chinese_big5.inc.php3 | 23 ++ lang/chinese_gb-utf-8.inc.php3 | 23 ++ lang/chinese_gb.inc.php3 | 23 ++ lang/croatian-iso-8859-2.inc.php3 | 23 ++ lang/croatian-utf-8.inc.php3 | 23 ++ lang/croatian-windows-1250.inc.php3 | 23 ++ lang/czech-iso-8859-2.inc.php3 | 23 ++ lang/czech-utf-8.inc.php3 | 23 ++ lang/czech-windows-1250.inc.php3 | 23 ++ lang/danish-iso-8859-1.inc.php3 | 23 ++ lang/danish-utf-8.inc.php3 | 23 ++ lang/dutch-iso-8859-1.inc.php3 | 27 +- lang/dutch-utf-8.inc.php3 | 27 +- lang/english-iso-8859-1.inc.php3 | 23 ++ lang/english-utf-8.inc.php3 | 23 ++ lang/estonian-iso-8859-1.inc.php3 | 23 ++ lang/estonian-utf-8.inc.php3 | 23 ++ lang/finnish-iso-8859-1.inc.php3 | 23 ++ lang/finnish-utf-8.inc.php3 | 23 ++ lang/french-iso-8859-1.inc.php3 | 23 ++ lang/french-utf-8.inc.php3 | 23 ++ lang/galician-iso-8859-1.inc.php3 | 23 ++ lang/galician-utf-8.inc.php3 | 23 ++ lang/georgian-utf-8.inc.php3 | 23 ++ lang/german-iso-8859-1.inc.php3 | 24 ++ lang/german-utf-8.inc.php3 | 24 ++ lang/greek-iso-8859-7.inc.php3 | 23 ++ lang/greek-utf-8.inc.php3 | 23 ++ lang/hebrew-iso-8859-8-i.inc.php3 | 23 ++ lang/hindi-utf-8.inc.php3 | 23 ++ lang/hungarian-iso-8859-2.inc.php3 | 23 ++ lang/hungarian-utf-8.inc.php3 | 23 ++ lang/indonesian-iso-8859-1.inc.php3 | 23 ++ lang/indonesian-utf-8.inc.php3 | 23 ++ lang/italian-iso-8859-1.inc.php3 | 23 ++ lang/italian-utf-8.inc.php3 | 23 ++ lang/japanese-euc.inc.php3 | 23 ++ lang/japanese-sjis.inc.php3 | 23 ++ lang/japanese-utf-8.inc.php3 | 23 ++ lang/korean-ks_c_5601-1987.inc.php3 | 23 ++ lang/latvian-utf-8.inc.php3 | 23 ++ lang/latvian-windows-1257.inc.php3 | 23 ++ lang/lithuanian-utf-8.inc.php3 | 23 ++ lang/lithuanian-windows-1257.inc.php3 | 23 ++ lang/malay-iso-8859-1.inc.php3 | 23 ++ lang/malay-utf-8.inc.php3 | 23 ++ lang/norwegian-iso-8859-1.inc.php3 | 23 ++ lang/norwegian-utf-8.inc.php3 | 23 ++ lang/polish-iso-8859-2.inc.php3 | 23 ++ lang/polish-utf-8.inc.php3 | 23 ++ lang/portuguese-iso-8859-1.inc.php3 | 23 ++ lang/portuguese-utf-8.inc.php3 | 23 ++ lang/romanian-iso-8859-1.inc.php3 | 24 +- lang/romanian-utf-8.inc.php3 | 23 ++ lang/russian-dos-866.inc.php3 | 23 ++ lang/russian-koi8-r.inc.php3 | 23 ++ lang/russian-utf-8.inc.php3 | 23 ++ lang/russian-windows-1251.inc.php3 | 23 ++ lang/serbian-utf-8.inc.php3 | 23 ++ lang/serbian-windows-1250.inc.php3 | 23 ++ lang/slovak-iso-8859-2.inc.php3 | 23 ++ lang/slovak-utf-8.inc.php3 | 23 ++ lang/slovak-windows-1250.inc.php3 | 23 ++ lang/slovenian-iso-8859-2.inc.php3 | 23 ++ lang/slovenian-utf-8.inc.php3 | 23 ++ lang/slovenian-windows-1250.inc.php3 | 23 ++ lang/spanish-iso-8859-1.inc.php3 | 23 ++ lang/spanish-utf-8.inc.php3 | 23 ++ lang/swedish-iso-8859-1.inc.php3 | 23 ++ lang/swedish-utf-8.inc.php3 | 23 ++ lang/thai-tis-620.inc.php3 | 48 +++- lang/thai-utf-8.inc.php3 | 48 +++- lang/turkish-iso-8859-9.inc.php3 | 23 ++ lang/turkish-utf-8.inc.php3 | 23 ++ lang/ukrainian-utf-8.inc.php3 | 23 ++ lang/ukrainian-windows-1251.inc.php3 | 23 ++ libraries/common.lib.php3 | 44 ++- main.php3 | 15 +- server_common.inc.php3 | 38 +++ server_links.inc.php3 | 49 ++++ server_status.php3 | 253 ++++++++++++++++++ server_variables.php3 | 111 ++++++++ 100 files changed, 2634 insertions(+), 56 deletions(-) create mode 100644 server_common.inc.php3 create mode 100644 server_links.inc.php3 create mode 100644 server_status.php3 create mode 100644 server_variables.php3 diff --git a/ChangeLog b/ChangeLog index c5b2a96ff..ffde381b4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-12-08 Alexander M. Turek + * Documentation.html, header.inc.php3, header_printview.inc.php3, main.php3, + server_common.inc.php3, server_links.inc.php3, server_status.php3, + server_variables.php3, lang/*.inc.php3, libraries/common.lib.php3: + Started working on a new interface to server related pages. + * lang/thai-*.inc.php3: Updates, thanks to Arthit Suriyawongkul (bacteria). + 2002-12-07 Marc Delisle * db_search.php3, libraries/display_tbl.lib.php3, libraries/common.lib.php3 bug 633422, use a button if search result would generate a too big URL diff --git a/Documentation.html b/Documentation.html index b05867bf7..46ee35dc4 100755 --- a/Documentation.html +++ b/Documentation.html @@ -2559,8 +2559,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
  • Please try to keep up the file-naming conventions. Table-related stuff - goes to tbl_*.php3, db-related code to db_*.php3 and so - on. + goes to tbl_*.php3, db-related code to db_*.php3, + server-related tools to server_*.php3 and so on.
  • Please don't use verbose strings in your code, instead add the string diff --git a/header.inc.php3 b/header.inc.php3 index 7f286487a..d732f9077 100755 --- a/header.inc.php3 +++ b/header.inc.php3 @@ -82,16 +82,18 @@ input {font-family: ; font-size: ; font-size: ; color: #000000; background-color: #FFFFFF} select {font-family: ; font-size: ; color: #000000; background-color: #FFFFFF} textarea {font-family: ; font-size: ; color: #000000; background-color: #FFFFFF} -h1 {font-family: ; font-size: ; font-weight: bold} +h1 {font-family: ; font-size: ; font-weight: bold} +h2 {font-family: ; font-size: ; font-weight: bold} a:link {font-family: ; font-size: ; text-decoration: none; color: #0000FF} a:visited {font-family: ; font-size: ; text-decoration: none; color: #0000FF} a:hover {font-family: ; font-size: ; text-decoration: underline; color: #FF0000} a.nav:link {font-family: ; color: #000000} a.nav:visited {font-family: ; color: #000000} a.nav:hover {font-family: ; color: #FF0000} -a.h1:link {font-family: ; font-size: ; font-weight: bold; color: #000000} -a.h1:visited {font-family: ; font-size: ; font-weight: bold; color: #000000} -a.h1:hover {font-family: ; font-size: ; font-weight: bold; color: #FF0000} +a.h1:link {font-family: ; font-size: ; font-weight: bold; color: #000000} +a.h1:active {font-family: ; font-size: ; font-weight: bold; color: #000000} +a.h1:visited {font-family: ; font-size: ; font-weight: bold; color: #000000} +a.h1:hover {font-family: ; font-size: ; font-weight: bold; color: #FF0000} a.drop:link {font-family: ; color: #ff0000} a.drop:visited {font-family: ; color: #ff0000} a.drop:hover {font-family: ; color: #ffffff; background-color:#ff0000; text-decoration: none} @@ -224,17 +226,31 @@ if ($GLOBALS['cfg']['RightBgImage'] != '') { ?> > ' . "\n"; - echo ' ' . $GLOBALS['strDatabase'] . ' ' . htmlspecialchars($GLOBALS['db']) . '' . "\n"; - if (!empty($GLOBALS['table'])) { - echo ' - ' . $GLOBALS['strTable'] . ' ' . htmlspecialchars($GLOBALS['table']) . '' . "\n"; + $server_info = (!empty($cfg['Server']['verbose']) + ? $cfg['Server']['verbose'] + : $server_info = $cfg['Server']['host'] . (empty($cfg['Server']['port']) + ? '' + : ':' . $cfg['Server']['port'] + ) + ); + if (isset($GLOBALS['db'])) { + echo ' ' . $GLOBALS['strDatabase'] . ' ' . htmlspecialchars($GLOBALS['db']) . '' . "\n"; + if (!empty($GLOBALS['table'])) { + echo ' - ' . $GLOBALS['strTable'] . ' ' . htmlspecialchars($GLOBALS['table']) . '' . "\n"; + } + echo ' ' . sprintf($GLOBALS['strRunning'], '' . htmlspecialchars($server_info) . ''); + } else { + echo ' ' . sprintf($GLOBALS['strServer'], '' . htmlspecialchars($server_info) . ''); } - echo ' ' . sprintf($GLOBALS['strRunning'], ' ' . (($GLOBALS['cfg']['Server']['verbose']) ? htmlspecialchars($GLOBALS['cfg']['Server']['verbose']) : $GLOBALS['cfg']['Server']['host']) . '') . "\n"; - echo '' . "\n"; + echo "\n" . '' . "\n"; } echo "\n"; diff --git a/header_printview.inc.php3 b/header_printview.inc.php3 index 07756d851..f269165a8 100644 --- a/header_printview.inc.php3 +++ b/header_printview.inc.php3 @@ -52,7 +52,7 @@ if ($text_dir == 'ltr') {