[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11087] login fallback from failed sso
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11087] login fallback from failed sso |
Date: |
Fri, 03 May 2013 12:21:59 +0000 |
Revision: 11087
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11087
Author: sigurdne
Date: 2013-05-03 12:21:57 +0000 (Fri, 03 May 2013)
Log Message:
-----------
login fallback from failed sso
Modified Paths:
--------------
trunk/phpgwapi/inc/class.login.inc.php
Modified: trunk/phpgwapi/inc/class.login.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.login.inc.php 2013-04-30 11:41:54 UTC (rev
11086)
+++ trunk/phpgwapi/inc/class.login.inc.php 2013-05-03 12:21:57 UTC (rev
11087)
@@ -69,6 +69,11 @@
$GLOBALS['phpgw']->hooks->process('set_auth_type', array($frontend));
}
+ if (isset($_REQUEST['skip_remote']) &&
$_REQUEST['skip_remote']) // In case a user failed logged in via SSO - get
another try
+ {
+ $GLOBALS['phpgw_info']['server']['auth_type'] =
$GLOBALS['phpgw_remote_user_fallback'];
+ }
+
/* Program starts here */
$uilogin = new phpgw_uilogin($tmpl,
$GLOBALS['phpgw_info']['server']['auth_type'] == 'remoteuser' &&
!isset($GLOBALS['phpgw_remote_user']));
@@ -201,6 +206,7 @@
if ($GLOBALS['phpgw_info']['server']['auth_type'] ==
'custom_sso' && !isset($_GET['cd']))
{
+
//Reset auth object
$GLOBALS['phpgw']->auth =
createObject('phpgwapi.auth');
$login =
$GLOBALS['phpgw']->auth->get_username();
@@ -240,6 +246,7 @@
$GLOBALS['phpgw']->redirect_link("{$frontend}/home.php", $extra_vars);
}
+
if ((isset($_POST['submitit']) ||
isset($_POST['submit_x']) || isset($_POST['submit_y'])))
{
if ($_SERVER['REQUEST_METHOD'] != 'POST' &&
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11087] login fallback from failed sso,
Sigurd Nes <=