fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 03:52:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Clean up duplicate configuration pages

Browse source
This commit is contained in:
Kijin Sung 2016-11-12 16:06:13 +09:00
parent ab004329c4
commit b65511eb6c
11 changed files with 8 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/advanced_mailer/lang/en.php
View file

@ -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 <a href="./index.php?module=admin&amp;act=dispAdvanced_mailerAdminExceptions" target="_blank">exception domain</a>.';
$lang->cmd_advanced_mailer_about_sending_method = 'You can change the default sending method in the <a href="index.php?module=admin&act=dispAdminConfigNotification" target="_blank">Notification Settings</a> 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 <a href="./index.php?module=admin&amp;act=dispMemberAdminConfig" target="_blank">member module</a> as well.';
$lang->cmd_advanced_mailer_about_sender_identity = 'You can change the sender\'s name and e-mail address in the <a href="index.php?module=admin&act=dispAdminConfigNotification" target="_blank">Notification Settings</a> 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';

4
modules/advanced_mailer/lang/ko.php
View file

@ -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 = '받는이의 주소가 <a href="./index.php?module=admin&amp;act=dispAdvanced_mailerAdminExceptions" target="_blank">예외 도메인</a>에 해당하지 않을 경우 모두 이 방법으로 발송됩니다.';
$lang->cmd_advanced_mailer_about_sending_method = '기본 발송 방법은 <a href="index.php?module=admin&act=dispAdminConfigNotification" target="_blank">알림 설정</a> 화면에서 변경할 수 있습니다.';
$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 = '보낸이 설정은 <a href="./index.php?module=admin&amp;act=dispMemberAdminConfig" target="_blank">회원 모듈</a>의 웹마스터 이름 및 메일 주소에도 동일하게 적용됩니다.';
$lang->cmd_advanced_mailer_about_sender_identity = '보낸이의 이름과 메일 주소는 <a href="index.php?module=admin&act=dispAdminConfigNotification" target="_blank">알림 설정</a> 화면에서 변경할 수 있습니다.';
$lang->cmd_advanced_mailer_sender_name = '보낸이 이름';
$lang->cmd_advanced_mailer_sender_email = '보낸이 메일 주소';
$lang->cmd_advanced_mailer_reply_to = 'Reply-To 주소';

166
modules/advanced_mailer/tpl/config.html
View file

@ -19,140 +19,6 @@
※ {$lang->cmd_advanced_mailer_about_sending_method}
</div>
<div class="x_control-group show-always">
<label class="x_control-label" for="advanced_mailer_sending_method">{$lang->cmd_advanced_mailer_sending_method_default}</label>
<div class="x_controls">
<select name="sending_method" id="advanced_mailer_sending_method">
<!--@foreach($sending_methods as $driver_name => $driver_definition)-->
<option value="{$driver_name}" selected="selected"|cond="$sending_method === $driver_name">{$driver_definition['name']}</option>
<!--@end-->
</select>
</div>
</div>
<script type="text/javascript">
var advanced_mailer_sending_methods = {json_encode($sending_methods)};
</script>
<div class="x_control-group hidden-by-default show-for-dummy">
<label class="x_control-label"></label>
<div class="x_controls">
<p class="x_help-block">{$lang->msg_advanced_mailer_about_dummy}<br />{$lang->msg_advanced_mailer_about_dummy_exceptions}</p>
</div>
</div>
<!--@foreach($sending_methods as $driver_name => $driver_definition)-->
<!--@foreach($driver_definition['required'] as $conf_name)-->
{@ $conf_value = escape(config("mail.$driver_name.$conf_name"))}
<!--@if($conf_name === 'smtp_host')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label" for="advanced_mailer_{$driver_name}_smtp_host">{$lang->cmd_advanced_mailer_smtp_host}</label>
<div class="x_controls">
<input type="text" name="{$driver_name}_smtp_host" id="advanced_mailer_{$driver_name}_smtp_host" value="{$conf_value}" />
<select id="advanced_mailer_{$driver_name}_manual_entry">
<option value="">{$lang->cmd_advanced_mailer_smtp_manual_entry}</option>
<option value="gmail">Gmail</option>
<option value="hanmail">Hanmail</option>
<option value="naver">Naver</option>
<option value="worksmobile">Works Mobile</option>
<option value="outlook">Outlook.com</option>
<option value="yahoo">Yahoo</option>
</select>
</div>
</div>
<!--@end-->
<!--@if($conf_name === 'smtp_port')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label" for="advanced_mailer_{$driver_name}_smtp_port">{$lang->cmd_advanced_mailer_smtp_port}</label>
<div class="x_controls">
<input type="text" name="{$driver_name}_smtp_port" id="advanced_mailer_{$driver_name}_smtp_port" value="{$conf_value}" />
</div>
</div>
<!--@end-->
<!--@if($conf_name === 'smtp_security')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label">{$lang->cmd_advanced_mailer_smtp_security}</label>
<div class="x_controls">
<label class="x_inline" for="advanced_mailer_{$driver_name}_security_none"><input type="radio" name="{$driver_name}_smtp_security" id="advanced_mailer_{$driver_name}_security_none" value="none" checked="checked"|cond="!in_array($conf_value, array('ssl', 'tls'))" /> {$lang->cmd_advanced_mailer_smtp_security_none}</label>
<label class="x_inline" for="advanced_mailer_{$driver_name}_security_ssl"><input type="radio" name="{$driver_name}_smtp_security" id="advanced_mailer_{$driver_name}_security_ssl" value="ssl" checked="checked"|cond="$conf_value === 'ssl'" /> {$lang->cmd_advanced_mailer_smtp_security_ssl}</label>
<label class="x_inline" for="advanced_mailer_{$driver_name}_security_tls"><input type="radio" name="{$driver_name}_smtp_security" id="advanced_mailer_{$driver_name}_security_tls" value="tls" checked="checked"|cond="$conf_value === 'tls'" /> {$lang->cmd_advanced_mailer_smtp_security_tls}</label>
</div>
</div>
<!--@end-->
<!--@if($conf_name === 'smtp_user')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label" for="advanced_mailer_{$driver_name}_smtp_user">{$lang->cmd_advanced_mailer_smtp_user}</label>
<div class="x_controls">
<input type="text" name="{$driver_name}_smtp_user" id="advanced_mailer_{$driver_name}_smtp_user" value="{$conf_value}" />
</div>
</div>
<!--@end-->
<!--@if($conf_name === 'smtp_pass')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label" for="advanced_mailer_smtp_pass">{$lang->cmd_advanced_mailer_smtp_pass}</label>
<div class="x_controls">
<input type="smtp_pass" name="{$driver_name}_smtp_pass" id="advanced_mailer_{$driver_name}_smtp_pass" value="{$conf_value}" />
</div>
</div>
<!--@end-->
<!--@if($conf_name === 'api_type')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label" for="advanced_mailer_{$driver_name}_api_type">{$lang->cmd_advanced_mailer_api_type}</label>
<div class="x_controls">
<select id="advanced_mailer_{$driver_name}_api_type" name="{$driver_name}_api_type">
<!--@foreach($driver_definition['api_types'] as $api_type)-->
<option value="{$api_type}" selected="selected"|cond="$api_type === $conf_value">{$api_type}</option>
<!--@end-->
</select>
</div>
</div>
<!--@end-->
<!--@if($conf_name === 'api_domain')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label" for="advanced_mailer_{$driver_name}_api_domain">{$lang->cmd_advanced_mailer_api_domain}</label>
<div class="x_controls">
<input type="text" name="{$driver_name}_api_domain" id="advanced_mailer_{$driver_name}_api_domain" value="{$conf_value}" />
</div>
</div>
<!--@end-->
<!--@if($conf_name === 'api_token')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label" for="advanced_mailer_{$driver_name}_api_token">{$lang->cmd_advanced_mailer_api_token}</label>
<div class="x_controls full-width">
<input type="text" name="{$driver_name}_api_token" id="advanced_mailer_{$driver_name}_api_token" value="{$conf_value}" />
</div>
</div>
<!--@end-->
<!--@if($conf_name === 'api_user')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label" for="advanced_mailer_{$driver_name}_api_user">{$lang->cmd_advanced_mailer_api_user}</label>
<div class="x_controls">
<input type="text" name="{$driver_name}_api_user" id="advanced_mailer_{$driver_name}_api_user" value="{$conf_value}" />
</div>
</div>
<!--@end-->
<!--@if($conf_name === 'api_pass')-->
<div class="x_control-group hidden-by-default show-for-{$driver_name}">
<label class="x_control-label" for="advanced_mailer_{$driver_name}_api_pass">{$lang->cmd_advanced_mailer_api_pass}</label>
<div class="x_controls full-width">
<input type="password" name="{$driver_name}_api_pass" id="advanced_mailer_{$driver_name}_api_pass" value="{$conf_value}" />
</div>
</div>
<!--@end-->
<!--@end-->
<!--@end-->
</section>
<section class="section">
@ -162,38 +28,6 @@
<div class="advanced_mailer_description">
※ {$lang->cmd_advanced_mailer_about_sender_identity}
</div>
<div class="x_control-group">
<label class="x_control-label" for="advanced_mailer_sender_name">{$lang->cmd_advanced_mailer_sender_name}</label>
<div class="x_controls">
<input type="text" name="sender_name" id="advanced_mailer_sender_name" value="{$webmaster_name}" />
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="advanced_mailer_sender_email">{$lang->cmd_advanced_mailer_sender_email}</label>
<div class="x_controls">
<input type="text" name="sender_email" id="advanced_mailer_sender_email" value="{$webmaster_email}" />
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="advanced_mailer_reply_to">{$lang->cmd_advanced_mailer_reply_to}</label>
<div class="x_controls">
<input type="text" name="reply_to" id="advanced_mailer_reply_to" value="{$advanced_mailer_config->reply_to}" />
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->cmd_advanced_mailer_force_sender}</label>
<div class="x_controls">
<label for="advanced_mailer_force_sender">
<input type="checkbox" name="force_sender" id="advanced_mailer_force_sender" value="Y" checked="checked"|cond="toBool($advanced_mailer_config->force_sender)" />
{$lang->cmd_advanced_mailer_about_force_sender}
</label>
<p>※ {$lang->cmd_advanced_mailer_about_force_sender_caution_line_1}<br />※ {$lang->cmd_advanced_mailer_about_force_sender_caution_line_2}</p>
</div>
</div>
</section>

77
modules/advanced_mailer/tpl/js/config.js
View file

@ -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("");