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

Merge pull request #638 from bjrambo/pr/sms-option

Browse source 
알림센터 옵션 정리.
This commit is contained in:
Johnny 2016-11-22 06:58:31 +09:00 • committed by GitHub
commit 44dfde6060
8 changed files with 129 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/board/board.controller.php
View file

@ -196,8 +196,6 @@ class boardController extends board
$oMail->send();
}
}
}
}

10
modules/ncenterlite/lang/ko.php
View file

@ -17,7 +17,6 @@ $lang->ncenterlite_about_notify_setting = '선택한 모듈에서는 알림을
$lang->ncenterlite_notify_mid_all = '관리자 알림 페이지';
$lang->ncenterlite_about_mid_all = '선택한 모듈에서는 모든 알림이 관리자에게도 전달됩니다.';
$lang->ncenterlite_admin_content = '관리자 알림';
$lang->about_admin_content = '관리자 알림을 받을 모듈은 "모듈별 사용 설정" 페이지에서 선택할 수 있습니다.';
$lang->ncenterlite_read = '읽음 확인';
$lang->ncenterlite_read_y = '읽음';
$lang->ncenterlite_read_n = '읽지 않음';
@ -25,8 +24,8 @@ $lang->ncenterlite_no_target = '대상 없음';
$lang->ncenterlite_my_list = '내 알림 목록';
$lang->ncenterlite_my_settings = '내 알림 설정';
$lang->ncenterlite_user_settings = '사용자 알림 설정';
$lang->ncenterlite_notify_settings = '알림 설정';
$lang->ncenterlite_userconfig_title = '%s님의 알림센터 설정';
$lang->ncenterlite_sms_message_use = 'SMS 문자알림';
$lang->ncenterlite_userconfig_about = '알림센터의 개인의 설정을 저장하도록 합니다.';
$lang->ncenterlite_comment_noti = '댓글 알림';
$lang->ncenterlite_comment_noti_about = '내 게시물의 혹은 내 댓글에 댓글이 달릴경우 알림을 받습니다.';
@ -124,7 +123,12 @@ $lang->about_mention_suffix_always_cut = '\'알림센터님\'이라는 회원과
$lang->mention_limit = '멘션 갯수 제한';
$lang->about_mention_limit = '서버 과부하와 스팸을 방지하기 위해 한 글에서 지나치게 많은 회원들을 호출하지 못하도록 합니다.';
$lang->ncenterlite_msg_setting_error = '설정에 오류가 있습니다. 다시 설정해 주세요.';
$lang->ncenterlite_use_sms_help = '이 옵션을 사용하게 되면 회원들에게 문자메세지 서비스를 이용하여 알림을 보낼 수 있습니다.';
$lang->ncenterlite_use_help = '회원들에게 전송할 알림을 선택할 수 있습니다.';
$lang->ncenterlite_dont_use_push = '푸시 알림은 현재 지원중이 아닙니다.';
$lang->member_phone_variable = '회원전화번호 변수';
$lang->member_phone_variable_about = '회원전화번호 변수를 선택합니다. 회원전화번호 변수가 1개일 경우 설치시 자동으로 설정이 저장됩니다. 이 경우 설정을 할 필요가 없어서 설정을 선택할 수 없습니다.';
$lang->fail_module_install = '모듈설치에 실패하였습니다.';
$lang->cmd_web_notify = '웹 알림';
$lang->cmd_mail_notify = '메일 알림';
$lang->cmd_sms_notify = '문자 알림';
$lang->cmd_push_notify = '푸시 알림';

2
modules/ncenterlite/ncenterlite.admin.controller.php
View file

@ -38,7 +38,7 @@ class ncenterliteAdminController extends ncenterlite
}
}
if ($obj->disp_act == 'dispNcenterliteAdminConfig')
if ($obj->disp_act == 'dispNcenterliteAdminNotifyConfig')
{
if (!$obj->use)
{

5
modules/ncenterlite/ncenterlite.admin.view.php
View file

@ -4,7 +4,7 @@ class ncenterliteAdminView extends ncenterlite
function init()
{
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile(lcfirst(str_replace('dispNcenterliteAdmin', '', $this->act)));
$this->setTemplateFile(strtolower(str_replace('dispNcenterliteAdmin', '', $this->act)));
}
function dispNcenterliteAdminConfig()
@ -22,9 +22,12 @@ class ncenterliteAdminView extends ncenterlite
$sms_available = true;
}
$push_avaliable = false;
$config = $oNcenterliteModel->getConfig();
Context::set('config', $config);
Context::set('sms_available', $sms_available);
Context::set('push_available', $push_avaliable);
}
function dispNcenterliteAdminSeletedmid()

1
modules/ncenterlite/ncenterlite.class.php
View file

@ -45,7 +45,6 @@ class ncenterlite extends ModuleObject
array('document.updateVotedCount', 'ncenterlite', 'controller', 'triggerAfterVotedupdate', 'after'),
array('moduleHandler.init', 'ncenterlite', 'controller', 'triggerAddMemberMenu', 'after'),
array('document.moveDocumentToTrash', 'ncenterlite', 'controller', 'triggerAfterMoveToTrash', 'after'),
array('member.insertMember', 'ncenterlite', 'controller', 'triggerAfterMemberInsert', 'after'),
);
private $delete_triggers = array(

77
modules/ncenterlite/ncenterlite.controller.php
View file

@ -112,6 +112,7 @@ class ncenterliteController extends ncenterlite
}
$args = new stdClass();
$args->config_type = 'mention';
$args->member_srl = $mention_member_srl;
$args->srl = $obj->document_srl;
$args->target_p_srl = $obj->document_srl;
@ -143,6 +144,7 @@ class ncenterliteController extends ncenterlite
}
$args = new stdClass();
$args->config_type = 'admin_content';
$args->member_srl = $admins;
$args->srl = $obj->document_srl;
$args->target_p_srl = $obj->document_srl;
@ -201,6 +203,7 @@ class ncenterliteController extends ncenterlite
continue;
}
$args = new stdClass();
$args->config_type = 'admin_content';
$args->member_srl = $admins;
$args->target_p_srl = $obj->comment_srl;
$args->srl = $obj->document_srl;
@ -243,6 +246,7 @@ class ncenterliteController extends ncenterlite
}
$args = new stdClass();
$args->config_type = 'mention';
$args->member_srl = $mention_member_srl;
$args->target_p_srl = $obj->comment_srl;
$args->srl = $obj->document_srl;
@ -283,6 +287,7 @@ class ncenterliteController extends ncenterlite
if(!in_array(abs($member_srl), $notify_member_srl) && (!$logged_info || ($member_srl != 0 && abs($member_srl) != $logged_info->member_srl)) && $parent_member_config->comment_notify != 'N')
{
$args = new stdClass();
$args->config_type = 'comment_comment';
$args->member_srl = abs($member_srl);
$args->srl = $obj->document_srl;
$args->target_p_srl = $parent_srl;
@ -319,6 +324,7 @@ class ncenterliteController extends ncenterlite
if(!in_array(abs($member_srl), $notify_member_srl) && (!$logged_info || ($member_srl != 0 && abs($member_srl) != $logged_info->member_srl)) && $document_comment_member_config->comment_notify != 'N')
{
$args = new stdClass();
$args->config_type = 'comment';
$args->member_srl = abs($member_srl);
$args->srl = $document_srl;
$args->target_p_srl = $comment_srl;
@ -361,6 +367,7 @@ class ncenterliteController extends ncenterlite
if($message_member_config->message_notify != 'N')
{
$args = new stdClass();
$args->config_type = 'message';
$args->member_srl = $trigger_obj->receiver_srl;
$args->srl = $trigger_obj->related_srl;
$args->target_p_srl = '1';
@ -393,6 +400,7 @@ class ncenterliteController extends ncenterlite
}
$args = new stdClass();
$args->config_type = 'vote';
$args->member_srl = $obj->member_srl;
$args->srl = $obj->document_srl;
$args->target_p_srl = '1';
@ -496,31 +504,6 @@ class ncenterliteController extends ncenterlite
return new Object();
}
function triggerAfterMemberInsert(&$obj)
{
// 관리자가 회원을 추가하는 경우 알림을 발송하지 않는다.
if($obj->is_admin && Context::get('logged_info')->is_admin === 'Y')
{
return new Object();
}
$args = new stdClass();
$args->member_srl = $obj->member_srl;
$args->srl = $obj->member_srl;
$args->target_p_srl = '1';
$args->target_srl = $obj->member_srl;
$args->target_member_srl = $obj->member_srl;
$args->type = $this->_TYPE_INSERT_MEMBER;
$args->target_type = $this->_TYPE_INSERT_MEMBER;
$args->target_summary = lang('cmd_signup');
$args->regdate = date('YmdHis');
$args->notify = $this->_getNotifyId($args);
$args->target_url = getNotEncodedFullUrl('', 'act', 'dispMemberInfo');
$this->_insertNotify($args);
return new Object();
}
function triggerAfterModuleHandlerProc(&$oModule)
{
$vars = Context::getRequestVars();
@ -1102,6 +1085,7 @@ class ncenterliteController extends ncenterlite
}
$this->sendSmsMessage($args);
$this->sendMailMessage($args);
if($output->toBool())
{
@ -1238,18 +1222,24 @@ class ncenterliteController extends ncenterlite
function sendSmsMessage($args)
{
$oNcenterliteModel = getModel('ncenterlite');
$config = $oNcenterliteModel->getConfig();
if(!isset($config->use[$args->config_type]['sms']))
{
return false;
}
$logged_info = Context::get('logged_info');
if($logged_info->member_srl == $args->member_srl)
{
return false;
}
$config = getModel('ncenterlite')->getConfig();
$content = getModel('ncenterlite')->getNotificationText($args);
$content = $oNcenterliteModel->getNotificationText($args);
$content = preg_replace('/<\/?(strong|)[^>]*>/', '', $content);
$sms = getModel('ncenterlite')->getSmsHandler();
$sms = $oNcenterliteModel->getSmsHandler();
if($sms === false)
{
return false;
@ -1278,4 +1268,33 @@ class ncenterliteController extends ncenterlite
return $output;
}
function sendMailMessage($args)
{
$oNcenterliteModel = getModel('ncenterlite');
$config = $oNcenterliteModel->getConfig();
if(!isset($config->use[$args->config_type]['mail']))
{
return false;
}
$logged_info = Context::get('logged_info');
if($logged_info->member_srl == $args->member_srl)
{
return false;
}
$content = $oNcenterliteModel->getNotificationText($args);
$content_cut = preg_replace('/<\/?(strong|)[^>]*>/', '', $content);
$mail_title = cut_str($content_cut, 20);
$member_config = getModel('member')->getMemberConfig();
$member_info = getModel('member')->getMemberInfoByMemberSrl($args->member_srl);
$oMail = new Mail();
$oMail->setTitle($mail_title);
$oMail->setContent($content);
$oMail->setSender($member_config->webmaster_name ?: null, $member_config->webmaster_email);
$oMail->setReceiptor($member_info->email_address, $member_info->email_address);
$oMail->send();
}
}

51
modules/ncenterlite/ncenterlite.model.php
View file

@ -20,6 +20,19 @@ class ncenterliteModel extends ncenterlite
{
$config->use = array('message' => 1);
}
else
{
if(count($config->use) && !is_array(array_first($config->use)))
{
$config->use['mention']['web'] = $config->use['mention'];
$config->use['comment']['web'] = $config->use['comment'];
$config->use['comment_comment']['web'] = $config->use['comment_comment'];
$config->use['vote']['web'] = $config->use['vote'];
$config->use['message']['web'] = $config->use['message'];
$config->use['admin_content']['web'] = $config->use['admin_content'];
getController('module')->insertModuleConfig('ncenterlite', $config);
}
}
if(!$config->display_use) $config->display_use = 'all';
if(!$config->mention_names) $config->mention_names = 'nick_name';
@ -38,7 +51,6 @@ class ncenterliteModel extends ncenterlite
if(!$config->skin) $config->skin = 'default';
if(!$config->colorset) $config->colorset = 'black';
if(!$config->zindex) $config->zindex = '9999';
if(!$config->use_sms) $config->use_sms = 'N';
self::$config = $config;
}
@ -508,37 +520,28 @@ class ncenterliteModel extends ncenterlite
if($oSmsHandler === null)
{
$config = self::getConfig();
if($config->use_sms != 'Y')
$oSmsHandler = new Rhymix\Framework\SMS;
if($oSmsHandler::getDefaultDriver()->getName() === 'Dummy')
{
$oSmsHandler = false;
return $oSmsHandler;
}
else
$variable_name = array();
$member_config = getModel('member')->getMemberConfig();
foreach($member_config->signupForm as $value)
{
$oSmsHandler = new Rhymix\Framework\SMS;
if($oSmsHandler::getDefaultDriver()->getName() === 'Dummy')
if($value->type == 'tel')
{
$oSmsHandler = false;
return $oSmsHandler;
$variable_name[] = $value->name;
}
}
$variable_name = array();
$member_config = getModel('member')->getMemberConfig();
foreach($member_config->signupForm as $value)
{
if($value->type == 'tel')
{
$variable_name[] = $value->name;
}
}
if(empty($variable_name))
{
$oSmsHandler = false;
return $oSmsHandler;
}
if(empty($variable_name))
{
$oSmsHandler = false;
return $oSmsHandler;
}
}

58
modules/ncenterlite/tpl/config.html
View file

@ -9,25 +9,51 @@
<section class="section">
<div class="x_control-group">
<label class="x_control-label">{$lang->ncenterlite_io}</label>
<label class="x_control-label">{$lang->ncenterlite_mention}</label>
<div class="x_controls">
<label for="notify_mention" class="x_inline"><input type="checkbox" name="use[mention]" id="notify_mention" value="1" checked="checked"|cond="isset($config->use['mention'])" /> {$lang->ncenterlite_mention}</label>
<label for="notify_comment" class="x_inline"><input type="checkbox" name="use[comment]" id="notify_comment" value="1" checked="checked"|cond="isset($config->use['comment'])" /> {$lang->ncenterlite_comment}</label>
<label for="notify_comment_comment" class="x_inline"><input type="checkbox" name="use[comment_comment]" id="notify_comment_comment" value="1" checked="checked"|cond="isset($config->use['comment_comment'])" /> {$lang->ncenterlite_comment_comment}</label>
<label for="notify_vote" class="x_inline"><input type="checkbox" name="use[vote]" id="notify_vote" value="1" checked="checked"|cond="isset($config->use['vote'])" /> {$lang->ncenterlite_cmd_vote}</label>
<label for="notify_message" class="x_inline"><input type="checkbox" name="use[message]" id="notify_message" value="1" checked="checked"|cond="isset($config->use['message'])" /> {$lang->ncenterlite_type_message}</label>
<label for="notify_admin_content" class="x_inline"><input type="checkbox" name="use[admin_content]" id="notify_admin_content" value="1" checked="checked"|cond="isset($config->use['admin_content'])" /> {$lang->ncenterlite_admin_content}</label>
<p class="x_help-block">{$lang->about_admin_content}</p>
<label for="mention_web" class="x_inline"><input type="checkbox" name="use[mention][web]" id="mention_web" value="1" checked="checked"|cond="isset($config->use['mention']['web'])" /> {$lang->cmd_web_notify}</label>
<label for="mention_mail" class="x_inline"><input type="checkbox" name="use[mention][mail]" id="mention_mail" value="1" checked="checked"|cond="isset($config->use['mention']['mail'])" /> {$lang->cmd_mail_notify}</label>
<label for="mention_sms" class="x_inline" disabled="disabled"|cond="!$sms_available"><input type="checkbox" name="use[mention][sms]" id="mention_sms" value="1" disabled="disabled"|cond="!$sms_available" checked="checked"|cond="isset($config->use['mention']['sms'])" /> {$lang->cmd_sms_notify}</label>
<label for="mention_push" class="x_inline" disabled="disabled"|cond="!$push_available"><input type="checkbox" name="use[mention][push]" id="mention_push" value="1" disabled="disabled"|cond="!$push_available" checked="checked"|cond="isset($config->use['mention']['push'])" /> {$lang->cmd_push_notify}</label>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="use_sms">{$lang->ncenterlite_sms_message_use}</label>
<label class="x_control-label">{$lang->ncenterlite_comment}</label>
<div class="x_controls">
<select name="use_sms" disabled="disabled"|cond="!$sms_available" id="use_sms">
<option value="Y" selected="selected"|cond="$config->use_sms=='Y' && $sms_available">{$lang->ncenterlite_activate}</option>
<option value="N" selected="selected"|cond="$config->use_sms=='N' || !$sms_available">{$lang->ncenterlite_inactivate}</option>
</select>
<p>{$lang->ncenterlite_use_sms_help}</p>
<label for="comment_web" class="x_inline"><input type="checkbox" name="use[comment][web]" id="comment_web" value="1" checked="checked"|cond="isset($config->use['comment']['web'])" /> {$lang->cmd_web_notify}</label>
<label for="comment_mail" class="x_inline"><input type="checkbox" name="use[comment][mail]" id="comment_mail" value="1" checked="checked"|cond="isset($config->use['comment']['mail'])" /> {$lang->cmd_mail_notify}</label>
<label for="comment_sms" class="x_inline" disabled="disabled"|cond="!$sms_available"><input type="checkbox" name="use[comment][sms]" id="comment_sms" value="1" disabled="disabled"|cond="!$sms_available" checked="checked"|cond="isset($config->use['comment']['sms'])" /> {$lang->cmd_sms_notify}</label>
<label for="comment_push" class="x_inline" disabled="disabled"|cond="!$push_available"><input type="checkbox" name="use[comment][push]" id="comment_push" value="1" disabled="disabled"|cond="!$push_available" checked="checked"|cond="isset($config->use['comment']['push'])" /> {$lang->cmd_push_notify}</label>
</div>
<label class="x_control-label">{$lang->ncenterlite_comment_comment}</label>
<div class="x_controls">
<label for="comment_comment_web" class="x_inline"><input type="checkbox" name="use[comment_comment][web]" id="comment_comment_web" value="1" checked="checked"|cond="isset($config->use['comment_comment']['web'])" /> {$lang->cmd_web_notify}</label>
<label for="comment_comment_mail" class="x_inline"><input type="checkbox" name="use[comment_comment][mail]" id="comment_comment_mail" value="1" checked="checked"|cond="isset($config->use['comment_comment']['mail'])" /> {$lang->cmd_mail_notify}</label>
<label for="comment_comment_sms" class="x_inline" disabled="disabled"|cond="!$sms_available"><input type="checkbox" name="use[comment_comment][sms]" id="comment_comment_sms" value="1" disabled="disabled"|cond="!$sms_available" checked="checked"|cond="isset($config->use['comment_comment']['sms'])" /> {$lang->cmd_sms_notify}</label>
<label for="comment_comment_push" class="x_inline" disabled="disabled"|cond="!$push_available"><input type="checkbox" name="use[comment_comment][push]" id="comment_comment_push" value="1" disabled="disabled"|cond="!$push_available" checked="checked"|cond="isset($config->use['comment_comment']['push'])" /> {$lang->cmd_push_notify}</label>
</div>
<label class="x_control-label">{$lang->ncenterlite_cmd_vote}</label>
<div class="x_controls">
<label for="vote_web" class="x_inline"><input type="checkbox" name="use[vote][web]" id="vote_web" value="1" checked="checked"|cond="isset($config->use['vote']['web'])" /> {$lang->cmd_web_notify}</label>
<label for="vote_mail" class="x_inline"><input type="checkbox" name="use[vote][mail]" id="vote_mail" value="1" checked="checked"|cond="isset($config->use['vote']['mail'])" /> {$lang->cmd_mail_notify}</label>
<label for="vote_sms" class="x_inline" disabled="disabled"|cond="!$sms_available"><input type="checkbox" name="use[vote][sms]" id="vote_sms" value="1" disabled="disabled"|cond="!$sms_available" checked="checked"|cond="isset($config->use['vote']['sms'])" /> {$lang->cmd_sms_notify}</label>
<label for="vote_push" class="x_inline" disabled="disabled"|cond="!$push_available"><input type="checkbox" name="use[vote][push]" id="vote_push" value="1" disabled="disabled"|cond="!$push_available" checked="checked"|cond="isset($config->use['vote']['push'])" /> {$lang->cmd_push_notify}</label>
</div>
<label class="x_control-label">{$lang->ncenterlite_message_noti}</label>
<div class="x_controls">
<label for="message_web" class="x_inline"><input type="checkbox" name="use[message][web]" id="message_web" value="1" checked="checked"|cond="isset($config->use['message']['web'])" /> {$lang->cmd_web_notify}</label>
<label for="message_mail" class="x_inline"><input type="checkbox" name="use[message][mail]" id="message_mail" value="1" checked="checked"|cond="isset($config->use['message']['mail'])" /> {$lang->cmd_mail_notify}</label>
<label for="message_sms" class="x_inline" disabled="disabled"|cond="!$sms_available"><input type="checkbox" name="use[message][sms]" id="message_sms" value="1" disabled="disabled"|cond="!$sms_available" checked="checked"|cond="isset($config->use['message']['sms'])" /> {$lang->cmd_sms_notify}</label>
<label for="message_push" class="x_inline" disabled="disabled"|cond="!$push_available"><input type="checkbox" name="use[message][push]" id="message_push" value="1" disabled="disabled"|cond="!$push_available" checked="checked"|cond="isset($config->use['message']['push'])" /> {$lang->cmd_push_notify}</label>
</div>
<label class="x_control-label">{$lang->ncenterlite_admin_content}</label>
<div class="x_controls">
<label for="admin_content_web" class="x_inline"><input type="checkbox" name="use[admin_content][web]" id="admin_content_web" value="1" checked="checked"|cond="isset($config->use['admin_content']['web'])" /> {$lang->cmd_web_notify}</label>
<label for="admin_content_mail" class="x_inline"><input type="checkbox" name="use[admin_content][mail]" id="admin_content_mail" value="1" checked="checked"|cond="isset($config->use['admin_content']['mail'])" /> {$lang->cmd_mail_notify}</label>
<label for="admin_content_sms" class="x_inline" disabled="disabled"|cond="!$sms_available"><input type="checkbox" name="use[admin_content][sms]" id="admin_content_sms" value="1" disabled="disabled"|cond="!$sms_available" checked="checked"|cond="isset($config->use['admin_content']['sms'])" /> {$lang->cmd_sms_notify}</label>
<label for="admin_content_push" class="x_inline" disabled="disabled"|cond="!$push_available"><input type="checkbox" name="use[admin_content][push]" id="admin_content_push" value="1" disabled="disabled"|cond="!$push_available" checked="checked"|cond="isset($config->use['admin_content']['push'])" /> {$lang->cmd_push_notify}</label>
<p>
<div>{$lang->ncenterlite_use_help}</div>
<div><span class="x_label x_label-important">{$lang->ncenterlite_warning}</span> {$lang->ncenterlite_dont_use_push}</div>
</p>
</div>
</div>
<div class="x_control-group">