From 4eee82a6d2214f9e502ebbe587d3e613c275f732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20M=C3=BCller?= Date: Wed, 22 Aug 2001 16:06:09 +0000 Subject: [PATCH] small relooking of start page --- ChangeLog | 7 + images/item.gif | Bin 0 -> 102 bytes lang/brazilian_portuguese.inc.php3 | 2 + lang/bulgarian-win1251.inc.php3 | 2 + lang/catala.inc.php3 | 2 + lang/chinese_big5.inc.php3 | 2 + lang/chinese_gb.inc.php3 | 2 + lang/czech-iso.inc.php3 | 2 + lang/czech-win1250.inc.php3 | 2 + lang/danish.inc.php3 | 2 + lang/dutch.inc.php3 | 2 + lang/english.inc.php3 | 2 + lang/french.inc.php3 | 6 +- lang/german.inc.php3 | 3 +- lang/italian.inc.php3 | 2 + lang/japanese.inc.php3 | 2 + lang/korean.inc.php3 | 2 + lang/norwegian.inc.php3 | 2 + lang/polish.inc.php3 | 2 + lang/portuguese.inc.php3 | 2 + lang/russian-koi8.inc.php3 | 2 + lang/russian-win1251.inc.php3 | 2 + lang/slovak-iso.inc.php3 | 2 + lang/spanish.inc.php3 | 2 + lang/swedish.inc.php3 | 2 + lang/thai.inc.php3 | 2 + main.php3 | 368 +++++++++++++++++++---------- 27 files changed, 297 insertions(+), 131 deletions(-) create mode 100644 images/item.gif diff --git a/ChangeLog b/ChangeLog index d8084da98..2366b7727 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-08-22 Olivier Müller + * main.php3: relooked the start page with the help of Loïc + * main.php3: allow everybody to look at the server vars and status + (removed check about 'References_priv'). + * lang/*: added $strServerChoice and $strPmaDocumentation. + * images/item.gif: used on main.php3 + 2001-08-22 Marc Delisle * Documentation.html: added a FAQ about index creation diff --git a/images/item.gif b/images/item.gif new file mode 100644 index 0000000000000000000000000000000000000000..1943de48d8c30e7c061b2e0da5e1a0f640ef1e00 GIT binary patch literal 102 zcmZ?wbhEHbWM^P!*v!Dd!o+gr%C$eg{^VrkFc1M0f3h$#FfcOcfYgG_U}g~(=yA~G VNWL}e@Y==?txfJ>4xDZb)&Q+Y63qYr literal 0 HcmV?d00001 diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index 7004554c6..d87afd2a0 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -303,4 +303,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index 89b50b8ed..dca10788d 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -303,4 +303,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index 4c7f22023..f289ecdea 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -298,4 +298,6 @@ $strShowThisQuery = ' Show this query here again '; $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index d0ef90827..5f25ee5aa 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -299,4 +299,6 @@ $strShowPHPInfo = 'Show PHP information'; // To translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = ' Use backquotes with tables and fields names '; //to translate +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 243fce935..2027e986e 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -303,4 +303,6 @@ $strShowThisQuery = ' Show this query here again '; $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index ab67ab098..c2f3eb6de 100644 --- a/lang/czech-iso.inc.php3 +++ b/lang/czech-iso.inc.php3 @@ -298,4 +298,6 @@ $strShowPHPInfo = 'Show PHP information'; // To translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index 2838948e5..401a1f899 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -299,4 +299,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index 929c0af42..dbbbebf16 100644 --- a/lang/danish.inc.php3 +++ b/lang/danish.inc.php3 @@ -298,4 +298,6 @@ $strShowPHPInfo = 'Show PHP information'; // To translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index 1b2268a42..bd44e0275 100644 --- a/lang/dutch.inc.php3 +++ b/lang/dutch.inc.php3 @@ -303,4 +303,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 6151f3b62..2083048fd 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -190,6 +190,7 @@ $strOverhead = 'Overhead'; $strPassword = 'Password'; $strPasswordEmpty = 'The password is empty!'; $strPasswordNotSame = 'The passwords aren\'t the same!'; +$strPmaDocumentation = 'phpMyAdmin Documentation'; $strPHPVersion = 'PHP Version'; $strPos1 = 'Begin'; $strPrevious = 'Previous'; @@ -238,6 +239,7 @@ $strSelectFields = 'Select fields (at least one):'; $strSelectNumRows = 'in query'; $strSend = 'Send'; $strSequence = 'Seq.'; +$strServerChoice = 'Server Choice'; $strServerVersion = 'Server version'; $strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...
If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').'; $strShow = 'Show'; diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index 0b0eb128b..d1471ddf0 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -189,8 +189,9 @@ $strOverhead = 'Perte'; $strPassword = 'Mot de passe'; $strPasswordEmpty = 'Le mot de passe est vide'; -$strPasswordNotSame = 'Les mots de passe doivent être identiques'; -$strPHPVersion = 'Version de PHP'; +$strPasswordNotSame = 'Les mots de passe doivent être identiques'; +$strPHPVersion = 'Version de PHP'; +$strPmaDocumentation = 'Documentation de phpMyAdmin'; $strPos1 = 'Début'; $strPrevious = 'Précédent'; $strPrimary = 'Primaire'; @@ -238,6 +239,7 @@ $strSelectFields = 'Choisir les champs $strSelectNumRows = 'dans la requête'; $strSend = 'Transmettre'; $strSequence = 'Séq.'; +$strServerChoice = 'Choix du serveur'; $strServerVersion = 'Version du serveur'; $strSetEnumVal = 'Les différentes valeurs des champs de type enum/set sont à spécifier sous la forme \'a\',\'b\',\'c\'...
Pour utiliser un caractère "\\" ou "\'" dans l\'une de ces valeurs, faites le précéder du caractère d\'échappement "\\" (par exemple \'\\\\xyz\' ou \'a\\\'b\').'; $strShow = 'Afficher'; diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index e1bd5193e..b922163f7 100644 --- a/lang/german.inc.php3 +++ b/lang/german.inc.php3 @@ -190,6 +190,7 @@ $strOverhead = ' $strPassword = 'Password'; $strPasswordEmpty = 'Es wurde kein Passwort angegeben!'; $strPasswordNotSame = 'Die eingegebenen Passwörter sind nicht identisch!'; +$strPmaDocumentation = 'phpMyAdmin Dokumentation'; $strPHPVersion = 'PHP Version'; $strPos1 = 'Anfang'; $strPrevious = 'Vorherige'; @@ -238,6 +239,7 @@ $strSelectFields = 'Felder ausw $strSelectNumRows = 'in der Abfrage'; $strSend = 'Senden'; $strSequence = ' Sequenz '; +$strServerChoice = 'Server Auswählen'; $strServerVersion = 'Server Version'; $strSetEnumVal = 'Wenn das Feld vom Type \'ENUM\' oder \'SET\' ist, benutzen Sie das Format: \'a\',\'b\',\'c\',....
Wann immer Sie ein Backslash ("\") oder ein einfaches Anführungszeichen ("\'") verwenden,
setzen Sie bitte ein Backslash vor das Zeichen. (z.B.: \'\\\\xyz\' or \'a\\\'b\').'; $strShow = 'Zeige'; @@ -297,5 +299,4 @@ $strWrongUser = 'Falscher Benutzername/Passwort. Zugriff verweigert.'; $strYes = 'Ja'; -// To translate ?> diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3 index dec7b1e18..1ffb9bd55 100644 --- a/lang/italian.inc.php3 +++ b/lang/italian.inc.php3 @@ -298,4 +298,6 @@ $strShowPHPInfo = 'Show PHP information'; // To translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/japanese.inc.php3 b/lang/japanese.inc.php3 index 9a4338c92..ee9fd310f 100644 --- a/lang/japanese.inc.php3 +++ b/lang/japanese.inc.php3 @@ -302,4 +302,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3 index b28f937f5..162a08178 100644 --- a/lang/korean.inc.php3 +++ b/lang/korean.inc.php3 @@ -302,4 +302,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index d1c2d5b7c..6c847332c 100644 --- a/lang/norwegian.inc.php3 +++ b/lang/norwegian.inc.php3 @@ -302,4 +302,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index 1ebe2a2cd..6102ead90 100644 --- a/lang/polish.inc.php3 +++ b/lang/polish.inc.php3 @@ -297,4 +297,6 @@ $strNoDatabases = 'No databases'; $strNoDropDatabases = '"DROP DATABASE" statements are disabled.'; $strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...
If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').'; $strStrucExcelCSV = 'CSV for Ms Excel data'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index 033f2ab23..1b49bfdb7 100644 --- a/lang/portuguese.inc.php3 +++ b/lang/portuguese.inc.php3 @@ -302,4 +302,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index 2235ed39c..e6cd5019a 100644 --- a/lang/russian-koi8.inc.php3 +++ b/lang/russian-koi8.inc.php3 @@ -298,4 +298,6 @@ $strSetEnumVal = 'If field type is "enum" or "set", please enter the values usin $strShowPHPInfo = 'Show PHP information'; // To translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index 6ba0a017e..70725de98 100644 --- a/lang/russian-win1251.inc.php3 +++ b/lang/russian-win1251.inc.php3 @@ -298,4 +298,6 @@ $strSetEnumVal = 'If field type is "enum" or "set", please enter the values usin $strShowPHPInfo = 'Show PHP information'; // To translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3 index f30e5fb5b..5fb522ac3 100644 --- a/lang/slovak-iso.inc.php3 +++ b/lang/slovak-iso.inc.php3 @@ -299,4 +299,6 @@ $strSetEnumVal = 'If field type is "enum" or "set", please enter the values usin $strShowPHPInfo = 'Show PHP information'; // To translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index 75d72cd19..dc83cde01 100644 --- a/lang/spanish.inc.php3 +++ b/lang/spanish.inc.php3 @@ -300,4 +300,6 @@ $strSetEnumVal = 'If field type is "enum" or "set", please enter the values usin $strShowPHPInfo = 'Show PHP information'; // To translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index 04226e1e5..dca3ec657 100644 --- a/lang/swedish.inc.php3 +++ b/lang/swedish.inc.php3 @@ -303,4 +303,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index eb4ae3f36..4f75f6b18 100644 --- a/lang/thai.inc.php3 +++ b/lang/thai.inc.php3 @@ -303,4 +303,6 @@ $strShowThisQuery = ' Show this query here again '; //to translate $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strUseBackquotes = 'Use backquotes with tables and fields\' names'; +$strServerChoice = 'Server Choice';//to translate +$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate ?> diff --git a/main.php3 b/main.php3 index 9f7e4219f..ec04a2fd6 100755 --- a/main.php3 +++ b/main.php3 @@ -45,7 +45,7 @@ if (empty($cfgLang)) { [  ]
\n"; + echo "\n


\n"; } @@ -64,6 +64,9 @@ if ($server > 0) { if (!empty($cfgServer['port'])) { echo ':' . $cfgServer['port']; } + if (!empty($cfgServer['socket'])) { + echo ':' . $cfgServer['socket']; + } echo "

\n"; } @@ -79,21 +82,22 @@ if (($server > 0) && isset($mode) && ($mode == 'reload')) { } else { echo $strReloadFailed; } - echo '

' . "\n"; + echo '

' . "\n\n"; } - /** - * Displays the servers choice form and/or the server-related links + * Displays the MySQL servers choice form */ -?> -
    - 1) { ?> -
  • + + + + + + + + +
    - +
    +
    + + + -// 2. The server-related links if $server > 0 (a server selected) + 0 && empty($cfgServer['only_db'])) { + ?> + + + + + 0) + + +/** + * Displays the phpMyAdmin related links + */ ?> - -
  • - phpMyAdmin -
    • + + + + +
    + + + + + 0 if ($create) { echo "\n"; ?> - -
  • -
    -
    - - - - - - -
    • + + + + + - -
  • - - -

    -
    • - + + + + + + + + + - -
  • - -   -
    • -
  • - -   -
    • - -
  • - -   -
    • + + + + -
  • - -   -
    • + + + + 0 $rows = @mysql_num_rows($result); if (!empty($rows)) { ?> -
  • - -   -
    • -
  • - - -

    -
    • - + + + + + + + - // 2.2. No authentication + + + + + + - -
  • -
    -
    - - - - - - -
    • + + + + + - -
  • - -   -
    • + + + + + -
  • - -   -
    • + + + + -
  • - -   -
    • + + + + -
  • - -   -
    • -

    + + + + -
  • - -   -
    • -
  • - - -

    -
    • + + + + + + + + 0) + } // end of 2 (no AdvAuth case) + + echo "\n"; + ?> +
    MySQL
    item +
    +
    + + + + + +
    +
    item + +   + +
    item + +   + +
    item + +   + +
    item + +   + +
    item + +   + +
    item + + +
    item + + +
    item +
    +
    + + + + + +
    +
    item + +   + +
    item + +   + +
    item + +   + +
    item + +   + +
    item + +   + +
    item + + +
    +     		     + + + + - -
  • - -
    • + + + + + - -
  • - -
    • -
  • - -     - [ChangeLog]  - [CVS] -
    • - + + + + + + + + + + + + + + + +
    phpMyAdmin
    item + +
    item + +
    item + +
    item + +
    +       [ChangeLog] +   [CVS] +
    +