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

spammer update

Browse source
This commit is contained in:
Lastorder-DC 2026-02-15 22:28:44 +09:00
parent aba6016986
commit 752b51c78f
7 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/member/member.controller.php
View file

@ -3149,7 +3149,7 @@ class MemberController extends Member
*
* @param bool $deprecated_allow_update_other
*/
function updateMember($args, $deprecated_allow_update_other = FALSE)
function updateMember($args, $deprecated_allow_update_other = FALSE, $manual_updated = FALSE)
{
// Call a trigger (before)
$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
@ -3175,7 +3175,7 @@ class MemberController extends Member
{
unset($args->is_admin);
unset($args->limit_date);
unset($args->description);
if(!$manual_updated) unset($args->description);
if (!$deprecated_allow_update_other)
{
unset($args->denied);
@ -3389,7 +3389,7 @@ class MemberController extends Member
if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
if($logged_info->is_admin !== 'Y')
if($logged_info->is_admin !== 'Y' && !$manual_updated)
{
$args->description = $orgMemberInfo->description;
}

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

@ -14,7 +14,7 @@ $lang->ncenterlite_type_scrap = '스크랩 알림';
$lang->ncenterlite_type_message = '쪽지 알림';
$lang->ncenterlite_type_test = '테스트 알림';
$lang->ncenterlite_type_admin_content = '관리자 알림';
$lang->ncenterlite_type_custom = '기타 알림';
$lang->ncenterlite_type_custom = '글 작성 알림';
$lang->ncenterlite_comment_noti = $lang->ncenterlite_type_comment;
$lang->ncenterlite_comment_comment_noti = $lang->ncenterlite_type_comment_comment;
$lang->ncenterlite_mention_noti = $lang->ncenterlite_type_mention;
@ -45,7 +45,7 @@ $lang->ncenterlite_message_noti_about = '새 쪽지가 도착하면 알림을
$lang->ncenterlite_vote_noti_about = '내 글이나 댓글이 추천을 받으면 알림을 받습니다.';
$lang->ncenterlite_scrap_noti_about = '누군가 내 글을 스크랩하면 알림을 받습니다.';
$lang->ncenterlite_admin_content_noti_about = '관리자 알림을 받습니다.';
$lang->ncenterlite_custom_noti_about = '기타 알림을 받습니다.';
$lang->ncenterlite_custom_noti_about = '팔로우한 회원의 작성 글 알림을 받습니다.(현재 여까/핫산 한정)';
$lang->ncneterlite_block_individual = '개별 문서/댓글 알림 차단';
$lang->ncneterlite_block_individual_about = '개별적으로 문서/댓글을 차단할 수 있습니다.';
$lang->ncenterlite_activate = '사용';

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

@ -75,11 +75,12 @@ class Ncenterlite extends ModuleObject
{
return true;
}
/*
if($oDB->isColumnExists('ncenterlite_user_set','custom_notify'))
{
return true;
}
*/
// Extra data column
if (!$oDB->isColumnExists('ncenterlite_notify', 'data'))
@ -165,11 +166,12 @@ class Ncenterlite extends ModuleObject
{
$oDB->dropColumn('ncenterlite_user_set', 'admin_content_notify');
}
/*
if($oDB->isColumnExists('ncenterlite_user_set','custom_notify'))
{
$oDB->dropColumn('ncenterlite_user_set', 'custom_notify');
}
*/
// Composite index to speed up getNotifyList
if(!$oDB->isIndexExists('ncenterlite_notify', 'idx_member_srl_and_readed'))

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

@ -123,6 +123,7 @@ class NcenterliteModel extends Ncenterlite
'vote' => 0,
'scrap' => 0,
'message' => 0,
'custom' => 0,
);
}

1
modules/ncenterlite/queries/insertUserConfig.xml
View file

@ -10,6 +10,7 @@
<column name="vote_notify" var="vote_notify" notnull="notnull" />
<column name="scrap_notify" var="scrap_notify" notnull="notnull" />
<column name="message_notify" var="message_notify" notnull="notnull" />
<column name="custom_notify" var="custom_notify" notnull="notnull" />
<column name="regdate" var="regdate" default="curdate()" />
</columns>
</query>

1
modules/ncenterlite/queries/updateUserConfig.xml
View file

@ -9,6 +9,7 @@
<column name="vote_notify" var="vote_notify" notnull="notnull" />
<column name="scrap_notify" var="scrap_notify" notnull="notnull" />
<column name="message_notify" var="message_notify" notnull="notnull" />
<column name="custom_notify" var="custom_notify" notnull="notnull" />
<column name="regdate" var="regdate" default="curdate()" />
</columns>
<conditions>

1
modules/ncenterlite/schemas/ncenterlite_user_set.xml
View file

@ -6,5 +6,6 @@
<column name="vote_notify" type="varchar" size="40" notnull="notnull" />
<column name="scrap_notify" type="varchar" size="40" notnull="notnull" />
<column name="message_notify" type="varchar" size="40" notnull="notnull" />
<column name="custom_notify" type="varchar" size="40" notnull="notnull" />
<column name="regdate" type="date" index="idx_regdate" />
</table>