From 6f7277f7aa576191b59cc8c6076bfde3f59ebc4c Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 25 Oct 2011 07:30:44 +0000 Subject: [PATCH] * emailadmin: fixing not allowed userDefinedIdentities when userDefinedAccounts is allowed, fixing typos --- emailadmin/inc/class.emailadmin_bo.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/emailadmin/inc/class.emailadmin_bo.inc.php b/emailadmin/inc/class.emailadmin_bo.inc.php index 59c0f5ead5..6fae4a6cbf 100644 --- a/emailadmin/inc/class.emailadmin_bo.inc.php +++ b/emailadmin/inc/class.emailadmin_bo.inc.php @@ -727,7 +727,7 @@ class emailadmin_bo extends so_sql } $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_default_signature = $data['ea_default_signature']; if(strlen($data['ea_stationery_active_templates']) > 0) @@ -824,9 +824,9 @@ class emailadmin_bo extends so_sql 'ea_active' => 1, ); - if (empty($settings['mail_server'])) $profile['userDefinedAccounts'] = '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['userDefinedAccounts'] = 'yes'; + if (empty($settings['mail_server'])) $profile['userDefinedIdentities'] = 'yes'; + if (empty($settings['mail_server'])) $profile['ea_user_defined_signatures'] = 'yes'; } foreach($to_parse = array(