extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-27 05:11:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

* emailadmin: fixing not allowed userDefinedIdentities when userDefinedAccounts is allowed, fixing typos

Browse Source
This commit is contained in:
Klaus Leithoff 2011-10-25 07:30:44 +00:00
parent 22619083b6
commit 6f7277f7aa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emailadmin/inc/class.emailadmin_bo.inc.php
View File

@ -727,7 +727,7 @@ class emailadmin_bo extends so_sql
} }
$eaPreferences->userDefinedAccounts = ($data['userDefinedAccounts'] == 'yes'); $eaPreferences->userDefinedAccounts = ($data['userDefinedAccounts'] == 'yes');
$eaPreferences->userDefinedIdentities = ($data['userDefinedIdentities'] == 'yes'); $eaPreferences->userDefinedIdentities = ($data['userDefinedIdentities'] == 'yes' || $data['userDefinedAccounts'] == 'yes');
$eaPreferences->ea_user_defined_signatures = ($data['ea_user_defined_signatures'] == 'yes'); $eaPreferences->ea_user_defined_signatures = ($data['ea_user_defined_signatures'] == 'yes');
$eaPreferences->ea_default_signature = $data['ea_default_signature']; $eaPreferences->ea_default_signature = $data['ea_default_signature'];
if(strlen($data['ea_stationery_active_templates']) > 0) if(strlen($data['ea_stationery_active_templates']) > 0)
@ -824,9 +824,9 @@ class emailadmin_bo extends so_sql
'ea_active' => 1, 'ea_active' => 1,
); );
if (empty($settings['mail_server'])) $profile['userDefinedAccounts'] = 'yes'; if (empty($settings['mail_server'])) $profile['userDefinedAccounts'] = 'yes';
if (empty($settings['mail_server'])) $profile['userDefinedIdentities'] == 'yes'; if (empty($settings['mail_server'])) $profile['userDefinedIdentities'] = 'yes';
if (empty($settings['mail_server'])) $profile['ea_user_defined_signatures'] == 'yes'; if (empty($settings['mail_server'])) $profile['ea_user_defined_signatures'] = 'yes';
} }
foreach($to_parse = array( foreach($to_parse = array(