* config.inc.php3, libraries/common.lib.php3:
      Code for $cfg['PmaAbsoluteUri_DisableWarning']
This commit is contained in:
Robin Johnson
2002-07-04 07:19:47 +00:00
parent 52002e82da
commit 563b7444aa
3 changed files with 66 additions and 38 deletions

View File

@@ -494,8 +494,6 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
if (empty($cfg['PmaAbsoluteUri'])) {
$DisplayPmaAbsoluteUriWarning = 1;
// Setup a default value to let the people and lazy syadmins work anyway,
// but display a big warning on the main.php3 page. --Olivier
@@ -504,6 +502,16 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
. (!empty($HTTP_SERVER_VARS['SERVER_PORT']) ? ':' . $HTTP_SERVER_VARS['SERVER_PORT'] : '')
. substr($HTTP_SERVER_VARS['SCRIPT_NAME'], 0, strrpos($HTTP_SERVER_VARS['SCRIPT_NAME'], '/')+1);
// We display the warning by default, but not if it is disabled thru
// via the $cfg['PmaAbsoluteUri_DisableWarning'] variable.
// This is intended for sysadmins that actually want the default behaviour
// of auto-detection due to their setup.
// See the mailing list message:
// http://sourceforge.net/mailarchive/forum.php?thread_id=859093&forum_id=2141
if ($cfg['PmaAbsoluteUri_DisableWarning'] === FALSE) {
$DisplayPmaAbsoluteUriWarning = 1;
}
}
// Adds a trailing slash et the end of the phpMyAdmin uri if it does not
// exist