Changeset 2072 for branches

Timestamp:

Jul 24, 2007, 9:16:02 PM (17 years ago)

Author:

rub

Message:

Resolved 0000726: script_basename returns bad result

With specific server configuration, script_basename returns bad result.

Merge BSF 2070:2071 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
@@ -1309 +1295 @@
 function script_basename()
 {
-  if (is_script_basename($_SERVER['SCRIPT_NAME']))
-  {
-    $file_name = $_SERVER['SCRIPT_NAME'];
-  }
-  else if (is_script_basename($_SERVER['SCRIPT_FILENAME']))
-  {
-    $file_name = $_SERVER['SCRIPT_FILENAME'];
-  }
-  else
-  {
-    $file_name = '';
-  }
-
-  // $_SERVER return lower string following var and systems
-  return basename(strtolower($file_name), '.php');
+  global $conf;
+
+  foreach (array('SCRIPT_NAME', 'SCRIPT_FILENAME', 'PHP_SELF') as $value)
+  {
+    $continue = !empty($_SERVER[$value]);
+    if ($continue)
+    {
+      $filename = strtolower($_SERVER[$value]);
+
+      if ($conf['php_extension_in_urls'])
+      {
+        $continue = get_extension($filename) ===  'php';
+      }
+
+      if ($continue)
+      {
+        $basename = basename($filename, '.php');
+        $continue = !empty($basename);
+      }
+
+      if ($continue)
+      {
+        return $basename;
+      }
+    }
+  }
+
+  return '';
 }