extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle not (yet) existing mailaccounts table eg. in setup or when no emailadmin installed

Browse Source
This commit is contained in:
Ralf Becker 2012-11-22 13:25:22 +00:00
parent 76064cb490
commit 350acd2157
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -105,7 +105,6 @@ class accounts_sql
{
if (!(int)$account_id) return false;
$join = $extra_cols = '';
if ($account_id > 0)
{
$extra_cols = $this->contacts_table.'.n_given AS account_firstname,'.
@ -118,13 +117,24 @@ class accounts_sql
$this->contacts_table.'.tel_work AS account_phone,';
$join = 'LEFT JOIN '.$this->contacts_table.' ON '.$this->table.'.account_id='.$this->contacts_table.'.account_id';
}
else//if ($GLOBALS['egw_info']['apps']['emailadmin'])
else
{
$extra_cols = emailadmin_smtp_sql::TABLE.'.mail_value AS account_email,';
$join = 'LEFT JOIN '.emailadmin_smtp_sql::TABLE.' ON '.$this->table.'.account_id=-'.emailadmin_smtp_sql::TABLE.'.account_id AND mail_type='.emailadmin_smtp_sql::TYPE_ALIAS;
}
if (!($data = $this->db->select($this->table,$extra_cols.$this->table.'.*',$this->table.'.account_id='.abs($account_id),
__LINE__,__FILE__,false,'',false,0,$join)->fetch()))
try {
$rs = $this->db->select($this->table, $extra_cols.$this->table.'.*',
$this->table.'.account_id='.abs($account_id),
__LINE__, __FILE__, false, '', false, 0, $join);
}
catch (egw_exception_db $e) { }
if (!$rs) // handle not (yet) existing mailaccounts table
{
$rs = $this->db->select($this->table, $this->table.'.*',
$this->table.'.account_id='.abs($account_id), __LINE__, __FILE__);
}
if (!$rs || !($data = $rs->fetch()))
{
return false;
}