diff --git a/modules/advanced_mailer/advanced_mailer.admin.controller.php b/modules/advanced_mailer/advanced_mailer.admin.controller.php index 70e69d07e..62ffbb92e 100644 --- a/modules/advanced_mailer/advanced_mailer.admin.controller.php +++ b/modules/advanced_mailer/advanced_mailer.admin.controller.php @@ -20,6 +20,8 @@ class Advanced_MailerAdminController extends Advanced_Mailer $config = $this->getConfig(); $config->log_sent_mail = toBool($vars->log_sent_mail); $config->log_errors = toBool($vars->log_errors); + $config->log_sent_sms = toBool($vars->log_sent_sms); + $config->log_sms_errors = toBool($vars->log_sms_errors); $output = getController('module')->insertModuleConfig('advanced_mailer', $config); if ($output->toBool()) { @@ -180,7 +182,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer /** * Send a test email using a temporary configuration. */ - public function procAdvanced_MailerAdminTestSend() + public function procAdvanced_MailerAdminTestSendMail() { $advanced_mailer_config = $this->getConfig(); $recipient_config = Context::gets('recipient_name', 'recipient_email'); diff --git a/modules/advanced_mailer/advanced_mailer.admin.view.php b/modules/advanced_mailer/advanced_mailer.admin.view.php index 4b6129bff..b0092505e 100644 --- a/modules/advanced_mailer/advanced_mailer.admin.view.php +++ b/modules/advanced_mailer/advanced_mailer.admin.view.php @@ -112,7 +112,7 @@ class Advanced_MailerAdminView extends Advanced_Mailer /** * Display the test send form. */ - public function dispAdvanced_MailerAdminTestConfig() + public function dispAdvanced_MailerAdminMailTest() { $advanced_mailer_config = $this->getConfig(); $sending_methods = Rhymix\Framework\Mail::getSupportedDrivers(); @@ -128,7 +128,7 @@ class Advanced_MailerAdminView extends Advanced_Mailer /** * Display the sent mail log. */ - public function dispAdvanced_MailerAdminSentMail() + public function dispAdvanced_MailerAdminMailLog() { $obj = new stdClass(); $obj->status = 'success'; @@ -154,7 +154,7 @@ class Advanced_MailerAdminView extends Advanced_Mailer /** * Display the error log. */ - public function dispAdvanced_MailerAdminErrors() + public function dispAdvanced_MailerAdminMailErrors() { $obj = new stdClass(); $obj->status = 'error'; diff --git a/modules/advanced_mailer/conf/info.xml b/modules/advanced_mailer/conf/info.xml index 59ae3da9f..15cfd096e 100644 --- a/modules/advanced_mailer/conf/info.xml +++ b/modules/advanced_mailer/conf/info.xml @@ -1,17 +1,17 @@ - 고급 메일 발송 모듈 - Advanced Mailer + 고급 메일 발송 모듈 (메일 및 SMS 관리) + Advanced Mailer (with SMS) - 외부 SMTP 서버 또는 API를 사용하여 메일을 발송합니다. + 라이믹스에서 발송하는 메일과 SMS를 기록하고 테스트하는 기능을 제공합니다. - Send mail using an external SMTP server or API service. + Log and test e-mails and SMS sent from Rhymix. - 2.0.0 - 2016-05-22 - - Kijin Sung - Kijin Sung + 2.1.0 + 2016-12-14 + + 포에시스 + POESIS diff --git a/modules/advanced_mailer/conf/module.xml b/modules/advanced_mailer/conf/module.xml index 0a16f0ca2..88ed22a98 100644 --- a/modules/advanced_mailer/conf/module.xml +++ b/modules/advanced_mailer/conf/module.xml @@ -6,14 +6,17 @@ - - - + + + + + + - + diff --git a/modules/advanced_mailer/lang/en.php b/modules/advanced_mailer/lang/en.php index 746a22217..d557f0ceb 100644 --- a/modules/advanced_mailer/lang/en.php +++ b/modules/advanced_mailer/lang/en.php @@ -1,12 +1,14 @@ cmd_advanced_mailer = 'Advanced Mailer'; +$lang->cmd_advanced_mailer = 'Advanced Mailer (with SMS)'; $lang->cmd_advanced_mailer_general_config = 'General settings'; $lang->cmd_advanced_mailer_is_enabled = 'Enable module'; $lang->cmd_advanced_mailer_is_enabled_yes = 'Enabled'; $lang->cmd_advanced_mailer_is_enabled_no = 'Disabled'; $lang->cmd_advanced_mailer_logging = 'Logging'; -$lang->cmd_advanced_mailer_log_sent_mail = 'Log Sent Mail'; -$lang->cmd_advanced_mailer_log_errors = 'Log Errors'; +$lang->cmd_advanced_mailer_log_mail = 'Log Mail'; +$lang->cmd_advanced_mailer_log_mail_errors = 'Log Mail Errors'; +$lang->cmd_advanced_mailer_log_sms = 'Log SMS'; +$lang->cmd_advanced_mailer_log_sms_errors = 'Log SMS Errors'; $lang->cmd_advanced_mailer_log_yes = 'Yes'; $lang->cmd_advanced_mailer_log_no = 'No'; $lang->cmd_advanced_mailer_sending_method_config = 'Default Sending Method'; @@ -62,7 +64,7 @@ $lang->cmd_advanced_mailer_other_info_mailgun_dkim = 'The DKIM hostname may be d $lang->cmd_advanced_mailer_other_info_postmark_dkim = 'Please see the Sender Signatures page of your Postmark account for the exact DKIm hostname to use.'; $lang->cmd_advanced_mailer_other_info_woorimail_dkim = 'Please log into Woorimail to see your DKIM settings.'; $lang->cmd_advanced_mailer_ellipsis = '(see API for full value)'; -$lang->cmd_advanced_mailer_test = 'Mail Test'; +$lang->cmd_advanced_mailer_mail_test = 'Mail Test'; $lang->cmd_advanced_mailer_recipient_name = 'Recipient\'s name'; $lang->cmd_advanced_mailer_recipient_email = 'Recipient\'s email'; $lang->cmd_advanced_mailer_send = 'Send'; @@ -115,3 +117,4 @@ $lang->cmd_advanced_mailer_status_calling_script = 'Called from'; $lang->cmd_advanced_mailer_clear_log_condition_all = 'Everything'; $lang->cmd_advanced_mailer_clear_log_condition = 'Over %d days'; $lang->cmd_advanced_mailer_clear_log_button = 'Clear old logs'; +$lang->cmd_advanced_mailer_sms_test = 'SMS Test'; diff --git a/modules/advanced_mailer/lang/ko.php b/modules/advanced_mailer/lang/ko.php index fe80343ac..114eb4aec 100644 --- a/modules/advanced_mailer/lang/ko.php +++ b/modules/advanced_mailer/lang/ko.php @@ -1,12 +1,14 @@ cmd_advanced_mailer = '고급 메일 발송 모듈'; +$lang->cmd_advanced_mailer = '고급 메일 발송 모듈 (메일 및 SMS 관리)'; $lang->cmd_advanced_mailer_general_config = '기본 설정'; $lang->cmd_advanced_mailer_is_enabled = '모듈 사용'; $lang->cmd_advanced_mailer_is_enabled_yes = '사용'; $lang->cmd_advanced_mailer_is_enabled_no = '사용하지 않음'; $lang->cmd_advanced_mailer_logging = '발송 내역 기록'; -$lang->cmd_advanced_mailer_log_sent_mail = '발송 내역'; -$lang->cmd_advanced_mailer_log_errors = '에러 내역'; +$lang->cmd_advanced_mailer_log_mail = '메일 발송 내역'; +$lang->cmd_advanced_mailer_log_mail_errors = '메일 에러 내역'; +$lang->cmd_advanced_mailer_log_sms = 'SMS 발송 내역'; +$lang->cmd_advanced_mailer_log_sms_errors = 'SMS 에러 내역'; $lang->cmd_advanced_mailer_log_yes = '기록'; $lang->cmd_advanced_mailer_log_no = '기록하지 않음'; $lang->cmd_advanced_mailer_sending_method_config = '기본 발송 방법 설정'; @@ -62,7 +64,7 @@ $lang->cmd_advanced_mailer_other_info_mailgun_dkim = 'DKIM 호스트명은 달 $lang->cmd_advanced_mailer_other_info_postmark_dkim = '정확한 DKIM 호스트명은 Postmark 계정의 Sender Signatures 페이지를 참고하시기 바랍니다.'; $lang->cmd_advanced_mailer_other_info_woorimail_dkim = 'DKIM 설정은 우리메일에 로그인하여 확인하십시오.'; $lang->cmd_advanced_mailer_ellipsis = '(중략)'; -$lang->cmd_advanced_mailer_test = '발송 테스트'; +$lang->cmd_advanced_mailer_mail_test = '메일 테스트'; $lang->cmd_advanced_mailer_recipient_name = '받는이 이름'; $lang->cmd_advanced_mailer_recipient_email = '받는이 메일 주소'; $lang->cmd_advanced_mailer_send = '발송'; @@ -115,3 +117,4 @@ $lang->cmd_advanced_mailer_status_calling_script = '호출 위치'; $lang->cmd_advanced_mailer_clear_log_condition_all = '모두'; $lang->cmd_advanced_mailer_clear_log_condition = '%d일 이상'; $lang->cmd_advanced_mailer_clear_log_button = '오래된 기록 삭제'; +$lang->cmd_advanced_mailer_sms_test = 'SMS 테스트'; diff --git a/modules/advanced_mailer/tpl/common.html b/modules/advanced_mailer/tpl/common.html index e254222ec..4b5c08526 100644 --- a/modules/advanced_mailer/tpl/common.html +++ b/modules/advanced_mailer/tpl/common.html @@ -7,7 +7,10 @@
  • {$lang->cmd_advanced_mailer_general_config}
  • {$lang->cmd_advanced_mailer_exception_domains}
  • {$lang->cmd_advanced_mailer_spf_dkim_setting}
    • -
  • {$lang->cmd_advanced_mailer_test}
    • -
  • {$lang->cmd_advanced_mailer_log_sent_mail}
    • -
  • {$lang->cmd_advanced_mailer_log_errors}
    • +
  • {$lang->cmd_advanced_mailer_mail_test}
    • +
  • {$lang->cmd_advanced_mailer_log_mail}
    • +
  • {$lang->cmd_advanced_mailer_log_mail_errors}
    • +
  • {$lang->cmd_advanced_mailer_sms_test}
    • +
  • {$lang->cmd_advanced_mailer_log_sms}
    • +
  • {$lang->cmd_advanced_mailer_log_sms_errors}
    • diff --git a/modules/advanced_mailer/tpl/config.html b/modules/advanced_mailer/tpl/config.html index 6265cd867..852f118fa 100644 --- a/modules/advanced_mailer/tpl/config.html +++ b/modules/advanced_mailer/tpl/config.html @@ -36,7 +36,7 @@

    {$lang->cmd_advanced_mailer_logging}

    - +
    @@ -55,6 +55,26 @@
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    diff --git a/modules/advanced_mailer/tpl/js/config.js b/modules/advanced_mailer/tpl/js/config.js index 43bb459e4..b4782e3f7 100644 --- a/modules/advanced_mailer/tpl/js/config.js +++ b/modules/advanced_mailer/tpl/js/config.js @@ -3,7 +3,7 @@ $(function() { - $("#advanced_mailer_test_send").click(function(event) { + $("#advanced_mailer_test_send_mail").click(function(event) { event.preventDefault(); $("#advanced_mailer_test_result").text(""); $(this).attr("disabled", "disabled"); @@ -12,7 +12,7 @@ recipient_email: $("#advanced_mailer_recipient_email").val(), }; $.exec_json( - "advanced_mailer.procAdvanced_mailerAdminTestSend", ajax_data, + "advanced_mailer.procAdvanced_mailerAdminTestSendMail", ajax_data, function(response) { $("#advanced_mailer_test_result").html(response.test_result); $("#advanced_mailer_test_send").removeAttr("disabled"); diff --git a/modules/advanced_mailer/tpl/test.html b/modules/advanced_mailer/tpl/test.html index 07c3517ec..28f80d0c0 100644 --- a/modules/advanced_mailer/tpl/test.html +++ b/modules/advanced_mailer/tpl/test.html @@ -13,7 +13,7 @@
    -

    {$lang->cmd_advanced_mailer_test}

    +

    {$lang->cmd_advanced_mailer_mail_test}

    @@ -39,7 +39,7 @@
    - +