[20934] improvement: Allow active logout for SSO

Revision: 20934
          http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20934
Author:   sigurdne
Date:     2010-01-05 21:36:30 +0000 (Tue, 05 Jan 2010)
Log Message:
-----------
improvement: Allow active logout for SSO

Modified Paths:
--------------
    people/sigurdne/core/trunk/login.php
    people/sigurdne/core/trunk/logout.php

Modified: people/sigurdne/core/trunk/login.php
===================================================================
--- people/sigurdne/core/trunk/login.php	2010-01-05 21:29:35 UTC (rev 20933)
+++ people/sigurdne/core/trunk/login.php	2010-01-05 21:36:30 UTC (rev 20934)
@@ -16,6 +16,11 @@
 	 		$GLOBALS['phpgw_remote_user_fallback'] = 'sql';
 	 }
 	 
+	if(isset($_GET['logout']) && $_GET['logout']) // In case a user logged in via SSO - actively logs out
+	{
+	 	$GLOBALS['phpgw_remote_user_fallback'] = 'sql';	
+	}	 
+
 	require_once 'phpgwapi/inc/sso/include_login.inc.php';
 
 	$partial_url = 'login.php';

Modified: people/sigurdne/core/trunk/logout.php
===================================================================
--- people/sigurdne/core/trunk/logout.php	2010-01-05 21:29:35 UTC (rev 20933)
+++ people/sigurdne/core/trunk/logout.php	2010-01-05 21:36:30 UTC (rev 20934)
@@ -67,4 +67,4 @@
 		$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
 	}
 
-	$GLOBALS['phpgw']->redirect_link('/login.php', array('cd' => 1));
+	$GLOBALS['phpgw']->redirect_link('/login.php', array('cd' => 1, 'logout' => true));