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

Fixed bug in link-class where protocol was added to URL withour hostname

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2011-06-13 21:55:27 +02:00
parent 0a21ede3d2
commit 4d10c72ae9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/classes/output/class.linker.php
View File

@@ -41,7 +41,7 @@ class linker
public function __set($key, $value) public function __set($key, $value)
{ {
switch($key) switch(strtolower($key))
{ {
case 'protocol': $this->protocol = $value; break; case 'protocol': $this->protocol = $value; break;
case 'username': $this->username = $value; break; case 'username': $this->username = $value; break;
@@ -82,7 +82,7 @@ class linker
$link = ''; $link = '';
# Build the basic URL # Build the basic URL
if (strlen($this->protocol) > 0) if (strlen($this->protocol) > 0 && strlen($this->hostname) > 0)
{ {
$link = $this->protocol . '://'; $link = $this->protocol . '://';
} }
@@ -116,7 +116,6 @@ class linker
$link .= '/'; $link .= '/';
} }
# Overwrite $this->args with parameters of this function (if necessary) # Overwrite $this->args with parameters of this function (if necessary)
if(func_num_args() == 1 && is_array(func_get_arg(0))) if(func_num_args() == 1 && is_array(func_get_arg(0)))
{ {
@@ -126,7 +125,7 @@ class linker
# temporary until frontcontroller exists # temporary until frontcontroller exists
# We got a section in the URL -> morph AREA and section into filename # We got a section in the URL -> morph AREA and section into filename
# @TODO: Remove this # @TODO: Remove this
if (isset($this->args['section'])) if (isset($this->args['section']) && strlen($this->args['section']) > 0)
{ {
$link .= AREA . '_' . $this->args['section'] . '.php'; $link .= AREA . '_' . $this->args['section'] . '.php';
unset($this->args['section']); unset($this->args['section']);