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

Issue 0000529:

Browse Source 
Enhance computing method of script_basename function.

http://forum.phpwebgallery.net/viewtopic.php?pid=58258#p58258

Merge BSF 1988:1989 into branch-1_7

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@1990 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-04-29 15:54:31 +00:00
parent 8192a92ff4
commit 933749789c
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+16 -2
View File
@@ -1283,6 +1283,20 @@ function hash_from_query($query, $keyname)
return $array;
}
/**
* Return is "file_name" argument is candidate to
* compute script_basename value
*
* @param string file_name
*
* @return boolean is candidate or not?
*/
function is_script_basename($file_name)
{
$file_name = basename($file_name);
return !empty($file_name);
}
/**
* Return basename of the current script
* Lower case convertion is applied on return value
@@ -1294,11 +1308,11 @@ function hash_from_query($query, $keyname)
*/
function script_basename()
{
if (!empty($_SERVER['SCRIPT_NAME']))
if (is_script_basename($_SERVER['SCRIPT_NAME']))
{
$file_name = $_SERVER['SCRIPT_NAME'];
}
else if (!empty($_SERVER['SCRIPT_FILENAME']))
else if (is_script_basename($_SERVER['SCRIPT_FILENAME']))
{
$file_name = $_SERVER['SCRIPT_FILENAME'];
}