mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-05 13:39:23 +01:00
make http auth login and sqlssl login working again
Fix for BUG [ 844013 ] "http" authentication failes
This commit is contained in:
parent
2eebcbee3a
commit
68ed62c6f8
11
login.php
11
login.php
@ -14,12 +14,15 @@
|
|||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
|
|
||||||
$phpgw_info = array();
|
$phpgw_info = array();
|
||||||
|
$submit = false; // set to some initial value
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags'] = array(
|
$GLOBALS['phpgw_info']['flags'] = array(
|
||||||
'disable_template_class' => True,
|
'disable_template_class' => True,
|
||||||
'login' => True,
|
'login' => True,
|
||||||
'currentapp' => 'login',
|
'currentapp' => 'login',
|
||||||
'noheader' => True
|
'noheader' => True
|
||||||
);
|
);
|
||||||
|
|
||||||
if(file_exists('./header.inc.php'))
|
if(file_exists('./header.inc.php'))
|
||||||
{
|
{
|
||||||
include('./header.inc.php');
|
include('./header.inc.php');
|
||||||
@ -155,7 +158,13 @@
|
|||||||
{
|
{
|
||||||
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','code=5'));
|
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','code=5'));
|
||||||
}
|
}
|
||||||
$login = $_POST['login'];
|
|
||||||
|
// don't get login data again when $submit is true
|
||||||
|
if($submit == false)
|
||||||
|
{
|
||||||
|
$login = $_POST['login'];
|
||||||
|
}
|
||||||
|
|
||||||
if (strstr($login,'@') === False && isset($_POST['logindomain']))
|
if (strstr($login,'@') === False && isset($_POST['logindomain']))
|
||||||
{
|
{
|
||||||
$login .= '@' . $_POST['logindomain'];
|
$login .= '@' . $_POST['logindomain'];
|
||||||
|
Loading…
Reference in New Issue
Block a user