diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index 848e68ba4..27734f427 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -610,9 +610,29 @@ class adminAdminController extends admin $sms_driver_config[$conf_name] = $conf_value; } - // Save. + // Save advanced mailer config. + getController('module')->updateModuleConfig('advanced_mailer', (object)array( + 'sender_name' => trim($vars->mail_default_name), + 'sender_email' => trim($vars->mail_default_from), + 'force_sender' => toBool($vars->mail_force_default_sender), + 'reply_to' => trim($vars->mail_default_reply_to), + )); + + // Save member config. + getController('module')->updateModuleConfig('member', (object)array( + 'webmaster_name' => trim($vars->mail_default_name), + 'webmaster_email' => trim($vars->mail_default_from), + )); + + // Save system config. + Rhymix\Framework\Config::set("mail.default_name", trim($vars->mail_default_name)); + Rhymix\Framework\Config::set("mail.default_from", trim($vars->mail_default_from)); + Rhymix\Framework\Config::set("mail.default_force", toBool($vars->mail_force_default_sender)); + Rhymix\Framework\Config::set("mail.default_reply_to", trim($vars->mail_default_reply_to)); Rhymix\Framework\Config::set("mail.type", $mail_driver); Rhymix\Framework\Config::set("mail.$mail_driver", $mail_driver_config); + Rhymix\Framework\Config::set("sms.default_from", trim($vars->sms_default_from)); + Rhymix\Framework\Config::set("sms.default_force", toBool($vars->sms_force_default_sender)); Rhymix\Framework\Config::set("sms.type", $sms_driver); Rhymix\Framework\Config::set("sms.$sms_driver", $sms_driver_config); Rhymix\Framework\Config::save(); diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 1f6459f7f..653a55053 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -454,6 +454,20 @@ class adminAdminView extends admin // Load advanced mailer module (for lang). $oAdvancedMailerAdminView = getAdminView('advanced_mailer'); + // Load advanced mailer config. + $advanced_mailer_config = $oAdvancedMailerAdminView->getConfig(); + Context::set('advanced_mailer_config', $advanced_mailer_config); + + // Load member config. + $member_config = getModel('module')->getModuleConfig('member'); + Context::set('member_config', $member_config); + Context::set('webmaster_name', $member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster'); + Context::set('webmaster_email', $member_config->webmaster_email); + + // Load module config. + $module_config = getModel('module')->getModuleConfig('module'); + Context::set('module_config', $module_config); + // Load mail drivers. $mail_drivers = Rhymix\Framework\Mail::getSupportedDrivers(); Context::set('mail_drivers', $mail_drivers); diff --git a/modules/admin/lang/en.php b/modules/admin/lang/en.php index 57443f0c7..8ea9d06fe 100644 --- a/modules/admin/lang/en.php +++ b/modules/admin/lang/en.php @@ -79,6 +79,12 @@ $lang->about_lang_env = 'If you want to make the language setting same for first $lang->xe_license = 'Rhymix complies with the GPL.'; $lang->yesterday = 'Yesterday'; $lang->today = 'Today'; +$lang->cmd_admin_default_from_name = 'Default Sender Name'; +$lang->cmd_admin_default_from_email = 'Default Sender E-mail'; +$lang->cmd_admin_default_from_phone = 'Default Sender Number'; +$lang->cmd_admin_default_reply_to = 'Reply-To'; +$lang->cmd_admin_force_default_sender = 'Apply to All'; +$lang->cmd_admin_sending_method = 'Sending Method'; $lang->default_lang = 'Default Language'; $lang->lang_select = 'Supported Languages'; $lang->auto_select_lang = 'Auto-select Language'; diff --git a/modules/admin/lang/ko.php b/modules/admin/lang/ko.php index 2e74ed5e4..b013e00bc 100644 --- a/modules/admin/lang/ko.php +++ b/modules/admin/lang/ko.php @@ -79,6 +79,12 @@ $lang->about_lang_env = '처음 방문하는 사용자들의 언어 설정을 $lang->xe_license = 'Rhymix는 GPL을 따릅니다.'; $lang->yesterday = '어제'; $lang->today = '오늘'; +$lang->cmd_admin_default_from_name = '기본 발신자 이름'; +$lang->cmd_admin_default_from_email = '기본 발신자 주소'; +$lang->cmd_admin_default_from_phone = '기본 발신자 번호'; +$lang->cmd_admin_default_reply_to = 'Reply-To 주소'; +$lang->cmd_admin_force_default_sender = '일괄 적용'; +$lang->cmd_admin_sending_method = '발송 방법'; $lang->default_lang = '기본 언어 선택'; $lang->lang_select = '지원 언어 선택'; $lang->auto_select_lang = '언어 자동 선택'; diff --git a/modules/admin/tpl/config_notification.html b/modules/admin/tpl/config_notification.html index bf2e8aaae..f16d0a40b 100644 --- a/modules/admin/tpl/config_notification.html +++ b/modules/admin/tpl/config_notification.html @@ -18,8 +18,34 @@

{$lang->email}

+
+ +
+ +
+
+ +
+ +
+ +   + +
+
+ +
+ +
+ +
+
+
- +
+   + +
+
+
- +