mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 16:33:17 +01:00
Possible fix for error on line 53 of ->preferences when logging in.
This commit is contained in:
parent
11c869fa99
commit
afea2d7d56
@ -97,6 +97,44 @@
|
|||||||
if ($debugme == "on") { echo 'debug: '.$text.'<br>'; }
|
if ($debugme == "on") { echo 'debug: '.$text.'<br>'; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/************************************************************************\
|
||||||
|
* This function will return a properly formatted account_id. *
|
||||||
|
* This needs to be placed here, or some classes will have a problem *
|
||||||
|
* on instantiation. *
|
||||||
|
\************************************************************************/
|
||||||
|
function get_account_id($account_id = '',$default_id = '')
|
||||||
|
{
|
||||||
|
global $phpgw, $phpgw_info;
|
||||||
|
|
||||||
|
if (gettype($account_id) == 'integer')
|
||||||
|
{
|
||||||
|
return $account_id;
|
||||||
|
}
|
||||||
|
elseif ($account_id == '')
|
||||||
|
{
|
||||||
|
if ($default_id == '')
|
||||||
|
{
|
||||||
|
return $phpgw_info['user']['account_id'];
|
||||||
|
}
|
||||||
|
elseif (gettype($default_id) == 'string')
|
||||||
|
{
|
||||||
|
return $phpgw->accounts->name2id($default_id);
|
||||||
|
}
|
||||||
|
return intval($default_id);
|
||||||
|
}
|
||||||
|
elseif (gettype($account_id) == 'string')
|
||||||
|
{
|
||||||
|
if($phpgw->accounts->exists(intval($account_id)) == True)
|
||||||
|
{
|
||||||
|
return intval($account_id);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return $phpgw->accounts->name2id($account_id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
print_debug('core functions are done');
|
print_debug('core functions are done');
|
||||||
/****************************************************************************\
|
/****************************************************************************\
|
||||||
* Quick verification of sane environment *
|
* Quick verification of sane environment *
|
||||||
@ -390,41 +428,3 @@
|
|||||||
|
|
||||||
error_reporting(7);
|
error_reporting(7);
|
||||||
|
|
||||||
/************************************************************************\
|
|
||||||
* This function will return a properly formatted account_id. *
|
|
||||||
* This needs to be placed here, or some classes will have a problem *
|
|
||||||
* on instantiation. *
|
|
||||||
\************************************************************************/
|
|
||||||
function get_account_id($account_id = '',$default_id = '')
|
|
||||||
{
|
|
||||||
global $phpgw, $phpgw_info;
|
|
||||||
|
|
||||||
if (gettype($account_id) == 'integer')
|
|
||||||
{
|
|
||||||
return $account_id;
|
|
||||||
}
|
|
||||||
elseif ($account_id == '')
|
|
||||||
{
|
|
||||||
if ($default_id == '')
|
|
||||||
{
|
|
||||||
return $phpgw_info['user']['account_id'];
|
|
||||||
}
|
|
||||||
elseif (gettype($default_id) == 'string')
|
|
||||||
{
|
|
||||||
return $phpgw->accounts->name2id($default_id);
|
|
||||||
}
|
|
||||||
return intval($default_id);
|
|
||||||
}
|
|
||||||
elseif (gettype($account_id) == 'string')
|
|
||||||
{
|
|
||||||
if($phpgw->accounts->exists(intval($account_id)) == True)
|
|
||||||
{
|
|
||||||
return intval($account_id);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return $phpgw->accounts->name2id($account_id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user