From 4a4b02b12e6d4d9ca5d51e6d5adfdb54ad156783 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 2 Mar 2007 15:10:40 +0000
Subject: [PATCH] use PMA_getenv('PHP_SELF')

---
 ChangeLog         |  3 +++
 server_status.php | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c38e24d2e..8f9832a14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
+2007-03-02 Marc Delisle  <lem9@users.sourceforge.net>
+    * server_status.php: use PMA_getenv('PHP_SELF'), thanks to Sebastian
+
 2007-03-02 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/common.lib.php: bug #1672379 Call to undefined function PMA_removeCookie()
 
diff --git a/server_status.php b/server_status.php
index fa3795418..07cdf156a 100644
--- a/server_status.php
+++ b/server_status.php
@@ -264,8 +264,9 @@ $links = array();
 
 // because of PMA_NO_VARIABLES_IMPORT, the $PHP_SELF globalized by 
 // grab_globals is not available here when register_globals = Off
+// and in some situations, $_SERVER['PHP_SELF'] is not defined
 $links['table'][$strFlushTables]
-    = $_SERVER['PHP_SELF'] . '?flush=TABLES&amp;' . PMA_generate_common_url();
+    = PMA_getenv('PHP_SELF') . '?flush=TABLES&amp;' . PMA_generate_common_url();
 $links['table'][$strShowOpenTables]
     = 'sql.php?sql_query=' . urlencode('SHOW OPEN TABLES') .
       '&amp;goto=server_status.php&amp;' . PMA_generate_common_url();
@@ -280,7 +281,7 @@ $links['repl']['MySQL - ' . $strDocu]
     = $cfg['MySQLManualBase'] . '/replication.html';
 
 $links['qcache'][$strFlushQueryCache]
-    = $_SERVER['PHP_SELF'] . '?flush=' . urlencode('QUERY CACHE') . '&amp;' .
+    = PMA_getenv('PHP_SELF') . '?flush=' . urlencode('QUERY CACHE') . '&amp;' .
       PMA_generate_common_url();
 $links['qcache']['MySQL - ' . $strDocu]
     = $cfg['MySQLManualBase'] . '/query-cache.html';
@@ -339,10 +340,10 @@ $hour_factor    = 3600 / $server_status['Uptime'];
 ?>
 <div id="statuslinks">
     <a href="<?php echo
-        $_SERVER['PHP_SELF'] . '?' . PMA_generate_common_url(); ?>"
+        PMA_getenv('PHP_SELF') . '?' . PMA_generate_common_url(); ?>"
        ><?php echo $strRefresh; ?></a>
     <a href="<?php echo
-        $_SERVER['PHP_SELF'] . '?flush=STATUS&amp;' . PMA_generate_common_url(); ?>"
+        PMA_getenv('PHP_SELF') . '?flush=STATUS&amp;' . PMA_generate_common_url(); ?>"
        ><?php echo $strShowStatusReset; ?></a>
     <a href="<?php echo
         $cfg['MySQLManualBase']; ?>/server-status-variables.html"
@@ -361,7 +362,7 @@ echo sprintf($strServerStatusUptime,
 <?php
 foreach ($sections as $section_name => $section) {
     if (! empty($section['vars']) && ! empty($section['title'])) {
-        echo '<a href="' . $_SERVER['PHP_SELF'] . '?' .
+        echo '<a href="' . PMA_getenv('PHP_SELF') . '?' .
              PMA_generate_common_url() . '#' . $section_name . '">' .
              $section['title'] . '</a>' . "\n";
     }
@@ -580,7 +581,7 @@ foreach ($sections as $section_name => $section) {
     <table class="data" id="serverstatussection<?php echo $section_name; ?>">
     <caption class="tblHeaders">
         <a class="top"
-           href="<?php echo $_SERVER['PHP_SELF'] . '?' .
+           href="<?php echo PMA_getenv('PHP_SELF') . '?' .
                  PMA_generate_common_url() . '#serverstatus'; ?>"
            name="<?php echo $section_name; ?>"><?php echo $strPos1; ?>
             <?php echo