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

ignore not (yet) existing mailaccounts table, but not checking for emailadmin, as it is not set in setup

Browse Source
This commit is contained in:
Ralf Becker 2012-11-22 14:58:34 +00:00
parent 350acd2157
commit 15df850d28
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,24 +214,28 @@ class accounts_sql
} }
} }
// store group-email in mailaccounts table // store group-email in mailaccounts table
if ($data['account_id'] < 0 && $GLOBALS['egw_info']['apps']['emailadmin']) if ($data['account_id'] < 0 && class_exists('emailadmin_smtp_sql', false))
{ {
if (empty($data['account_email'])) try {
{ if (empty($data['account_email']))
$this->db->delete(emailadmin_smtp_sql::TABLE, array( {
'account_id' => $data['account_id'], $this->db->delete(emailadmin_smtp_sql::TABLE, array(
'mail_type' => emailadmin_smtp_sql::TYPE_ALIAS, 'account_id' => $data['account_id'],
), __LINE__, __FILE__, emailadmin_smtp_sql::APP); 'mail_type' => emailadmin_smtp_sql::TYPE_ALIAS,
} ), __LINE__, __FILE__, emailadmin_smtp_sql::APP);
else }
{ else
$this->db->insert(emailadmin_smtp_sql::TABLE, array( {
'mail_value' => $data['account_email'], $this->db->insert(emailadmin_smtp_sql::TABLE, array(
), array( 'mail_value' => $data['account_email'],
'account_id' => $data['account_id'], ), array(
'mail_type' => emailadmin_smtp_sql::TYPE_ALIAS, 'account_id' => $data['account_id'],
), __LINE__, __FILE__, emailadmin_smtp_sql::APP); 'mail_type' => emailadmin_smtp_sql::TYPE_ALIAS,
), __LINE__, __FILE__, emailadmin_smtp_sql::APP);
}
} }
// ignore not (yet) existing mailaccounts table
catch (egw_exception_db $e) { }
} }
return $data['account_id']; return $data['account_id'];
} }