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

Merge pull request #476 from bjrambo/pr/ncenterlite-anon-config

Browse source 
알림센터의 닉네임 표시를 익명게시판 설정에 따르도록 개선
This commit is contained in:
BJRambo 2016-05-01 19:48:42 +09:00
commit 0b05de6f80
4 changed files with 6 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,10 +41,6 @@ class ncenterliteAdminController extends ncenterlite
{ {
$config->use = array(); $config->use = array();
} }
if (!$config->anonymous_name)
{
$config->anonymous_name = null;
}
if (!$config->mention_suffixes) if (!$config->mention_suffixes)
{ {
$config->mention_suffixes = array(); $config->mention_suffixes = array();

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

@ -970,36 +970,24 @@ class ncenterliteController extends ncenterlite
function _insertNotify($args, $anonymous = FALSE) function _insertNotify($args, $anonymous = FALSE)
{ {
$oNcenterliteModel = getModel('ncenterlite');
$config = $oNcenterliteModel->getConfig();
// 비회원 노티 제거 // 비회원 노티 제거
if($args->member_srl <= 0) if($args->member_srl <= 0)
{ {
return new Object(); return new Object();
} }
$logged_info = Context::get('logged_info');
if($anonymous == TRUE) if($anonymous == TRUE)
{ {
// 설정에서 익명 이름이 설정되어 있으면 익명 이름을 설정함. 없을 경우 Anonymous 를 사용한다.
if(!$config->anonymous_name)
{
$anonymous_name = 'Anonymous';
}
else
{
$anonymous_name = $config->anonymous_name;
}
// 익명 노티 시 회원정보 제거
$args->target_member_srl = 0; $args->target_member_srl = 0;
$args->target_nick_name = $anonymous_name; $args->target_user_id = $args->target_nick_name;
$args->target_user_id = $anonymous_name; $args->target_email_address = $args->target_nick_name;
$args->target_email_address = $anonymous_name;
} }
else if($logged_info) // 로그인을 했을경우 logged_info 정보를 가져와 검사한다.
else if(Context::get('is_logged'))
{ {
// 익명 노티가 아닐 때 로그인 세션의 회원정보 넣기 $logged_info = Context::get('logged_info');
$args->target_member_srl = $logged_info->member_srl; $args->target_member_srl = $logged_info->member_srl;
$args->target_nick_name = $logged_info->nick_name; $args->target_nick_name = $logged_info->nick_name;
$args->target_user_id = $logged_info->user_id; $args->target_user_id = $logged_info->user_id;

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

@ -34,7 +34,6 @@ class ncenterliteModel extends ncenterlite
if(!$config->skin) $config->skin = 'default'; if(!$config->skin) $config->skin = 'default';
if(!$config->colorset) $config->colorset = 'black'; if(!$config->colorset) $config->colorset = 'black';
if(!$config->zindex) $config->zindex = '9999'; if(!$config->zindex) $config->zindex = '9999';
if(!$config->anonymous_name) $config->anonymous_name = 'Anonymous';
self::$config = $config; self::$config = $config;
} }

8
modules/ncenterlite/tpl/advancedconfig.html
View file

@ -39,14 +39,6 @@
<p class="x_help-block">{$lang->about_mention_suffix_always_cut}</p> <p class="x_help-block">{$lang->about_mention_suffix_always_cut}</p>
</div> </div>
</div> </div>
<div class="x_control-group">
<label class="x_control-label">{$lang->anonymous_nick_name_setting}</label>
<div class="x_controls">
<input type="text" name="anonymous_name" value="{escape($config->anonymous_name, false)}" />
<p class="x_help-block">{$lang->about_anonymous_nick_name}</p>
</div>
</div>
</section> </section>
<div class="x_clearfix btnArea"> <div class="x_clearfix btnArea">
<div class="x_pull-right"> <div class="x_pull-right">