fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Intuitive change the name.

Browse source
This commit is contained in:
BJRambo 2017-08-17 09:33:39 +09:00
parent f981e2cd29
commit dcb7b0b321
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ class ncenterliteController extends ncenterlite
return new Object(-1, 'ncenterlite_stop_no_permission_other_user_settings'); return new Object(-1, 'ncenterlite_stop_no_permission_other_user_settings');
} }
$output = $oNcenterliteModel->getMemberConfig($member_srl); $user_config = $oNcenterliteModel->getUserConfig($member_srl);
$obj = Context::getRequestVars(); $obj = Context::getRequestVars();
@ -29,7 +29,7 @@ class ncenterliteController extends ncenterlite
$args->mention_notify = $obj->mention_notify; $args->mention_notify = $obj->mention_notify;
$args->message_notify = $obj->message_notify; $args->message_notify = $obj->message_notify;
if(!$output) if(!$user_config->data)
{ {
$insert_output = executeQuery('ncenterlite.insertUserConfig', $args); $insert_output = executeQuery('ncenterlite.insertUserConfig', $args);
if(!$insert_output->toBool()) if(!$insert_output->toBool())
@ -229,7 +229,7 @@ class ncenterliteController extends ncenterlite
$oCommentModel = getModel('comment'); $oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($parent_srl); $oComment = $oCommentModel->getComment($parent_srl);
$member_srl = $oComment->member_srl; $member_srl = $oComment->member_srl;
$comment_member_config = $oNcenterliteModel->getMemberConfig($member_srl); $comment_member_config = $oNcenterliteModel->getUserConfig($member_srl);
$parent_member_config = $comment_member_config->data; $parent_member_config = $comment_member_config->data;
if(is_array($admin_list) && in_array(abs($member_srl), $admin_list) && isset($config->use['admin_content']) && $admin_comment_notify == true) if(is_array($admin_list) && in_array(abs($member_srl), $admin_list) && isset($config->use['admin_content']) && $admin_comment_notify == true)
{ {
@ -270,7 +270,7 @@ class ncenterliteController extends ncenterlite
{ {
return new Object(); return new Object();
} }
$comment_member_config = $oNcenterliteModel->getMemberConfig($member_srl); $comment_member_config = $oNcenterliteModel->getUserConfig($member_srl);
$document_comment_member_config = $comment_member_config->data; $document_comment_member_config = $comment_member_config->data;
if(!in_array(abs($member_srl), $notify_member_srls) && (!$logged_info || ($member_srl != 0 && abs($member_srl) != $logged_info->member_srl)) && $document_comment_member_config->comment_notify != 'N') if(!in_array(abs($member_srl), $notify_member_srls) && (!$logged_info || ($member_srl != 0 && abs($member_srl) != $logged_info->member_srl)) && $document_comment_member_config->comment_notify != 'N')
@ -313,7 +313,7 @@ class ncenterliteController extends ncenterlite
return new Object(); return new Object();
} }
$messages_member_config = $oNcenterliteModel->getMemberConfig($trigger_obj->receiver_srl); $messages_member_config = $oNcenterliteModel->getUserConfig($trigger_obj->receiver_srl);
$message_member_config = $messages_member_config->data; $message_member_config = $messages_member_config->data;
if($message_member_config->message_notify != 'N') if($message_member_config->message_notify != 'N')
@ -1279,7 +1279,7 @@ class ncenterliteController extends ncenterlite
$notify_member_srls = array(); $notify_member_srls = array();
foreach ($mention_targets as $mention_member_srl) foreach ($mention_targets as $mention_member_srl)
{ {
$target_member_config = $oNcenterliteModel->getMemberConfig($mention_member_srl); $target_member_config = $oNcenterliteModel->getUserConfig($mention_member_srl);
$notify_member_config = $target_member_config->data; $notify_member_config = $target_member_config->data;
if ($notify_member_config->mention_notify == 'N') if ($notify_member_config->mention_notify == 'N')

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

@ -126,7 +126,12 @@ class ncenterliteModel extends ncenterlite
return executeQuery('ncenterlite.insertNotifyType',$args); return executeQuery('ncenterlite.insertNotifyType',$args);
} }
function getMemberConfig($member_srl=null) /**
* @brief Get user notify config.
* @param null $member_srl
* @return object
*/
function getUserConfig($member_srl = null)
{ {
if(!$member_srl) if(!$member_srl)
{ {
@ -137,7 +142,6 @@ class ncenterliteModel extends ncenterlite
$args = new stdClass(); $args = new stdClass();
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
$output = executeQuery('ncenterlite.getUserConfig', $args); $output = executeQuery('ncenterlite.getUserConfig', $args);
if(!$output->data) return $output->data;
return $output; return $output;
} }