maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Revert "Changed redirectTo to use new link-class"

Browse Source 
This reverts commit b88246b112.
This commit is contained in:
Florian Aders (EleRas)
2011-06-13 22:08:38 +02:00
parent b88246b112
commit 0b3e788b86
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/functions/output/function.redirectTo.php
View File

@@ -29,6 +29,7 @@
* *
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org>
* @author Martin Burchert <eremit@syscp.org> * @author Martin Burchert <eremit@syscp.org>
*
* @changes martin@2005-01-29 * @changes martin@2005-01-29
* - added isRelative parameter * - added isRelative parameter
* - speed up the url generation * - speed up the url generation
@@ -39,20 +40,19 @@ function redirectTo($destination, $get_variables = array(), $isRelative = false)
{ {
$params = array(); $params = array();
$linker = new linker();
$linker->filename = $destination;
if(is_array($get_variables)) if(is_array($get_variables))
{ {
foreach($get_variables as $key => $value) foreach($get_variables as $key => $value)
{ {
$linker->add($key, $value); $params[] = urlencode($key) . '=' . urlencode($value);
} }
$params = '?' . implode($params, '&');
if($isRelative) if($isRelative)
{ {
$linker->protocol = ''; $protocol = '';
$linker->host = ''; $host = '';
$path = './'; $path = './';
} }
else else
@@ -60,12 +60,15 @@ function redirectTo($destination, $get_variables = array(), $isRelative = false)
if(isset($_SERVER['HTTPS']) if(isset($_SERVER['HTTPS'])
&& strtolower($_SERVER['HTTPS']) == 'on') && strtolower($_SERVER['HTTPS']) == 'on')
{ {
$linker->protocol = 'https'; $protocol = 'https://';
} }
else else
{ {
$linker->protocol = 'http'; $protocol = 'http://';
} }
$host = $_SERVER['HTTP_HOST'];
if(dirname($_SERVER['PHP_SELF']) == '/') if(dirname($_SERVER['PHP_SELF']) == '/')
{ {
$path = '/'; $path = '/';
@@ -74,15 +77,14 @@ function redirectTo($destination, $get_variables = array(), $isRelative = false)
{ {
$path = dirname($_SERVER['PHP_SELF']) . '/'; $path = dirname($_SERVER['PHP_SELF']) . '/';
} }
$linker->host = $_SERVER['HTTP_HOST'];
} }
$linker->filename = $path . $destination;
header('Location: ' . $linker->getLink()); header('Location: ' . $protocol . $host . $path . $destination . $params);
exit; exit;
} }
elseif($get_variables == null) elseif($get_variables == null)
{ {
header('Location: ' . $linker->getLink()); header('Location: ' . $destination);
exit; exit;
} }