mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-05-01 08:12:17 +09:00
Remove trailing whitespace
This commit is contained in:
Kijin Sung
parent
c5267b42fd
commit
37b0d3a1e6
71 changed files with 806 additions and 806 deletions
|
|
@ -15,7 +15,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
{
|
||||
// Get and validate the new configuration.
|
||||
$vars = Context::getRequestVars();
|
||||
|
||||
|
||||
// Update the current module's configuration.
|
||||
$config = $this->getConfig();
|
||||
$config->log_sent_mail = toBool($vars->log_sent_mail);
|
||||
|
|
@ -33,7 +33,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
{
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
if (Context::get('success_return_url'))
|
||||
{
|
||||
$this->setRedirectUrl(Context::get('success_return_url'));
|
||||
|
|
@ -43,7 +43,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdvanced_mailerAdminConfig'));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Save the exception configuration.
|
||||
*/
|
||||
|
|
@ -52,7 +52,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
// Get the current configuration.
|
||||
$config = $this->getConfig();
|
||||
$sending_methods = Rhymix\Framework\Mail::getSupportedDrivers();
|
||||
|
||||
|
||||
// Get and validate the list of exceptions.
|
||||
$exceptions = array();
|
||||
for ($i = 1; $i <= 3; $i++)
|
||||
|
|
@ -77,7 +77,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
}
|
||||
$exceptions[$i]['method'] = $method;
|
||||
$exceptions[$i]['domains'] = array();
|
||||
|
||||
|
||||
$domains = array_map('trim', preg_split('/[,\n]/', $domains, null, PREG_SPLIT_NO_EMPTY));
|
||||
foreach ($domains as $domain)
|
||||
{
|
||||
|
|
@ -89,7 +89,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Save the new configuration.
|
||||
$config->exceptions = $exceptions;
|
||||
$output = getController('module')->insertModuleConfig('advanced_mailer', $config);
|
||||
|
|
@ -101,7 +101,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
{
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
if (Context::get('success_return_url'))
|
||||
{
|
||||
$this->setRedirectUrl(Context::get('success_return_url'));
|
||||
|
|
@ -111,7 +111,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdvanced_mailerAdminExceptions'));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Check the DNS record of a domain.
|
||||
*/
|
||||
|
|
@ -128,14 +128,14 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->add('record_content', false);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$records = @dns_get_record($check_config->hostname, constant('DNS_' . $check_config->record_type));
|
||||
if ($records === false)
|
||||
{
|
||||
$this->add('record_content', false);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$return_values = array();
|
||||
foreach ($records as $record)
|
||||
{
|
||||
|
|
@ -147,7 +147,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->add('record_content', implode("\n\n", $return_values));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Clear old mail sending log.
|
||||
*/
|
||||
|
|
@ -163,15 +163,15 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
{
|
||||
throw new Rhymix\Framework\Exceptions\InvalidRequest;
|
||||
}
|
||||
|
||||
|
||||
$obj = new stdClass();
|
||||
$obj->status = $status;
|
||||
$obj->regdate = date('YmdHis', time() - ($clear_before_days * 86400) + zgap());
|
||||
$output = executeQuery('advanced_mailer.deleteMailLogs', $obj);
|
||||
|
||||
|
||||
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdvanced_mailerAdminMailLog', 'status', $status));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Clear old SMS sending log.
|
||||
*/
|
||||
|
|
@ -187,15 +187,15 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
{
|
||||
throw new Rhymix\Framework\Exceptions\InvalidRequest;
|
||||
}
|
||||
|
||||
|
||||
$obj = new stdClass();
|
||||
$obj->status = $status;
|
||||
$obj->regdate = date('YmdHis', time() - ($clear_before_days * 86400) + zgap());
|
||||
$output = executeQuery('advanced_mailer.deleteSMSLogs', $obj);
|
||||
|
||||
|
||||
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdvanced_mailerAdminSMSLog', 'status', $status));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Clear old Push sending log.
|
||||
*/
|
||||
|
|
@ -211,15 +211,15 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
{
|
||||
throw new Rhymix\Framework\Exceptions\InvalidRequest;
|
||||
}
|
||||
|
||||
|
||||
$obj = new stdClass();
|
||||
$obj->status = $status;
|
||||
$obj->regdate = date('YmdHis', time() - ($clear_before_days * 86400) + zgap());
|
||||
$output = executeQuery('advanced_mailer.deletePushLogs', $obj);
|
||||
|
||||
|
||||
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdvanced_mailerAdminPushLog', 'status', $status));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Send a test mail.
|
||||
*/
|
||||
|
|
@ -228,7 +228,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$recipient_config = Context::gets('recipient_name', 'recipient_email');
|
||||
$recipient_name = $recipient_config->recipient_name;
|
||||
$recipient_email = $recipient_config->recipient_email;
|
||||
|
||||
|
||||
if (!$recipient_name)
|
||||
{
|
||||
$this->add('test_result', 'Error: ' . Context::getLang('msg_advanced_mailer_recipient_name_is_empty'));
|
||||
|
|
@ -244,10 +244,10 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->add('test_result', 'Error: ' . Context::getLang('msg_advanced_mailer_recipient_email_is_invalid'));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$oAdvancedMailerController = getController('advanced_mailer');
|
||||
$sending_method = $oAdvancedMailerController->getSendingMethodForEmailAddress($recipient_email) ?: config('mail.type');
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
$oMail = new Rhymix\Framework\Mail();
|
||||
|
|
@ -256,7 +256,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
'<p>고급 메일 발송 모듈 <b>테스트</b> 메일입니다.</p><p>메일이 정상적으로 발송되고 있습니다.</p>');
|
||||
$oMail->addTo($recipient_email, $recipient_name);
|
||||
$result = $oMail->send();
|
||||
|
||||
|
||||
if (!$result)
|
||||
{
|
||||
if (count($oMail->getErrors()))
|
||||
|
|
@ -274,7 +274,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$this->add('test_result', nl2br(htmlspecialchars(implode("\n", $oMail->getErrors()))));
|
||||
return;
|
||||
}
|
||||
|
|
@ -290,11 +290,11 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->add('test_result', nl2br(htmlspecialchars($e->getMessage())));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$this->add('test_result', Context::getLang('msg_advanced_mailer_test_success'));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Send a test SMS.
|
||||
*/
|
||||
|
|
@ -303,7 +303,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$recipient_number = Context::get('recipient_number');
|
||||
$country_code = intval(Context::get('country_code'));
|
||||
$content = trim(Context::get('content'));
|
||||
|
||||
|
||||
if (!$recipient_number)
|
||||
{
|
||||
$this->add('test_result', 'Error: ' . Context::getLang('msg_advanced_mailer_recipient_number_is_empty'));
|
||||
|
|
@ -314,14 +314,14 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->add('test_result', 'Error: ' . Context::getLang('msg_advanced_mailer_content_is_empty'));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
$oSMS = new Rhymix\Framework\SMS();
|
||||
$oSMS->addTo($recipient_number, $country_code);
|
||||
$oSMS->setBody($content);
|
||||
$result = $oSMS->send();
|
||||
|
||||
|
||||
if (!$result)
|
||||
{
|
||||
if (count($oSMS->getErrors()))
|
||||
|
|
@ -341,11 +341,11 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->add('test_result', nl2br(htmlspecialchars($e->getMessage())));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$this->add('test_result', Context::getLang('msg_advanced_mailer_test_success_sms'));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Send a test Push Notification.
|
||||
*/
|
||||
|
|
@ -355,14 +355,14 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$subject = trim(Context::get('subject'));
|
||||
$content = trim(Context::get('content'));
|
||||
$url = trim(Context::get('url'));
|
||||
|
||||
|
||||
$member_info = MemberModel::getMemberInfoByUserID($recipient_user_id);
|
||||
if (!$member_info || !$member_info->member_srl)
|
||||
{
|
||||
$this->add('test_result', 'Error: ' . Context::getLang('msg_advanced_mailer_recipient_user_id_not_found'));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$args = new stdClass;
|
||||
$args->member_srl = $member_info->member_srl;
|
||||
$output = executeQueryArray('member.getMemberDeviceTokensByMemberSrl', $args);
|
||||
|
|
@ -371,7 +371,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->add('test_result', 'Error: ' . Context::getLang('msg_advanced_mailer_recipient_has_no_devices'));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (!$subject)
|
||||
{
|
||||
$this->add('test_result', 'Error: ' . Context::getLang('msg_advanced_mailer_subject_is_empty'));
|
||||
|
|
@ -387,7 +387,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->add('test_result', 'Error: ' . Context::getLang('msg_advanced_mailer_url_is_invalid'));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
$oPush = new Rhymix\Framework\Push;
|
||||
|
|
@ -396,7 +396,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$oPush->setContent($content);
|
||||
$oPush->setURL($url);
|
||||
$result = $oPush->send();
|
||||
|
||||
|
||||
if (!$result)
|
||||
{
|
||||
if (count($oPush->getErrors()))
|
||||
|
|
@ -416,7 +416,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer
|
|||
$this->add('test_result', nl2br(htmlspecialchars($e->getMessage())));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$this->add('test_result', Context::getLang('msg_advanced_mailer_test_success_sms'));
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue