adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-10 18:53:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue ID 0000529 Fixed.

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

Merge branch-1_6 1685:1686 into BSF

git-svn-id: http://piwigo.org/svn/trunk@1687 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2006-12-31 17:08:37 +00:00
parent 48879ca177
commit 9c914a2b66
5 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/common.inc.php
+1 -1
View File
@@ -177,7 +177,7 @@ if ($conf['gallery_locked'])
}
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',
'register.php'
include/filter.inc.php
+2 -2
View File
@@ -34,13 +34,13 @@ $filter = array();
$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
pwg_get_session_var('filter_enabled', false)
);
if (in_array(basename($_SERVER['SCRIPT_FILENAME']), $conf['filter_pages']))
if (in_array(script_basename(), $conf['filter_pages']))
{
if (isset($_GET['filter']))
{
include/functions.inc.php
+36
View File
@@ -1108,4 +1108,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));
}
?>
include/functions_calendar.inc.php
+1 -1
View File
@@ -186,7 +186,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 (basename($_SERVER['SCRIPT_FILENAME']) != 'picture.php')
if (script_basename() != 'picture.php')
{
$template->assign_block_vars('calendar', array());
include/section_init.inc.php
+2 -2
View File
@@ -86,7 +86,7 @@ $tokens = explode(
// );
$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'])
and isset($_GET['cat']) and is_numeric($_GET['cat']) )
@@ -706,7 +706,7 @@ if (isset($page['chronology_field']))
$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']) )
{
if ( !empty($page['items']) )