From 9725dfb0be5778030838b93ec73c70e13de216f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20M=C3=BCller?= Date: Wed, 22 Aug 2001 21:00:55 +0000 Subject: [PATCH] language selection now via a pulldown menu --- ChangeLog | 1 + main.php3 | 110 ++++++++++++++++++++++++++---------------------------- 2 files changed, 53 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebecb5ab0..2a3e68fd4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ $Source$ (removed check about 'References_priv'). * lang/*: added $strServerChoice and $strPmaDocumentation. * images/item.gif: used on main.php3. + * main.php3: language selection now via a pulldown menu 2001-08-22 Marc Delisle * Documentation.html: added a FAQ about index creation. diff --git a/main.php3 b/main.php3 index 6fff1d77e..5d312d621 100755 --- a/main.php3 +++ b/main.php3 @@ -32,23 +32,6 @@ window.parent.frames['nav'].location.replace('./left.php3?lang='; - reset($available_languages); - while (list($id,$tmplang) = each($available_languages)) { - $lang_name = ucfirst(substr(strstr($tmplang[0], '|'), 1)); - echo "\n"; - ?> - [  ] -
\n"; -} - - /** * Displays the welcome message and the server informations */ @@ -58,8 +41,7 @@ if (empty($cfgLang)) { 0) { - $local_query = 'SELECT Version() as version'; - $res_version = mysql_query($local_query) or mysql_die('', $local_query, FALSE, FALSE); + $res_version = mysql_query('SELECT Version() as version') or mysql_die(); $row_version = mysql_fetch_array($res_version); echo '

MySQL ' . $row_version['version'] . ' ' . $strRunning . ' ' . $cfgServer['host']; if (!empty($cfgServer['port'])) { @@ -68,7 +50,7 @@ if ($server > 0) { if (!empty($cfgServer['socket'])) { echo ':' . $cfgServer['socket']; } - echo "

\n"; + echo "


\n"; } @@ -76,7 +58,7 @@ if ($server > 0) { * Reload mysql (flush privileges) */ if (($server > 0) && isset($mode) && ($mode == 'reload')) { - $result = mysql_query('FLUSH PRIVILEGES') or mysql_die('', 'FLUSH PRIVILEGES', FALSE); + $result = mysql_query('FLUSH PRIVILEGES'); echo '

'; if ($result != 0) { echo $strMySQLReloaded; @@ -120,7 +102,7 @@ if ($server == 0 || count($cfgServers) > 1) { if (!empty($val['only_db'])) { echo ' - ' . $val['only_db']; } - if (!empty($val['user'])) { + if (!empty($val['user']) && !($val['adv_auth'])) { echo ' (' . $val['user'] . ')'; } echo ' ' . "\n"; @@ -166,28 +148,13 @@ if ($server > 0 if ($cfgServer['adv_auth']) { // Get user's rights - $server_port = (empty($cfgServer['port'])) - ? '' - : ':' . $cfgServer['port']; - $server_socket = (empty($cfgServer['socket']) || PHP_INT_VERSION < 30010) - ? '' - : ':' . $cfgServer['socket']; - $stdlink = @mysql_connect( - $cfgServer['host'] . $server_port . $server_socket, - $cfgServer['stduser'], - $cfgServer['stdpass'] - ); - if ($stdlink == FALSE) { - $local_query = $connect_func . '(' - . $cfgServer['host'] . $server_port . $server_socket . ', ' - . $cfgServer['stduser'] . ', ' - . $cfgServer['stdpass'] . ')'; - mysql_die('', $local_query, FALSE, FALSE); + if (empty($cfgServer['port'])) { + $stdlink = mysql_connect($cfgServer['host'], $cfgServer['stduser'], $cfgServer['stdpass']); + } else { + $stdlink = mysql_connect($cfgServer['host'] . ':' . $cfgServer['port'], $cfgServer['stduser'], $cfgServer['stdpass']); } - // Does user have global Create priv? - $local_query = 'SELECT * FROM mysql.user WHERE User = \'' . sql_addslashes($cfgServer['user']) . '\''; - $rs_usr = mysql_query($local_query, $stdlink) or mysql_die('', $local_query, FALSE); + $rs_usr = mysql_query('SELECT * FROM mysql.user WHERE User = \'' . sql_addslashes($cfgServer['user']) . '\'', $stdlink); $result_usr = mysql_fetch_array($rs_usr); $create = ($result_usr['Create_priv'] == 'Y'); $db_to_create = ''; @@ -197,21 +164,12 @@ if ($server > 0 // find, in most cases it's probably the one he just dropped :) // (Note: we only get here after a browser reload, I don't know why) if (!$create) { - $userlink = @mysql_connect( - $cfgServer['host'] . $server_port . $server_socket, - $cfgServer['user'], - $cfgServer['password'] - ); - if ($userlink == FALSE) { - $local_query = 'mysql_connect(' - . $cfgServer['host'] . $server_port . $server_socket . ', ' - . $cfgServer['user'] . ', ' - . $cfgServer['password'] . ')'; - mysql_die('', $local_query, FALSE, FALSE); + if (empty($cfgServer['port'])) { + $userlink = mysql_connect($cfgServer['host'], $cfgServer['user'], $cfgServer['password']) or mysql_die(); + } else { + $userlink = mysql_connect($cfgServer['host'] . ':' . $cfgServer['port'], $cfgServer['user'], $cfgServer['password']) or mysql_die(); } - - $local_query = 'SELECT Db FROM mysql.db WHERE User = \'' . sql_addslashes($cfgServer['user']) . '\''; - $rs_usr = mysql_query($local_query, $stdlink) or mysql_die('', $local_query, FALSE); + $rs_usr = mysql_query('SELECT Db FROM mysql.db WHERE User = \'' . sql_addslashes($cfgServer['user']) . '\'', $stdlink); while ($row = mysql_fetch_array($rs_usr)) { if (!mysql_select_db($row['Db'], $userlink)) { $db_to_create = $row['Db']; @@ -431,6 +389,37 @@ if ($server > 0 phpMyAdmin + + + + item + +

+ Language: + + + + + item @@ -458,8 +447,13 @@ if ($server > 0 item -
-       [ChangeLog] + + + + + item + + phpMyAdmin ChangeLog   [CVS]