Changeset 1990

Timestamp:

Apr 29, 2007, 5:54:31 PM (17 years ago)

Author:

rub

Message:

Issue 0000529:
Enhance computing method of script_basename function.

​http://forum.phpwebgallery.net/viewtopic.php?pid=58258#p58258

Merge BSF 1988:1989 into branch-1_7

File:

• branches/branch-1_7/include/functions.inc.php (modified) (2 diffs)

branches/branch-1_7/include/functions.inc.php

@@ -1285 +1285 @@
 
 /**
+ * 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
@@ -1295 +1309 @@
 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'];