Changeset 1690

Timestamp:

Jan 2, 2007, 11:37:08 PM (17 years ago)

Author:

rub

Message:

Issue ID 0000529 Re-Fixed.

Problem with "Options +MultiViews" .htaccess configuration.

Merge branch-1_6 1688:1689 into BSF

Location:

trunk/include

Files:

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

trunk/include/common.inc.php

@@ -179 +179 @@
 if ($user['is_the_guest'] and !$conf['guest_access']
     and !in_array( script_basename(),
-                      array('identification.php',
-                            'password.php',
-                            'register.php'
+                      // Array of basename without file extention
+                      array('identification',
+                            'password',
+                            'register'
                         )
                   )

trunk/include/config_default.inc.php

@@ -571 +571 @@
 // Pages where filter is enabled
 // Other pages cancel current filter
+// Array of basename without file extention
 $conf['filter_pages'] = array
   (
-    'about.php', 'action.php', 'admin.php', 'comments.php', 
-    'index.php', 'picture.php', 'popuphelp.php', 'profile.php', 
-    'qsearch.php', 'random.php', 'register.php', 'search.php', 
-    'search_rules.php', 'tags.php', 'upload.php'
+    'about', 'action', 'admin', 'comments', 
+    'index', 'picture', 'popuphelp', 'profile', 
+    'qsearch', 'random', 'register', 'search', 
+    'search_rules', 'tags', 'upload'
   );
 

trunk/include/functions.inc.php

@@ -1112 +1112 @@
 /**
  * Return basename of the current script
- * Return value are chnage to loawer case
+ * Lower case convertion is applied on return value
+ * Return value is without file extention ".php"
  *
  * @param void
@@ -1124 +1125 @@
     $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
   {
@@ -1141 +1134 @@
   }
 
-  // $_SERVER return lower string following var ans systems
-  return basename(strtolower($file_name));
+  // $_SERVER return lower string following var and systems
+  return basename(strtolower($file_name), '.php');
 }
 

trunk/include/functions_calendar.inc.php

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

trunk/include/section_init.inc.php

@@ -87 +87 @@
 
 $next_token = 0;
-if (script_basename() == 'picture.php')
+if (script_basename() == 'picture') // basename without file extention
 { // 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 (script_basename() == 'picture.php'
+if (script_basename() == 'picture'
     and !isset($page['image_id']) )
 {