holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"fix for bug #1780: Freebusy error when using complete (user@domain.org) username"

Browse Source
This commit is contained in:
Ralf Becker 2008-10-18 08:22:28 +00:00
parent 01a3800b27
commit 086ce5694f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/freebusy.php
View File

@ -44,9 +44,15 @@ if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2
$_GET['user'] = substr($_GET['user'],2); $_GET['user'] = substr($_GET['user'],2);
if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2); if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
} }
$user = is_numeric($_GET['user']) ? (int) $_GET['user'] : $GLOBALS['egw']->accounts->name2id($_GET['user'],'account_lid','u'); if (!is_numeric($user = $_GET['user']))
{
if (!($username = $GLOBALS['egw']->accounts->id2name($user))) // check if user contains the current domain --> remove it
list(,$domain) = explode('@',$user);
if ($domain === $GLOBALS['egw_info']['user']['domain'])
list($user) = explode('@',$user);
$user = $GLOBALS['egw']->accounts->name2id($user,'account_lid','u');
}
if ($user === false || !($username = $GLOBALS['egw']->accounts->id2name($user)))
{ {
fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)",$_GET['user'])); fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)",$_GET['user']));
} }