[Fmsystem-commits] [6766] bookingfrontend: more on external logout

[Sigurd Nes]

Revision: 6766
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6766
Author:   sigurdne
Date:     2011-01-14 12:25:19 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
bookingfrontend: more on external logout

Modified Paths:
--------------
    trunk/bookingfrontend/logout.php
    trunk/bookingfrontend/templates/base/config.tpl

Modified: trunk/bookingfrontend/logout.php
===================================================================
--- trunk/bookingfrontend/logout.php    2011-01-13 19:31:12 UTC (rev 6765)
+++ trunk/bookingfrontend/logout.php    2011-01-14 12:25:19 UTC (rev 6766)
@@ -21,12 +21,15 @@
 
        $verified = $GLOBALS['phpgw']->session->verify();
        
+       $bookingfrontend_host = '';
        $external_logout = '';
        if ($verified)
        {
                $config         = 
CreateObject('phpgwapi.config','bookingfrontend');
                $config->read();
 
+               $bookingfrontend_host = 
isset($config->config_data['bookingfrontend_host']) && 
$config->config_data['bookingfrontend_host'] ? 
$config->config_data['bookingfrontend_host'] : '';
+               $bookingfrontend_host = rtrim($bookingfrontend_host,'/');
                $external_logout = 
isset($config->config_data['external_logout']) && 
$config->config_data['external_logout'] ? 
$config->config_data['external_logout'] : '';
 //             $external_logout = 
"https://login-vip.bergen.kommune.no/SSO/logout?p_done_url=";//https://www.bergen.kommune.no";
 
@@ -108,7 +111,7 @@
                {
                        $result_redirect = 
$GLOBALS['phpgw']->link('/bookingfrontend/', $extra_vars, true);
                }
-               $external_logout_url = "{$external_logout}{$result_redirect}";
+               $external_logout_url = 
"{$external_logout}{$bookingfrontend_host}{$result_redirect}";
                Header("Location: {$external_logout_url}");
        }
        exit;

Modified: trunk/bookingfrontend/templates/base/config.tpl
===================================================================
--- trunk/bookingfrontend/templates/base/config.tpl     2011-01-13 19:31:12 UTC 
(rev 6765)
+++ trunk/bookingfrontend/templates/base/config.tpl     2011-01-14 12:25:19 UTC 
(rev 6766)
@@ -87,6 +87,12 @@
                        </td>
                        <td><input name="newsettings[external_logout]" 
value="{value_external_logout}"></td>
                </tr>
+               <tr class="row_off">
+                       <td>{lang_bookingfrontend_host}:
+                       <br/> Needed for the return from the external_logout
+                       </td>
+                       <td><input name="newsettings[bookingfrontend_host]" 
value="{value_bookingfrontend_host}"></td>
+               </tr>
 
 <!-- END body -->
 <!-- BEGIN footer -->