archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue ID 0000529 Fixed.

Browse source 
Problem with $_SERVER['SCRIPT_FILENAME'] on IIS server


git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1686 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub 2006-12-31 17:02:36 +00:00
parent 37c05655ee
commit 09e2c295e8
4 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/common.inc.php
View file

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

36
include/functions.inc.php
View file

@ -967,4 +967,40 @@ SELECT param,value
} }
} }
} }
/**
* 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));
}
?> ?>

2
include/functions_calendar.inc.php
View file

@ -177,7 +177,7 @@ WHERE id IN (' . implode(',',$page['items']) .')';
//echo ('<pre>'. var_export($calendar, true) . '</pre>'); //echo ('<pre>'. var_export($calendar, true) . '</pre>');
$must_show_list = true; // true until calendar generates its own display $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()); $template->assign_block_vars('calendar', array());

4
include/section_init.inc.php
View file

@ -86,7 +86,7 @@ $tokens = explode(
// ); // );
$next_token = 0; $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 { // the first token must be the identifier for the picture
if ( isset($_GET['image_id']) if ( isset($_GET['image_id'])
and isset($_GET['cat']) and is_numeric($_GET['cat']) ) 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; $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']) ) and !isset($page['image_id']) )
{ {
if ( !empty($page['items']) ) if ( !empty($page['items']) )