extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 15:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert the code back to the way it was.

Browse Source
This commit is contained in:
skeeter 2001-04-03 03:26:59 +00:00
parent afea2d7d56
commit 42a593ad9b
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
phpgwapi/inc/functions.inc.php
View File

@ -96,45 +96,6 @@
global $debugme;
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 *
@ -428,3 +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);
}
}
}