Issue ID 0000529 Re-Fixed.

Problem with "Options +MultiViews" .htaccess configuration.

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1689 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 11 insertions, 17 deletions

diff --git a/include/common.inc.php b/include/common.inc.php
index baabfdf72..e35990516 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -175,9 +175,10 @@ if ($conf['gallery_locked'])
 
 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'
                         )
                   )
     )
diff --git a/include/functions.inc.php b/include/functions.inc.php
index eb4d4adec..9476306d9 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -970,7 +970,8 @@ SELECT param,value
 
 /**
  * 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
  *
@@ -982,25 +983,17 @@ function script_basename()
   {
     $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));
+  // $_SERVER return lower string following var and systems
+  return basename(strtolower($file_name), '.php');
 }
 
 ?>
diff --git a/include/functions_calendar.inc.php b/include/functions_calendar.inc.php
index 388e0dedb..a9d2c4711 100644
--- a/include/functions_calendar.inc.php
+++ b/include/functions_calendar.inc.php
@@ -177,7 +177,7 @@ WHERE id IN (' . implode(',',$page['items']) .')';
   //echo ('<pre>'. var_export($calendar, true) . '</pre>');
 
   $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());
 
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 8f2232bb8..00a060e87 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -86,7 +86,7 @@ $tokens = explode(
 //   );
 
 $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'])
        and isset($_GET['cat']) and is_numeric($_GET['cat']) )
@@ -625,7 +625,7 @@ if (isset($page['chronology_field']))
 
 $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']) )
 {
   if ( !empty($page['items']) )