diff --git a/include/functions.inc.php b/include/functions.inc.php index 69174ea4d..becace1a4 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -1283,6 +1283,20 @@ function hash_from_query($query, $keyname) return $array; } +/** + * Return is "file_name" argument is candidate to + * compute script_basename value + * + * @param string file_name + * + * @return boolean is candidate or not? + */ +function is_script_basename($file_name) +{ + $file_name = basename($file_name); + return !empty($file_name); +} + /** * Return basename of the current script * Lower case convertion is applied on return value @@ -1294,11 +1308,11 @@ function hash_from_query($query, $keyname) */ function script_basename() { - if (!empty($_SERVER['SCRIPT_NAME'])) + if (is_script_basename($_SERVER['SCRIPT_NAME'])) { $file_name = $_SERVER['SCRIPT_NAME']; } - else if (!empty($_SERVER['SCRIPT_FILENAME'])) + else if (is_script_basename($_SERVER['SCRIPT_FILENAME'])) { $file_name = $_SERVER['SCRIPT_FILENAME']; }