Juggling get_account_id() again.

This commit is contained in:
skeeter 2001-03-21 05:42:40 +00:00
parent a441160b19
commit 9dfd13af5e

View File

@ -97,44 +97,6 @@
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');
/****************************************************************************\
* Quick verification of sane environment *
@ -427,4 +389,42 @@
}
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);
}
}
}