From 1af9d5999c1a06b9cd076796b48e24f547700807 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 20 Jun 2023 02:14:46 +0900 Subject: [PATCH] Add option to force all member pages to use the member mid --- modules/member/lang/en.php | 25 +++++++++++----------- modules/member/lang/ko.php | 1 + modules/member/member.admin.controller.php | 3 +++ modules/member/member.class.php | 1 + modules/member/member.view.php | 2 +- modules/member/tpl/default_config.html | 7 +++++- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/modules/member/lang/en.php b/modules/member/lang/en.php index adc090de1..8496234ce 100644 --- a/modules/member/lang/en.php +++ b/modules/member/lang/en.php @@ -51,6 +51,7 @@ $lang->group_image_mark = 'Group image mark'; $lang->group_image_mark_max_width = 'Max Width'; $lang->group_image_mark_max_height = 'Max Height'; $lang->signature_max_height = 'Max Signature Height'; +$lang->cmd_force_member_mid = 'Force'; $lang->enable_join = 'Accept New Members'; $lang->enable_join_only_with_url_key = 'Only with valid URL key'; $lang->enable_join_url_key = 'URL Key'; @@ -147,7 +148,7 @@ $lang->cmd_send_email = 'Send Mail'; $lang->cmd_modify_nickname_log = 'Nickname Change Log'; $lang->cmd_nickname_symbols = 'Allow Symbols in Nickname'; $lang->cmd_nickname_symbols_list = 'Only Allow:'; -$lang->cmd_member_profile_view = 'Show member profile picture'; +$lang->cmd_member_profile_view = 'Show member profile picture'; $lang->cmd_allow_duplicate_nickname = 'Allow Duplicate Nicknames'; $lang->about_allow_duplicate_nickname = 'Allow more than one member to use the same nickname.'; $lang->msg_special_code_incorrect_format = 'The verification code should be a 6-digit number.'; @@ -163,14 +164,14 @@ $lang->msg_find_account_title = 'Account Info'; $lang->msg_find_account_info = 'This is requested account info.'; $lang->msg_find_account_comment = 'Your password will be changed to the one above if you click the link below.
Please change the password again as soon as possible after you are able to log in.
Your password will remain unchanged until you click the link below.'; $lang->msg_confirm_account_title = 'Rhymix Account Activation'; -$lang->title_modify_email_address = 'This letter is sent for a confirmation of the changing e-mail address.'; +$lang->title_modify_email_address = 'This letter is sent for a confirmation of the changing e-mail address.'; $lang->msg_confirm_account_info = 'This is your account information:'; $lang->msg_confirm_account_comment = 'Click on the following link to complete your account activation.'; -$lang->msg_confirm_email_address_change = 'The email address will be modified to %s after clicking below.'; +$lang->msg_confirm_email_address_change = 'The email address will be modified to %s after clicking below.'; $lang->msg_auth_mail_sent = 'The activation mail has been sent to %s. Please check your mail.'; $lang->msg_confirm_mail_sent = 'We have just sent the activation email to %s. Please check your mail.'; -$lang->msg_change_mail_sent = 'The letter was sent to %s for the changing email address. Please, check your email.'; -$lang->msg_invalid_modify_email_auth_key = 'Invalid request for changing the email address.
Please, request again or contact the website administrator.'; +$lang->msg_change_mail_sent = 'The letter was sent to %s for the changing email address. Please, check your email.'; +$lang->msg_invalid_modify_email_auth_key = 'Invalid request for changing the email address.
Please, request again or contact the website administrator.'; $lang->msg_invalid_auth_key = 'This is an invalid request of verification.
Please retry finding account info or contact the administrator.'; $lang->msg_expired_auth_key = 'Your verification link has expired. Please request a new verification email.'; $lang->msg_success_authed = 'Please use the password you received in the email to log in, and change it to a password of your choice as soon as possible.'; @@ -266,10 +267,10 @@ $lang->about_member_default = 'It will be set as the default group on sign up'; $lang->about_find_member_account = 'Please input the email address you have entered during the registration and we will send your account info to this email address.'; $lang->about_ssl_port = 'Please enter if you are using non-default SSL port'; $lang->about_resend_auth_mail = 'You can request the activation email again if you have not received it.'; -$lang->about_reset_auth_mail_submit = 'If you use the address as an identifier, a new email address would be required for the login.'; -$lang->about_update_nickname_log = 'Record the nickname change history. If you use this option, you can see the nickname changing history.'; -$lang->about_nickname_symbols = 'Allow or prohibit the use of special characters in nicknames.'; -$lang->about_member_profile_view = 'Option to view the member\'s profile image on the admin member list page. Select No if you do not want to see your profile picture in the member panel.'; +$lang->about_reset_auth_mail_submit = 'If you use the address as an identifier, a new email address would be required for the login.'; +$lang->about_update_nickname_log = 'Record the nickname change history. If you use this option, you can see the nickname changing history.'; +$lang->about_nickname_symbols = 'Allow or prohibit the use of special characters in nicknames.'; +$lang->about_member_profile_view = 'Option to view the member\'s profile image on the admin member list page. Select No if you do not want to see your profile picture in the member panel.'; $lang->no_article = 'No articles'; $lang->find_account_question = 'Question for a temporary password.'; $lang->find_account_answer = 'Answer for a temporary password.'; @@ -354,7 +355,7 @@ $lang->msg_groups_exist = 'groups exist.'; $lang->cmd_member_config = 'Member Configuration'; $lang->cmd_member_sync = 'Sync member information'; $lang->about_member_sync = 'Synchronize member information and post/comment information. This can take a long time if you have a lot of data. If there are many users, be sure to stop the service before proceeding.'; -$lang->msg_success_modify_email_address = 'Your email address has been successfully changed. You can log in with the changed email address.'; +$lang->msg_success_modify_email_address = 'Your email address has been successfully changed. You can log in with the changed email address.'; $lang->group = 'Group'; $lang->retrieve_password = 'Retrieve password'; @@ -371,7 +372,7 @@ $lang->btn_spammer_delete_all = 'Delete all'; $lang->spammer_move_to_trash = 'Move to trash'; $lang->msg_spammer_complete = 'Completed.'; $lang->nick_name_before_changing = 'Old nickname'; -$lang->nick_name_after_changing = 'New nickname'; +$lang->nick_name_after_changing = 'New nickname'; $lang->cmd_login_browser_info = 'Browser Information'; $lang->cmd_login_device_info = 'Device Information'; @@ -384,4 +385,4 @@ $lang->scrap_folder_create = 'New Folder'; $lang->scrap_folder_rename = 'Rename'; $lang->scrap_folder_delete = 'Delete'; $lang->member_unauthenticated = 'Unauthenticated'; -$lang->member_number = 'Member identification number'; +$lang->member_number = 'Member identification number'; diff --git a/modules/member/lang/ko.php b/modules/member/lang/ko.php index 2e4c51451..65ce4bb53 100644 --- a/modules/member/lang/ko.php +++ b/modules/member/lang/ko.php @@ -51,6 +51,7 @@ $lang->group_image_mark = '그룹 이미지 마크'; $lang->group_image_mark_max_width = '가로 제한 길이'; $lang->group_image_mark_max_height = '세로 제한 길이'; $lang->signature_max_height = '서명 높이 제한'; +$lang->cmd_force_member_mid = '강제 적용'; $lang->enable_join = '회원 가입 허가'; $lang->enable_join_only_with_url_key = 'URL 키가 일치하는 경우에만 허가'; $lang->enable_join_url_key = 'URL 키'; diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 9333315bf..c15b25ab6 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -223,6 +223,7 @@ class MemberAdminController extends Member { $args = Context::gets( 'member_mid', + 'force_mid', 'enable_join', 'enable_join_key', 'enable_confirm', @@ -283,6 +284,8 @@ class MemberAdminController extends Member } } + $args->force_mid = ($args->force_mid === 'Y'); + // Update join key if ($args->enable_join === 'KEY') { diff --git a/modules/member/member.class.php b/modules/member/member.class.php index 0134434c2..f590cdea5 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -38,6 +38,7 @@ class Member extends ModuleObject { $config = MemberModel::getMemberConfig(); $config->mid = 'member'; + $config->force_mid = true; $this->createMid($config->mid); $oModuleController->insertModuleConfig('member', $config); } diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 1f7d50d8b..048422a8d 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -55,7 +55,7 @@ class MemberView extends Member { $this->member_config = MemberModel::getMemberConfig(); } - if (!$this->member_config->mid) + if (!$this->member_config->mid || !$this->member_config->force_mid) { return true; } diff --git a/modules/member/tpl/default_config.html b/modules/member/tpl/default_config.html index 79e327e74..9b33f4d18 100644 --- a/modules/member/tpl/default_config.html +++ b/modules/member/tpl/default_config.html @@ -12,7 +12,12 @@ {$site_module_info->domain}{\RX_BASEURL}index.php?mid= -

{$lang->about_mid}

+   + +

{$lang->about_mid}