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

move get_query_string_diff and url_is_remote to functions_url.inc.php

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@25615 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2013-11-21 11:22:42 +00:00
parent 9565aef3b0
commit 2f06b27c26
2 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
include/functions.inc.php
View file

@ -831,43 +831,6 @@ function redirect( $url , $msg = '', $refresh_time = 0)
}
}
/**
* returns $_SERVER['QUERY_STRING'] whithout keys given in parameters
*
* @param string[] $rejects
* @param boolean $escape escape *&* to *&*
* @returns string
*/
function get_query_string_diff($rejects=array(), $escape=true)
{
if (empty($_SERVER['QUERY_STRING']))
{
return '';
}
parse_str($_SERVER['QUERY_STRING'], $vars);
$vars = array_diff_key($vars, array_flip($rejects));
return '?' . http_build_query($vars, '', $escape ? '&' : '&');
}
/**
* returns true if the url is absolute (begins with http)
*
* @param string $url
* @returns boolean
*/
function url_is_remote($url)
{
if ( strncmp($url, 'http://', 7)==0
or strncmp($url, 'https://', 8)==0 )
{
return true;
}
return false;
}
/**
* returns available themes
*

38
include/functions_url.inc.php
View file

@ -794,4 +794,42 @@ function get_gallery_home_url()
return make_index_url();
}
}
/**
* returns $_SERVER['QUERY_STRING'] whithout keys given in parameters
*
* @param string[] $rejects
* @param boolean $escape escape *&* to *&*
* @returns string
*/
function get_query_string_diff($rejects=array(), $escape=true)
{
if (empty($_SERVER['QUERY_STRING']))
{
return '';
}
parse_str($_SERVER['QUERY_STRING'], $vars);
$vars = array_diff_key($vars, array_flip($rejects));
return '?' . http_build_query($vars, '', $escape ? '&' : '&');
}
/**
* returns true if the url is absolute (begins with http)
*
* @param string $url
* @returns boolean
*/
function url_is_remote($url)
{
if ( strncmp($url, 'http://', 7)==0
or strncmp($url, 'https://', 8)==0 )
{
return true;
}
return false;
}
?>