From 476ef78631cde76c0f8d7cfb6e85e4af89d6e21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= Date: Fri, 9 Nov 2001 07:54:05 +0000 Subject: [PATCH] * extended last fix from Robin to the "MySQL runtime information" and "MySQL system variables" links; * but allowed these directives to be bypassed for super-users --- ChangeLog | 15 +++++++++++---- Documentation.html | 31 ++++++++++++++++++++++--------- config.inc.php3 | 9 +++++++-- libraries/common.lib.php3 | 9 +++++++++ main.php3 | 27 +++++++++++++++++++-------- phpinfo.php3 | 6 ++++-- 6 files changed, 72 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 632cea972..ab394cf7e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,14 +5,21 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-11-09 Loïc Chapeaux + * config.inc.php3; Documentation.html; main.php3; phpinfo.php3; + libraries/common.lib.php3: + - extended last fix from Robin to the "MySQL runtime information" and + "MySQL system variables" links; + - but allowed these directives to be bypassed for super-users. + 2001-11-08 Robin Johnson - * config.inc.php3,main.php3,phpinfo.php3: fixed bug #479303 - - $cfgShowPHPInfo added, false by default + * config.inc.php3; main.php3; phpinfo.php3: fixed bug #479303 + - $cfgShowPHPInfo added, false by default. 2001-11-07 Marc Delisle - * tbl_select.php3, lang/some files: modify $strLimitNumRows + * tbl_select.php3, lang/some files: modify $strLimitNumRows. * user_details.php3, lang/some files: modify $strRevokeGrantMessage - and $strRevokeMessage + and $strRevokeMessage. 2001-11-06 Loïc Chapeaux * db_details.php3, line 305; db_printview.php3, line 207: fixed bug #478592 diff --git a/Documentation.html b/Documentation.html index 0b6fde06e..be24c0bc6 100755 --- a/Documentation.html +++ b/Documentation.html @@ -562,6 +562,18 @@

+
+ $cfgShowMysqlInfo boolean
+ $cfgShowMysqlVars boolean
+ $cfgShowPhpInfo boolean +
+
+ Defines whether to display the "MySQL runtime information", + "MySQL system variables" and "PHP information" + links or not for simple users at the starting main (right) frame. +

+
+
$cfgShowStats boolean
Defines whether to display space usage and statistics about databases @@ -1054,27 +1066,28 @@

- I want to translate the messages to a new language or upgrade an - existing language, where do I start? + I want to translate the messages to a new language or upgrade an + existing language, where do I start?
- Always use the current cvs version of your language file. + Always use the current cvs version of your language file. For a new language, start from english.inc.php3. If you don't know - how to get the cvs version, please ask one of the developers. It would be - a good idea to subscribe to the phpmyadmin-translators discussion list, - because this is where we ask for translations of new messages. You can + how to get the cvs version, please ask one of the developers. It would be a + good idea to subscribe to the phpmyadmin-translators discussion list, + because this is where we ask for translations of new messages. You can then send your translations to the sourceforge.net translation tracker.

+

- My Apache server crashes when using phpMyAdmin. + My Apache server crashes when using phpMyAdmin.
You should first try the latest versions of Apache (and possibly MySQL).
See also the other FAQ entry about php bugs with output buffering.
If your server keeps crashing, please ask for help in the various - Apache support groups. + Apache support groups.

- +

I have found a bug. How do I inform developers?
diff --git a/config.inc.php3 b/config.inc.php3 index c78dabb4a..607efad7f 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -94,18 +94,23 @@ unset($cfgServers[0]); /** * Other core phpMyAdmin settings */ -$cfgOBGzip = TRUE; // use GZIP output buffering if possible +$cfgOBGzip = TRUE; // use GZIP output buffering if possible $cfgPersistentConnections = FALSE; // use persistent connections to MySQL database $cfgSkipLockedTables = FALSE; // mark used tables, make possible to show // locked tables (since MySQL 3.23.30) $cfgShowSQL = TRUE; // show SQL queries as run $cfgAllowUserDropDatabase = FALSE; // show a 'Drop database' link to normal users $cfgConfirm = TRUE; // confirm 'DROP TABLE' & 'DROP DATABASE' + $cfgShowStats = TRUE; // allow to display statistics and space usage in // the pages about database details and table // properties $cfgShowTooltip = TRUE; // display table comment as tooltip in left frame -$cfgShowPHPInfo = FALSE; // disable access to the phpinfo() call + +// In the main frame, at startup... +$cfgShowMysqlInfo = FALSE; // whether to display the "MySQL runtime +$cfgShowMysqlVars = FALSE; // information", "MySQL system variables" and "PHP +$cfgShowPhpInfo = FALSE; // information" links for simple users or not // In browse mode... $cfgShowBlob = FALSE; // display blob field contents diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 9fa8091cd..ddffbe294 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -109,6 +109,15 @@ if (!defined('__LIB_COMMON__')){ if (!isset($cfgShowTooltip)) { $cfgShowTooltip = TRUE; } + if (!isset($cfgShowMysqlInfo)) { + $cfgShowMysqlInfo = FALSE; + } + if (!isset($cfgShowMysqlVars)) { + $cfgShowMysqlVars = FALSE; + } + if (!isset($cfgShowPhpInfo)) { + $cfgShowPhpInfo = FALSE; + } if (!isset($cfgShowAll)) { $cfgShowAll = FALSE; } diff --git a/main.php3 b/main.php3 index 8bf70c7e5..cce0426ff 100755 --- a/main.php3 +++ b/main.php3 @@ -146,8 +146,8 @@ if ($server == 0 || count($cfgServers) > 1) { /** * Displays the mysql server related links */ -if ($server > 0) -{ +$is_superuser = FALSE; +if ($server > 0) { ?> @@ -228,6 +228,10 @@ if ($server > 0) // Server related links ?> + item @@ -236,6 +240,11 @@ if ($server > 0) + item @@ -244,7 +253,8 @@ if ($server > 0) - 0) +if ($is_superuser || $cfgShowPhpInfo) { + ?> item @@ -410,9 +419,11 @@ if($cfgShowPHPInfo) - + item diff --git a/phpinfo.php3 b/phpinfo.php3 index 7a4be00cd..3a68894a7 100644 --- a/phpinfo.php3 +++ b/phpinfo.php3 @@ -12,6 +12,8 @@ require('./libraries/common.lib.php3'); /** * Displays PHP information */ -if($cfgShowPHPInfo) - phpinfo(); +$is_superuser = @mysql_query('USE mysql', $userlink); +if ($is_superuser || $cfgShowPhpInfo) { + phpinfo(); +} ?>