Changeset 1687 for trunk

Timestamp:

Dec 31, 2006, 6:08:37 PM (17 years ago)

Author:

rub

Message:

Issue ID 0000529 Fixed.

Problem with $_SERVERSCRIPT_FILENAME on IIS server

Merge branch-1_6 1685:1686 into BSF

Location:

trunk/include

Files:

• common.inc.php (modified) (1 diff)
• filter.inc.php (modified) (2 diffs)
• functions.inc.php (modified) (1 diff)
• functions_calendar.inc.php (modified) (1 diff)
• section_init.inc.php (modified) (2 diffs)

trunk/include/common.inc.php

@@ -178 +178 @@
 
 if ($user['is_the_guest'] and !$conf['guest_access']
-    and !in_array( basename($_SERVER['SCRIPT_FILENAME']),
+    and !in_array( script_basename(),
                       array('identification.php',
                             'password.php',

trunk/include/filter.inc.php

@@ -35 +35 @@
 
 $filter['enabled'] =
-  (in_array(basename($_SERVER['SCRIPT_FILENAME']), $conf['filter_pages'])) and
+  (in_array(script_basename(), $conf['filter_pages'])) and
   (
     (isset($_GET['filter']) and ($_GET['filter'] == 'start')) or
@@ -41 +41 @@
   );
 
-if (in_array(basename($_SERVER['SCRIPT_FILENAME']), $conf['filter_pages']))
+if (in_array(script_basename(), $conf['filter_pages']))
 {
   if (isset($_GET['filter']))

trunk/include/functions.inc.php

@@ -1109 +1109 @@
   }
 }
+
+/**
+ * Return basename of the current script
+ * Return value are chnage to loawer case
+ *
+ * @param void
+ *
+ * @return script basename
+ */
+function script_basename()
+{
+  if (!empty($_SERVER['SCRIPT_NAME']))
+  {
+    $file_name = $_SERVER['SCRIPT_NAME'];
+  }
+  else if (!empty($_SERVER['PHP_SELF']))
+  {
+    $file_name = $_SERVER['PHP_SELF'];
+  }
+  else if (!empty($_SERVER['SCRIPT_FILENAME']))
+  {
+    $file_name = $_SERVER['SCRIPT_FILENAME'];
+  }
+  else if (!empty($_SERVER['PATH_TRANSLATED']))
+  {
+    $file_name = $_SERVER['PATH_TRANSLATED'];
+  }
+  else
+  {
+    $file_name = '';
+  }
+
+  // $_SERVER return lower string following var ans systems
+  return basename(strtolower($file_name));
+}
+
 ?>

trunk/include/functions_calendar.inc.php

@@ -187 +187 @@
 
   $must_show_list = true; // true until calendar generates its own display
-  if (basename($_SERVER['SCRIPT_FILENAME']) != 'picture.php')
+  if (script_basename() != 'picture.php')
   {
     $template->assign_block_vars('calendar', array());

trunk/include/section_init.inc.php

@@ -87 +87 @@
 
 $next_token = 0;
-if (basename($_SERVER['SCRIPT_FILENAME']) == 'picture.php')
+if (script_basename() == 'picture.php')
 { // the first token must be the identifier for the picture
   if ( isset($_GET['image_id'])
@@ -707 +707 @@
 $page['cat_nb_images'] = isset($page['items']) ? count($page['items']) : 0;
 
-if (basename($_SERVER['SCRIPT_FILENAME']) == 'picture.php'
+if (script_basename() == 'picture.php'
     and !isset($page['image_id']) )
 {