fixed handling of @'s in user-names

This commit is contained in:
Ralf Becker 2004-08-21 15:22:56 +00:00
parent 8da9e0fa41
commit e03ae3acdd

View File

@ -1,9 +1,9 @@
<?php <?php
/**************************************************************************\ /**************************************************************************\
* phpGroupWare * * eGroupWare login *
* http://www.phpgroupware.org * * http://www.egroupware.org *
* Written by Dan Kuykendall <seek3r@phpgroupware.org> * * Originaly written by Dan Kuykendall <seek3r@phpgroupware.org> *
* Joseph Engo <jengo@phpgroupware.org> * * Joseph Engo <jengo@phpgroupware.org> *
* -------------------------------------------- * * -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the * * under the terms of the GNU General Public License as published by the *
@ -207,7 +207,7 @@
{ {
$login .= '@' . $_POST['logindomain']; $login .= '@' . $_POST['logindomain'];
} }
elseif(count($GLOBALS['phpgw_domain']) == 1) elseif(!isset($GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]))
{ {
$login .= '@'.$GLOBALS['phpgw_info']['server']['default_domain']; $login .= '@'.$GLOBALS['phpgw_info']['server']['default_domain'];
} }