From 555d3758fc55949578658bf81123f8ffc614c606 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 3 Apr 2006 21:05:06 +0000
Subject: [PATCH] MFC s/PHP_SELF/SCRIPT_NAME/ - PHP_SELF == "" for some reason
 with lighty

---
 etc/inc/pfsense-utils.inc              | 2 +-
 usr/local/www/carp_status.php          | 2 +-
 usr/local/www/diag_dhcp_leases.php     | 2 +-
 usr/local/www/diag_ipsec_sad.php       | 2 +-
 usr/local/www/diag_logs_filter.php     | 2 +-
 usr/local/www/diag_logs_ipsec.php      | 2 +-
 usr/local/www/diag_logs_openvpn.php    | 2 +-
 usr/local/www/diag_logs_slbd.php       | 2 +-
 usr/local/www/status_captiveportal.php | 2 +-
 usr/local/www/status_interfaces.php    | 2 +-
 usr/local/www/status_queues.php        | 4 ++--
 usr/local/www/status_rrd_graph.php     | 2 +-
 usr/local/www/status_wireless.php      | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 8c8676e1ed..4a19e2943d 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -75,7 +75,7 @@ function get_dns_servers() {
 *   null
 ******/
 function log_error($error) {
-	$page = $_SERVER['PHP_SELF'];
+	$page = $_SERVER['SCRIPT_NAME'];
 	syslog(LOG_WARNING, "$page: $error");
 	return;
 }
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index 008303ed1b..82d40828c1 100755
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -169,7 +169,7 @@ include("head.inc");
 	</table>
 </div>
 
-<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 
 <?php include("fend.inc"); ?>
 
diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php
index f515c90d8e..0f01b7a642 100755
--- a/usr/local/www/diag_dhcp_leases.php
+++ b/usr/local/www/diag_dhcp_leases.php
@@ -276,7 +276,7 @@ foreach ($leases as $data) {
 <p><strong>No leases file found. Is the DHCP server active?</strong></p>
 <?php endif; ?>
 
-<meta http-equiv="refresh" content="120;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="120;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php
index cf0a15da91..c5d2eb6659 100755
--- a/usr/local/www/diag_ipsec_sad.php
+++ b/usr/local/www/diag_ipsec_sad.php
@@ -145,7 +145,7 @@ foreach ($sad as $sa): ?>
 
 </table>
 
-<meta http-equiv="refresh" content="120;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="120;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index 2ef72edfba..887cb2b2df 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -290,6 +290,6 @@ function outputrule(req) {
 }
 </script>
 <?php include("fend.inc"); ?>
-<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 </body>
 </html>
diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php
index 3db6f21829..c930ead375 100755
--- a/usr/local/www/diag_logs_ipsec.php
+++ b/usr/local/www/diag_logs_ipsec.php
@@ -92,6 +92,6 @@ include("head.inc");
 	</tr>
 </table>
 <?php include("fend.inc"); ?>
-<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 </body>
 </html>
diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php
index 3d71fe7b2b..3d7fe10bc7 100644
--- a/usr/local/www/diag_logs_openvpn.php
+++ b/usr/local/www/diag_logs_openvpn.php
@@ -93,6 +93,6 @@ include("head.inc");
 	</tr>
 </table>
 <?php include("fend.inc"); ?>
-<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 </body>
 </html>
diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php
index d7fea59639..130f019b30 100755
--- a/usr/local/www/diag_logs_slbd.php
+++ b/usr/local/www/diag_logs_slbd.php
@@ -86,6 +86,6 @@ include("head.inc");
   </tr>
 </table>
 <?php include("fend.inc"); ?>
-<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 </body>
 </html>
diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php
index 999daafd23..a4c787565f 100755
--- a/usr/local/www/status_captiveportal.php
+++ b/usr/local/www/status_captiveportal.php
@@ -126,7 +126,7 @@ captiveportal_unlock();
 </p>
 <?php include("fend.inc"); ?>
 
-<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 
 </body>
 </html>
diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php
index b7561611e5..517b0f9c21 100755
--- a/usr/local/www/status_interfaces.php
+++ b/usr/local/www/status_interfaces.php
@@ -381,6 +381,6 @@ is kept disconnected.
 <p>
 <span class="red"><strong>Note:</strong></span> In/out counters will wrap at 32bit (4 Gigabyte) ! <br/>
 
-<meta http-equiv="refresh" content="120;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="120;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 
 <?php include("fend.inc"); ?>
diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php
index 188bd38b05..6078a9e855 100755
--- a/usr/local/www/status_queues.php
+++ b/usr/local/www/status_queues.php
@@ -111,7 +111,7 @@ if(!isset($config['shaper']['enable'])) {
             </form>
 <br><a href="status_queues.php?reset=true">Reset</a> queues if they do not load.
 
-<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 
 <?php include("fend.inc"); ?>
 </body>
@@ -172,7 +172,7 @@ While(!Connection_Aborted()) {
 	$counter++;
 	if($counter > 40) {
 		echo "Redirecting to <a href=\"status_queues.php\">Queue Status</a>.<p>";
-		echo "<meta http-equiv=\"refresh\" content=\"1;url={$_SERVER['PHP_SELF']}\">";
+		echo "<meta http-equiv=\"refresh\" content=\"1;url={$_SERVER['SCRIPT_NAME']}\">";
 		mwexec("/usr/bin/killall pfctl");
 		mwexec("/usr/bin/killall pfctl");
 		exit;
diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index ae6a4bac34..2098499786 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -237,7 +237,7 @@ SRC=\"rrd/$curif-$interval-$curgraph.png\"><BR><BR>";
 
 </div>
 
-<meta http-equiv="refresh" content="300;url=<?php print $_SERVER['PHP_SELF']; ?>">
+<meta http-equiv="refresh" content="300;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
 
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/status_wireless.php b/usr/local/www/status_wireless.php
index c5e6e84627..acf4757dcd 100755
--- a/usr/local/www/status_wireless.php
+++ b/usr/local/www/status_wireless.php
@@ -169,6 +169,6 @@ if ($mode == 'bss') {
 </table>
 
 <?php include("fend.inc"); ?>
-<meta http-equiv="refresh" content="120;url=<?php print $_SERVER['PHP_SELF']; ?>?if=<?php echo $if; ?>">
+<meta http-equiv="refresh" content="120;url=<?php print $_SERVER['SCRIPT_NAME']; ?>?if=<?php echo $if; ?>">
 </body>
 </html>