[Fmsystem-commits] [16497] fix redirect

[sigurdne]

Revision: 16497
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16497
Author:   sigurdne
Date:     2017-03-30 08:34:00 -0400 (Thu, 30 Mar 2017)
Log Message:
-----------
fix redirect

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.login.inc.php
    trunk/phpgwapi/inc/class.sessions.inc.php

Modified: trunk/phpgwapi/inc/class.login.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.login.inc.php      2017-03-30 11:12:52 UTC (rev 
16496)
+++ trunk/phpgwapi/inc/class.login.inc.php      2017-03-30 12:34:00 UTC (rev 
16497)
@@ -56,7 +56,7 @@
                        require_once dirname(realpath(__FILE__)) . 
'/sso/include_login.inc.php';
 
                        $lightbox                        = 
isset($_REQUEST['lightbox']) && $_REQUEST['lightbox'] ? true : false;
-                       $partial_url             = "{$frontend}/login.php";
+                       $partial_url             = 
ltrim("{$frontend}/login.php", '/');
                        $phpgw_url_for_sso       = 
'phpgwapi/inc/sso/login_server.php';
 
                        if (isset($GLOBALS['phpgw_remote_user']) && 
!empty($GLOBALS['phpgw_remote_user']))

Modified: trunk/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sessions.inc.php   2017-03-30 11:12:52 UTC (rev 
16496)
+++ trunk/phpgwapi/inc/class.sessions.inc.php   2017-03-30 12:34:00 UTC (rev 
16497)
@@ -599,7 +599,7 @@
                                }
                        }
 
-                       if($external)
+                       if($external || 
$GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
                        {
                                if(substr($url, 0, 4) != 'http')
                                {