diff --git a/modules/admin/tpl/js/notification_config.js b/modules/admin/tpl/js/notification_config.js index 54a1f7d9d..affdb05b4 100644 --- a/modules/admin/tpl/js/notification_config.js +++ b/modules/admin/tpl/js/notification_config.js @@ -12,12 +12,6 @@ $(this).hide(); } }); - var reply_to = $("#mail_reply_to").parents("div.x_control-group"); - if (selected_driver === "woorimail") { - reply_to.hide(); - } else { - reply_to.show(); - } }).triggerHandler("change"); $("#sms_driver").on("change", function() { @@ -83,14 +77,6 @@ } }); - $("#mail_woorimail_account_type_free,#mail_woorimail_account_type_paid").on("change", function() { - if ($("#mail_woorimail_account_type_paid").is(":checked")) { - $("#mail_reply_to").attr("disabled", "disabled"); - } else { - $("#mail_reply_to").removeAttr("disabled"); - } - }).triggerHandler("change"); - }); } (jQuery)); diff --git a/modules/advanced_mailer/lang/en.php b/modules/advanced_mailer/lang/en.php index 79e7a92b9..746a22217 100644 --- a/modules/advanced_mailer/lang/en.php +++ b/modules/advanced_mailer/lang/en.php @@ -12,7 +12,7 @@ $lang->cmd_advanced_mailer_log_no = 'No'; $lang->cmd_advanced_mailer_sending_method_config = 'Default Sending Method'; $lang->cmd_advanced_mailer_about_sending_method_config = 'Please fill all of the boxes.'; $lang->cmd_advanced_mailer_sending_method = 'Sending method'; -$lang->cmd_advanced_mailer_about_sending_method = 'This method will be used for all emails where the recipient\'s email address does not belong to an exception domain.'; +$lang->cmd_advanced_mailer_about_sending_method = 'You can change the default sending method in the Notification Settings screen.'; $lang->cmd_advanced_mailer_sending_method_default = 'Default sending method'; $lang->cmd_advanced_mailer_sending_method_exceptions = 'Exceptions'; $lang->cmd_advanced_mailer_smtp_manual_entry = 'Manual entry'; @@ -35,7 +35,7 @@ $lang->cmd_advanced_mailer_api_user = 'Username'; $lang->cmd_advanced_mailer_api_pass = 'Password'; $lang->cmd_advanced_mailer_sender_key = 'Sender key'; $lang->cmd_advanced_mailer_sender_identity = 'Sender Identity'; -$lang->cmd_advanced_mailer_about_sender_identity = 'Sender identity will be applied to the webmaster\'s name and email address in the member module as well.'; +$lang->cmd_advanced_mailer_about_sender_identity = 'You can change the sender\'s name and e-mail address in the Notification Settings screen.'; $lang->cmd_advanced_mailer_sender_name = 'Sender\'s name'; $lang->cmd_advanced_mailer_sender_email = 'Sender\'s email'; $lang->cmd_advanced_mailer_reply_to = 'Reply-To email'; diff --git a/modules/advanced_mailer/lang/ko.php b/modules/advanced_mailer/lang/ko.php index 540c84a71..fe80343ac 100644 --- a/modules/advanced_mailer/lang/ko.php +++ b/modules/advanced_mailer/lang/ko.php @@ -12,7 +12,7 @@ $lang->cmd_advanced_mailer_log_no = '기록하지 않음'; $lang->cmd_advanced_mailer_sending_method_config = '기본 발송 방법 설정'; $lang->cmd_advanced_mailer_about_sending_method_config = '반드시 모든 항목을 입력하시기 바랍니다.'; $lang->cmd_advanced_mailer_sending_method = '발송 방법'; -$lang->cmd_advanced_mailer_about_sending_method = '받는이의 주소가 예외 도메인에 해당하지 않을 경우 모두 이 방법으로 발송됩니다.'; +$lang->cmd_advanced_mailer_about_sending_method = '기본 발송 방법은 알림 설정 화면에서 변경할 수 있습니다.'; $lang->cmd_advanced_mailer_sending_method_default = '기본 발송 방법'; $lang->cmd_advanced_mailer_sending_method_exceptions = '예외 발송 방법'; $lang->cmd_advanced_mailer_smtp_manual_entry = '직접 입력'; @@ -35,7 +35,7 @@ $lang->cmd_advanced_mailer_api_user = '아이디'; $lang->cmd_advanced_mailer_api_pass = '비밀번호'; $lang->cmd_advanced_mailer_sender_key = '센더 키'; $lang->cmd_advanced_mailer_sender_identity = '보낸이 설정'; -$lang->cmd_advanced_mailer_about_sender_identity = '보낸이 설정은 회원 모듈의 웹마스터 이름 및 메일 주소에도 동일하게 적용됩니다.'; +$lang->cmd_advanced_mailer_about_sender_identity = '보낸이의 이름과 메일 주소는 알림 설정 화면에서 변경할 수 있습니다.'; $lang->cmd_advanced_mailer_sender_name = '보낸이 이름'; $lang->cmd_advanced_mailer_sender_email = '보낸이 메일 주소'; $lang->cmd_advanced_mailer_reply_to = 'Reply-To 주소'; diff --git a/modules/advanced_mailer/tpl/config.html b/modules/advanced_mailer/tpl/config.html index 2d977e511..6265cd867 100644 --- a/modules/advanced_mailer/tpl/config.html +++ b/modules/advanced_mailer/tpl/config.html @@ -19,140 +19,6 @@ ※ {$lang->cmd_advanced_mailer_about_sending_method} -
- -
- -
-
- - - -
- -
-

{$lang->msg_advanced_mailer_about_dummy}
{$lang->msg_advanced_mailer_about_dummy_exceptions}

-
-
- - - - {@ $conf_value = escape(config("mail.$driver_name.$conf_name"))} - - -
- -
- - -
-
- - - -
- -
- -
-
- - - -
- -
- - - -
-
- - - -
- -
- -
-
- - - -
- -
- -
-
- - - -
- -
- -
-
- - - -
- -
- -
-
- - - -
- -
- -
-
- - - -
- -
- -
-
- - - -
- -
- -
-
- - - - -
@@ -162,38 +28,6 @@
※ {$lang->cmd_advanced_mailer_about_sender_identity}
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -

※ {$lang->cmd_advanced_mailer_about_force_sender_caution_line_1}
※ {$lang->cmd_advanced_mailer_about_force_sender_caution_line_2}

-
-
diff --git a/modules/advanced_mailer/tpl/js/config.js b/modules/advanced_mailer/tpl/js/config.js index 9eb24fb4c..43bb459e4 100644 --- a/modules/advanced_mailer/tpl/js/config.js +++ b/modules/advanced_mailer/tpl/js/config.js @@ -3,83 +3,6 @@ $(function() { - $("#advanced_mailer_sending_method").on("change", function() { - var sending_method = $(this).val(); - $("div.x_control-group.hidden-by-default").not(".show-always").each(function() { - if ($(this).hasClass("show-for-" + sending_method)) { - $(this).show(); - } else { - $(this).hide(); - } - }); - var reply_to = $("#advanced_mailer_reply_to").parents("div.x_control-group"); - if (sending_method === "woorimail") { - reply_to.hide(); - } else { - reply_to.show(); - } - }).triggerHandler("change"); - - $("#advanced_mailer_smtp_manual_entry").on("change", function() { - var auto_fill = $(this).val(); - if (auto_fill === 'gmail') { - $("#advanced_mailer_smtp_host").val('smtp.gmail.com'); - $("#advanced_mailer_smtp_port").val('465'); - $("#advanced_mailer_smtp_security_ssl").prop("checked", true).parent().addClass("checked"); - $("#advanced_mailer_smtp_security_tls").parent().removeClass("checked"); - $("#advanced_mailer_smtp_security_none").parent().removeClass("checked"); - $("#advanced_mailer_force_sender").prop("checked", true).parent().addClass("checked"); - } - if (auto_fill === 'hanmail') { - $("#advanced_mailer_smtp_host").val('smtp.daum.net'); - $("#advanced_mailer_smtp_port").val('465'); - $("#advanced_mailer_smtp_security_ssl").prop("checked", true).parent().addClass("checked"); - $("#advanced_mailer_smtp_security_tls").parent().removeClass("checked"); - $("#advanced_mailer_smtp_security_none").parent().removeClass("checked"); - $("#advanced_mailer_force_sender").prop("checked", true).parent().addClass("checked"); - } - if (auto_fill === 'naver') { - $("#advanced_mailer_smtp_host").val('smtp.naver.com'); - $("#advanced_mailer_smtp_port").val('587'); - $("#advanced_mailer_smtp_security_tls").prop("checked", true).parent().addClass("checked"); - $("#advanced_mailer_smtp_security_ssl").parent().removeClass("checked"); - $("#advanced_mailer_smtp_security_none").parent().removeClass("checked"); - $("#advanced_mailer_force_sender").prop("checked", true).parent().addClass("checked"); - } - if (auto_fill === 'worksmobile') { - $("#advanced_mailer_smtp_host").val('smtp.worksmobile.com'); - $("#advanced_mailer_smtp_port").val('587'); - $("#advanced_mailer_smtp_security_tls").prop("checked", true).parent().addClass("checked"); - $("#advanced_mailer_smtp_security_ssl").parent().removeClass("checked"); - $("#advanced_mailer_smtp_security_none").parent().removeClass("checked"); - $("#advanced_mailer_force_sender").prop("checked", true).parent().addClass("checked"); - } - if (auto_fill === 'outlook') { - $("#advanced_mailer_smtp_host").val('smtp-mail.outlook.com'); - $("#advanced_mailer_smtp_port").val('587'); - $("#advanced_mailer_smtp_security_tls").prop("checked", true).parent().addClass("checked"); - $("#advanced_mailer_smtp_security_ssl").parent().removeClass("checked"); - $("#advanced_mailer_smtp_security_none").parent().removeClass("checked"); - $("#advanced_mailer_force_sender").prop("checked", true).parent().addClass("checked"); - } - if (auto_fill === 'yahoo') { - $("#advanced_mailer_smtp_host").val('smtp.mail.yahoo.com'); - $("#advanced_mailer_smtp_port").val('465'); - $("#advanced_mailer_smtp_security_ssl").prop("checked", true).parent().addClass("checked"); - $("#advanced_mailer_smtp_security_tls").parent().removeClass("checked"); - $("#advanced_mailer_smtp_security_none").parent().removeClass("checked"); - $("#advanced_mailer_force_sender").prop("checked", true).parent().addClass("checked"); - } - }); - - $("#advanced_mailer_woorimail_account_type_free,#advanced_mailer_woorimail_account_type_paid").on("change", function() { - if ($("#advanced_mailer_woorimail_account_type_paid").is(":checked")) { - $("#advanced_mailer_reply_to").attr("disabled", "disabled"); - } else { - $("#advanced_mailer_reply_to").removeAttr("disabled"); - } - }).triggerHandler("change"); - $("#advanced_mailer_test_send").click(function(event) { event.preventDefault(); $("#advanced_mailer_test_result").text(""); diff --git a/modules/member/lang/en.php b/modules/member/lang/en.php index 9e48d9c7c..e840906e0 100644 --- a/modules/member/lang/en.php +++ b/modules/member/lang/en.php @@ -71,8 +71,7 @@ $lang->column_id = 'The column id'; $lang->options = 'Options'; $lang->about_keep_signed = 'You will be still signed in even when the browser is closed.\\n\\nIt is not recommended to use this if you are using a public computer, for your personal information could be violated.'; $lang->about_keep_warning = 'You will be still signed in even when the browser is closed. It is not recommended to use this if you are using a public computer, for your personal information could be violated'; -$lang->about_webmaster_name = 'Please enter webmaster\'s name which will be used for verification mails or other site administration. (default : webmaster).'; -$lang->about_webmaster_email = 'Please enter webmaster\'s email address.'; +$lang->about_webmaster_email = 'This setting can be changed in the Notification Settings screen.'; $lang->search_target_list['email_address'] = 'Email Address'; $lang->search_target_list['regdate'] = 'Sign up Date'; $lang->search_target_list['regdate_more'] = 'Sign up Date (more)'; diff --git a/modules/member/lang/ja.php b/modules/member/lang/ja.php index 95a0165b8..619d864ff 100644 --- a/modules/member/lang/ja.php +++ b/modules/member/lang/ja.php @@ -71,8 +71,6 @@ $lang->about_column_id = '入力項目の区切り文字で使用するIDです $lang->options = '選択オプション'; $lang->about_keep_signed = 'ブラウザを閉じてもログイン状態が維持されます。\\n\\nログイン維持機能を利用すると、次回からログインする必要がありません。\\n\\nただし、インターネットカフェ、学校など公共場所で利用する場合、個人情報が流出する恐れがありますので、必ずログアウトしてください。'; $lang->about_keep_warning = 'ブラウザを閉じてもログイン状態が維持されます。\\n\\nログイン維持機能を利用すると、次回からログインする必要がありません。 ただし、インターネットカフェ、学校など公共場所で利用する場合、個人情報が流出する恐れがありますので、必ずログアウトしてください。'; -$lang->about_webmaster_name = '確認メール、またはサイト管理時に使用されるウェブマスターの名前を入力してください(デフォルト : webmaster)。'; -$lang->about_webmaster_email = 'ウェブマスターのメールアドレスを入力してください。'; $lang->search_target_list['email_address'] = 'メールアドレス'; $lang->search_target_list['regdate'] = '登録日'; $lang->search_target_list['regdate_more'] = '登録日(以上)'; diff --git a/modules/member/lang/ko.php b/modules/member/lang/ko.php index 8166b5d2f..d7f774352 100644 --- a/modules/member/lang/ko.php +++ b/modules/member/lang/ko.php @@ -73,8 +73,7 @@ $lang->about_column_id = '입력항목의 구분자로 사용될 ID입니다. $lang->options = '선택 옵션'; $lang->about_keep_signed = '브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다.\\n\\n로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인할 필요가 없습니다.\\n\\n단, PC방, 학교, 도서관 등 공공장소에서 이용 시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요.'; $lang->about_keep_warning = '브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다. 로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인할 필요가 없습니다. 단, PC방, 학교, 도서관 등 공공장소에서 이용 시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요.'; -$lang->about_webmaster_name = '인증 메일이나 기타 사이트 관리 시 사용될 웹마스터의 이름을 입력해주세요. (기본 : webmaster)'; -$lang->about_webmaster_email = '인증 메일이나 기타 사이트 관리 시 사용될 웹마스터의 메일 주소를 입력해주세요.'; +$lang->about_webmaster_email = '이 설정은 알림 설정 화면에서 변경할 수 있습니다.'; $lang->search_target_list['email_address'] = '이메일'; $lang->search_target_list['regdate'] = '가입일시'; $lang->search_target_list['regdate_more'] = '가입일시(이상)'; diff --git a/modules/member/lang/zh-CN.php b/modules/member/lang/zh-CN.php index f9cf9e4b2..3024cbd45 100644 --- a/modules/member/lang/zh-CN.php +++ b/modules/member/lang/zh-CN.php @@ -68,8 +68,6 @@ $lang->about_column_id = '使用与区分输入项目的 ID, 只能用英文字 $lang->options = '选项选择'; $lang->about_keep_signed = '关闭浏览器后也将维持登录状态。\\n\\n使用自动登录功能,可解决每次访问都要输入用户名及密码的麻烦。\\n\\n为防止个人信息泄露,在网吧,学校等公共场所请务必要确认解除登录状态。'; $lang->about_keep_warning = '关闭浏览器后也将维持登录状态。\\n\\n使用自动登录功能,可解决每次访问都要输入用户名及密码的麻烦。 为防止个人信息泄露,在网吧,学校等公共场所请务必要确认解除登录状态。'; -$lang->about_webmaster_name = '请输入认证所需的电子邮件地址或管理其他网站时要使用的网站管理员名称。(默认 : webmaster)'; -$lang->about_webmaster_email = '请输入网站管理员的电子邮件地址。'; $lang->search_target_list['email_address'] = '邮箱地址'; $lang->search_target_list['regdate'] = '注册日期'; $lang->search_target_list['regdate_more'] = '注册日期(以上)'; diff --git a/modules/member/lang/zh-TW.php b/modules/member/lang/zh-TW.php index 71d215ae3..64a5210d7 100644 --- a/modules/member/lang/zh-TW.php +++ b/modules/member/lang/zh-TW.php @@ -61,8 +61,6 @@ $lang->webmaster_name = '管理員名稱'; $lang->webmaster_email = '管理員電子郵件'; $lang->about_keep_signed = '關閉瀏覽器後也將維持登入狀態。\\n\\n使用此功能,可解決每次訪問都要輸入帳號及密碼的麻煩。\\n\\n為防止個人資料洩露,在網咖,學校等公共場所,請務必要確認解除登入狀態。'; $lang->about_keep_warning = '關閉瀏覽器後也將維持登入狀態。使用此功能,可解決每次訪問都要輸入帳號及密碼的麻煩。為防止個人資料洩露,在網咖,學校等公共場所,請務必要確認解除登入狀態。'; -$lang->about_webmaster_name = '請輸入認證所需的電子郵件地址或管理其他網站時要使用的網站管理員名稱。(預設 : webmaster)'; -$lang->about_webmaster_email = '請輸入網站管理員的電子郵件地址。'; $lang->search_target_list['email_address'] = '電子郵件'; $lang->search_target_list['regdate'] = '註冊日期'; $lang->search_target_list['regdate_more'] = '註冊日期(以上)'; diff --git a/modules/member/tpl/default_config.html b/modules/member/tpl/default_config.html index 2b2854325..585ffb501 100644 --- a/modules/member/tpl/default_config.html +++ b/modules/member/tpl/default_config.html @@ -72,17 +72,9 @@
- +
- -

{$lang->about_webmaster_name}

-
-
-
- -
- -

{$lang->about_webmaster_email}

+