[Fmsystem-commits] [10842] login: url

[Sigurd Nes]

Revision: 10842
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10842
Author:   sigurdne
Date:     2013-02-15 09:48:33 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
login: url

Modified Paths:
--------------
    trunk/phpgwapi/inc/sso/include_login.inc.php

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2013-02-15 09:26:52 UTC 
(rev 10841)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2013-02-15 09:48:33 UTC 
(rev 10842)
@@ -425,8 +425,12 @@
                        {
                                $system_name .= 
"::{$variables['lang_frontend']}";
                        }
-                       $this->tmpl->set_var('login_url', 
$GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/'.$variables['partial_url'].'?' . http_build_query($extra_vars) );
-                       
$this->tmpl->set_var('registration_url',$GLOBALS['phpgw_info']['server']['webserver_url']
 . '/registration/');
+
+                       $webserver_url = 
rtrim($GLOBALS['phpgw_info']['server']['webserver_url'], '/');
+                       $partial_url = ltrim($variables['partial_url'], '/');
+
+                       $this->tmpl->set_var('login_url', $webserver_url . 
'/'.$partial_url.'?' . http_build_query($extra_vars) );
+                       $this->tmpl->set_var('registration_url',$webserver_url 
. '/registration/');
                        $this->tmpl->set_var('system', $system_name);
                        $this->tmpl->set_var('version', 
isset($GLOBALS['phpgw_info']['server']['versions']['system']) ? 
$GLOBALS['phpgw_info']['server']['versions']['system'] : 
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
                        $this->tmpl->set_var('instruction', lang('use a valid 
username and password to gain access to %1', $system_name));
@@ -490,29 +494,29 @@
 
                        if( 
is_file("{$GLOBALS['phpgw_info']['server']['template_dir']}/css/base.css") )
                        {
-                               $base_css = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}/css/base.css";
+                               $base_css = 
"{$webserver_url}/phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}/css/base.css";
                        }
                        else
                        {
-                               $base_css = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/base/css/base.css";
+                               $base_css = 
"{$webserver_url}/phpgwapi/templates/base/css/base.css";
                        }
 
-                       $system_css = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/base/css/system.css";
+                       $system_css = 
"{$webserver_url}/phpgwapi/templates/base/css/system.css";
 
 
                        if( 
is_file("{$GLOBALS['phpgw_info']['server']['template_dir']}/css/login.css") )
                        {
-                               $login_css = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}/css/login.css";
+                               $login_css = 
"{$webserver_url}/phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}/css/login.css";
                        }
                        else
                        {
-                               $login_css = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/base/css/login.css";
+                               $login_css = 
"{$webserver_url}/phpgwapi/templates/base/css/login.css";
                        }
 
-                       $rounded_css = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/base/css/rounded.css";
+                       $rounded_css = 
"{$webserver_url}/phpgwapi/templates/base/css/rounded.css";
                        
-                       $flag_no = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/base/images/flag_no.gif";
-                       $flag_en = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/base/images/flag_en.gif";
+                       $flag_no = 
"{$webserver_url}/phpgwapi/templates/base/images/flag_no.gif";
+                       $flag_en = 
"{$webserver_url}/phpgwapi/templates/base/images/flag_en.gif";
 
 
                        $this->tmpl->set_var('system_css', $system_css);