diff --git a/application/common.php b/application/common.php index 585e0990df3190be828edd10c0961b51ac50d4d3..50b50433b01a192c02e8c3394478201ac298d14b 100755 --- a/application/common.php +++ b/application/common.php @@ -392,20 +392,31 @@ function DataReturn($msg = '', $code = 0, $data = '') function CurrentScriptName() { $name = ''; - if(!empty($_SERVER['SCRIPT_NAME'])) + if(empty($_SERVER['SCRIPT_NAME'])) { - if(!empty($_SERVER['SCRIPT_FILENAME'])) + if(empty($_SERVER['PHP_SELF'])) { - $loc = strripos($_SERVER['SCRIPT_FILENAME'], '/'); - if($loc !== false) + if(!empty($_SERVER['SCRIPT_FILENAME'])) { - $name = substr($_SERVER['SCRIPT_FILENAME'], $loc); + $name = $_SERVER['SCRIPT_FILENAME']; } + } else { + $name = $_SERVER['PHP_SELF']; } } else { $name = $_SERVER['SCRIPT_NAME']; } - return str_replace('/', '', $name); + + if(!empty($name)) + { + $loc = strripos($name, '/'); + if($loc !== false) + { + $name = substr($name, $loc+1); + } + } + + return $name; } /**