Merge branch 'rhymix:master' into master

modules/member/member.controller.php

@@ -1788,7 +1788,10 @@ class MemberController extends Member
 			$chk_args = new stdClass;
 			$chk_args->member_srl = $member_info->member_srl;
 			$output = executeQuery('member.chkAuthMail', $chk_args);
-			if($output->toBool() && $output->data->count != '0') throw new Rhymix\Framework\Exception('msg_user_not_confirmed');
+			if ($output->toBool() && $output->data->count > 0)
+			{
+				throw new Rhymix\Framework\Exception(sprintf('msg_user_not_confirmed', $member_info->email_address));
+			}
 		}
 
 		// Get password reset method

modules/member/member.view.php

@@ -114,6 +114,24 @@ class MemberView extends Member
 		}
 	}
 
+	/**
+	 * Set the browser title for a page belonging to the member menu.
+	 *
+	 * @param string $title
+	 * @return void
+	 */
+	public static function setMemberPageBrowserTitle(string $title): void
+	{
+		$seo_title = config('seo.subpage_title') ?: '$SITE_TITLE - $SUBPAGE_TITLE';
+		$seo_title = Context::replaceUserLang($seo_title);
+		Context::setBrowserTitle($seo_title, array(
+			'site_title' => Context::getSiteTitle(),
+			'site_subtitle' => Context::getSiteSubtitle(),
+			'subpage_title' => $title,
+			'page' => Context::get('page') ?: 1,
+		));
+	}
+
 	/**
 	 * Module index
 	 */
@@ -181,7 +199,7 @@ class MemberView extends Member
 			$member_info->group_list[$key] = Context::replaceUserLang($val, true);
 		}
 
-		Context::addBrowserTitle(lang('cmd_view_member_info'));
+		self::setMemberPageBrowserTitle(lang('cmd_view_member_info'));
 		Context::set('memberInfo', get_object_vars($member_info));
 
 		$extendForm = MemberModel::getCombineJoinForm($member_info);
@@ -376,7 +394,7 @@ class MemberView extends Member
 		$member_config->agreement = $member_config->agreements[1]->content ?? '';
 
 		// Set a template file
-		Context::addBrowserTitle(lang('cmd_signup'));
+		self::setMemberPageBrowserTitle(lang('cmd_signup'));
 		$this->setTemplateFile('signup_form');
 	}
 
@@ -413,7 +431,7 @@ class MemberView extends Member
 			Context::set('identifierValue', $logged_info->user_id);
 		}
 
-		Context::addBrowserTitle(lang('cmd_modify_member_info'));
+		self::setMemberPageBrowserTitle(lang('cmd_modify_member_info'));
 		$this->setTemplateFile('rechecked_password');
 	}
 
@@ -499,7 +517,7 @@ class MemberView extends Member
 		$this->addExtraFormValidatorMessage();
 
 		// Set a template file
-		Context::addBrowserTitle(lang('cmd_modify_member_info'));
+		self::setMemberPageBrowserTitle(lang('cmd_modify_member_info'));
 		$this->setTemplateFile('modify_info');
 	}
 
@@ -550,7 +568,7 @@ class MemberView extends Member
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('document_list...title', 'search_target', 'search_keyword');
 
-		Context::addBrowserTitle(lang('cmd_view_own_document'));
+		self::setMemberPageBrowserTitle(lang('cmd_view_own_document'));
 		$this->setTemplateFile('document_list');
 	}
 
@@ -598,7 +616,7 @@ class MemberView extends Member
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('search_target', 'search_keyword');
 
-		Context::addBrowserTitle(lang('cmd_view_own_comment'));
+		self::setMemberPageBrowserTitle(lang('cmd_view_own_comment'));
 		$this->setTemplateFile('comment_list');
 	}
 
@@ -708,7 +726,7 @@ class MemberView extends Member
 		$security = new Security($output->data);
 		$security->encodeHTML('..nick_name');
 
-		Context::addBrowserTitle(lang('cmd_view_scrapped_document'));
+		self::setMemberPageBrowserTitle(lang('cmd_view_scrapped_document'));
 		$this->setTemplateFile('scrapped_list');
 	}
 
@@ -743,7 +761,7 @@ class MemberView extends Member
 		Context::set('document_list', $output->data);
 		Context::set('page_navigation', $output->page_navigation);
 
-		Context::addBrowserTitle(lang('cmd_view_saved_document'));
+		self::setMemberPageBrowserTitle(lang('cmd_view_saved_document'));
 		$this->setTemplateFile('saved_list');
 	}
 
@@ -783,7 +801,7 @@ class MemberView extends Member
 		$output = executeQueryArray('member.getMemberDevice', $args);
 		Context::set('registered_devices', $output->data);
 
-		Context::addBrowserTitle(lang('cmd_view_active_logins'));
+		self::setMemberPageBrowserTitle(lang('cmd_view_active_logins'));
 		$this->setTemplateFile('active_logins');
 	}
 
@@ -822,7 +840,7 @@ class MemberView extends Member
 		}
 
 		// Set a template file
-		Context::addBrowserTitle(lang('cmd_login'));
+		self::setMemberPageBrowserTitle(lang('cmd_login'));
 		$this->setTemplateFile('login_form');
 	}
 
@@ -858,7 +876,7 @@ class MemberView extends Member
 			Context::set('formValue', $member_info->email_address);
 		}
 		// Set a template file
-		Context::addBrowserTitle(lang('cmd_modify_member_password'));
+		self::setMemberPageBrowserTitle(lang('cmd_modify_member_password'));
 		$this->setTemplateFile('modify_password');
 	}
 
@@ -893,7 +911,7 @@ class MemberView extends Member
 			Context::set('formValue', $member_info->email_address);
 		}
 		// Set a template file
-		Context::addBrowserTitle(lang('msg_leave_member'));
+		self::setMemberPageBrowserTitle(lang('msg_leave_member'));
 		$this->setTemplateFile('leave_form');
 	}
 
@@ -943,7 +961,7 @@ class MemberView extends Member
 		Context::set('identifier', $this->member_config->identifier);
 		Context::set('enable_find_account_question', 'N');
 
-		Context::addBrowserTitle(lang('cmd_find_member_account'));
+		self::setMemberPageBrowserTitle(lang('cmd_find_member_account'));
 		$this->setTemplateFile('find_member_account');
 	}
 
@@ -962,7 +980,7 @@ class MemberView extends Member
 			return;
 		}
 
-		Context::addBrowserTitle(lang('cmd_resend_auth_mail'));
+		self::setMemberPageBrowserTitle(lang('cmd_resend_auth_mail'));
 		$this->setTemplateFile('resend_auth_mail');
 	}
 
@@ -982,7 +1000,7 @@ class MemberView extends Member
 
 		$_SESSION['rechecked_password_step'] = 'INPUT_DATA';
 
-		Context::addBrowserTitle(lang('cmd_modify_member_email_address'));
+		self::setMemberPageBrowserTitle(lang('cmd_modify_member_email_address'));
 		$this->setTemplateFile('modify_email_address');
 	}
 
@@ -1101,7 +1119,7 @@ class MemberView extends Member
 		Context::set('nickname_list', $output->data);
 		Context::set('page_navigation', $output->page_navigation);
 
-		Context::addBrowserTitle(lang('cmd_modify_nickname_log'));
+		self::setMemberPageBrowserTitle(lang('cmd_modify_nickname_log'));
 		$this->setTemplateFile('member_nick');
 	}
 }