bit_log_error-2-bit_error_log

7 files changed, 9 insertions, 9 deletions

diff --git a/smartyplugins/block.form.php b/smartyplugins/block.form.php
index 5c1aeb0..9c517ec 100644
--- a/smartyplugins/block.form.php
+++ b/smartyplugins/block.form.php
@@ -14,7 +14,7 @@
  *           - ipackage    (optional) - package where we should direct the form after submission
  *           - ifile       (optional) - file that is targetted
  *           - ianchor     (optional) - move to anchor after submitting
- *                         if neither are set, $PHP_SELF is used as url
+ *                         if neither are set, SCRIPT_NAME is used as url
  *           - legend      if set, it will generate a fieldset using the input as legend
  * @uses smarty_function_escape_special_chars()
  * @todo somehow make the variable that is contained within $iselect global --> this will allow importing of outside variables not set in $_REQUEST
@@ -89,9 +89,9 @@ function smarty_block_form( $pParams, $pContent, &$gBitSmarty) {
 		}
 
 		if( empty( $url )) {
-			$url = $_SERVER['PHP_SELF'];
+			$url = $_SERVER['SCRIPT_NAME'];
 		} else if( $url == 'https://' . $_SERVER['HTTP_HOST'] ) {
-			$url .= $_SERVER['PHP_SELF'];
+			$url .= $_SERVER['SCRIPT_NAME'];
 		}
 
 		$onsub = ( !empty( $onsubmit ) ? ' onsubmit="'.$onsubmit.'"' : '' );
diff --git a/smartyplugins/function.alphabar.php b/smartyplugins/function.alphabar.php
index e49441f..3ff97e4 100644
--- a/smartyplugins/function.alphabar.php
+++ b/smartyplugins/function.alphabar.php
@@ -34,7 +34,7 @@ function smarty_function_alphabar( $params, &$gBitSmarty ) {
 			$url = constant( strtoupper( ACTIVE_PACKAGE ).'_PKG_URL' ).$ifile;
 		}
 	} else {
-		$url = $_SERVER['PHP_SELF'];
+		$url = $_SERVER['SCRIPT_NAME'];
 	}
 
 	$alphabar_params = array( 'ifile', 'ipackage', 'iall' );
diff --git a/smartyplugins/function.pageurl.php b/smartyplugins/function.pageurl.php
index 0ee7540..768862d 100644
--- a/smartyplugins/function.pageurl.php
+++ b/smartyplugins/function.pageurl.php
@@ -26,7 +26,7 @@ function smarty_function_pageurl( $params, &$gBitSmarty ) {
 			unset( $params['url'] );
 		}
 		if( empty( $pgnUrl ) ) {
-			$pgnUrl = $_SERVER['PHP_SELF'];
+			$pgnUrl = $_SERVER['SCRIPT_NAME'];
 		}
 	}
 
diff --git a/smartyplugins/function.pagination.php b/smartyplugins/function.pagination.php
index 4963171..11f9a88 100644
--- a/smartyplugins/function.pagination.php
+++ b/smartyplugins/function.pagination.php
@@ -22,7 +22,7 @@ function smarty_function_pagination( $params, &$gBitSmarty ) {
         unset( $params['url'] );
     }
     if( empty( $pgnUrl ) ) {
-        $pgnUrl = $_SERVER['PHP_SELF'];
+        $pgnUrl = $_SERVER['SCRIPT_NAME'];
 	}
 
     $gBitSmarty->assign( 'pgnUrl', $pgnUrl );
diff --git a/smartyplugins/function.smartlink.php b/smartyplugins/function.smartlink.php
index c23e7ee..c9ddd58 100644
--- a/smartyplugins/function.smartlink.php
+++ b/smartyplugins/function.smartlink.php
@@ -73,7 +73,7 @@ function smarty_function_smartlink( $params, &$gBitSmarty ) {
 			$url = constant( strtoupper( ACTIVE_PACKAGE ).'_PKG_URL' ).$hash['ifile'];
 		}
 	} else {
-		$url = $_SERVER['PHP_SELF'];
+		$url = $_SERVER['SCRIPT_NAME'];
 	}
 
 	$url_params = NULL;
diff --git a/templates/admin_layout.tpl b/templates/admin_layout.tpl
index e618542..8b9cdb8 100644
--- a/templates/admin_layout.tpl
+++ b/templates/admin_layout.tpl
@@ -93,7 +93,7 @@
 
 {jstabs}
 	{jstab title="Modules"}
-		{form action=$smarty.server.PHP_SELF legend="Assign modules to columns and areas"}
+		{form action=$smarty.server.SCRIPT_NAME legend="Assign modules to columns and areas"}
 			<input type="hidden" name="page" value="{$page}" />
 			<input type="hidden" name="module_package" value="{$module_package}" />
 			<div class="row">
diff --git a/templates/icon_browser.tpl b/templates/icon_browser.tpl
index 6fa9fe7..ebc877c 100644
--- a/templates/icon_browser.tpl
+++ b/templates/icon_browser.tpl
@@ -12,7 +12,7 @@
 		<table class="data">
 			<tr>
 				{foreach from=$iconList item=icons key=iconStyle}
-				<th class="width1p" colspan="3"><a href="{$smarty.request.PHP_SELF}?icon_style={$iconStyle}">{$iconStyle}</a></th>
+				<th class="width1p" colspan="3"><a href="{$smarty.request.SCRIPT_NAME}?icon_style={$iconStyle}">{$iconStyle}</a></th>
 				{/foreach}
 				<th class="width70p;">{tr}Icon name{/tr}</th>
 				<th class="width29p;">{tr}bitweaver uses{/tr}</th>