feat(web): add contest only user type

web/app/controllers/add_contest.php

@@ -3,6 +3,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	requirePHPLib('form');
 	
 	if (!isSuperUser($myUser)) {

web/app/controllers/announcements.php

@@ -3,6 +3,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	requirePHPLib('form');
 	
 	function echoBlogCell($blog) {

web/app/controllers/blog_show.php

@@ -3,6 +3,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	if (!validateUInt($_GET['id']) || !($blog = queryBlog($_GET['id']))) {
 		become404Page();
 	}

web/app/controllers/blogs.php

@@ -4,6 +4,10 @@
 	if (!Auth::check()) {
 		become403Page(UOJLocale::get('need login'));
 	}
+
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
 	
 	function echoBlogCell($blog) {
 		echo '<tr>';

web/app/controllers/change_user_info.php

@@ -2,6 +2,11 @@
 	if (!Auth::check()) {
 		redirectToLogin();
 	}
+
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	function handlePost() {
 		global $myUser;
 		if (!isset($_POST['old_password'])) {
@@ -183,4 +188,3 @@
 	});
 </script>
 <?php echoUOJPageFooter() ?>
-

web/app/controllers/contest_inside.php

@@ -18,6 +18,10 @@
 			if ($myUser == null || !hasRegistered(Auth::user(), $contest)) {
 				becomeMsgPage("<h1>比赛正在进行中</h1><p>很遗憾，您尚未报名。比赛结束后再来看吧～</p>");
 			}
+		} else {
+			if (!isNormalUser($myUser)) {
+				become403Page();
+			}
 		}
 	}
 	

web/app/controllers/contest_manage.php

@@ -5,6 +5,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	if (!validateUInt($_GET['id']) || !($contest = queryContest($_GET['id']))) {
 		become404Page();
 	}

web/app/controllers/contest_members.php

@@ -5,6 +5,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	if (!validateUInt($_GET['id']) || !($contest = queryContest($_GET['id']))) {
 		become404Page();
 	}

web/app/controllers/contest_registration.php

@@ -4,6 +4,11 @@
 	if (!validateUInt($_GET['id']) || !($contest = queryContest($_GET['id']))) {
 		become404Page();
 	}
+
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	genMoreContestInfo($contest);
 	
 	if (!Auth::check()) {

web/app/controllers/download.php

@@ -5,6 +5,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	switch ($_GET['type']) {
 		case 'problem':
 			if (!validateUInt($_GET['id']) || !($problem = queryProblemBrief($_GET['id']))) {

web/app/controllers/group.php

@@ -3,6 +3,14 @@
 	requirePHPLib('judger');
 	requirePHPLib('data');
 
+	if (!Auth::check()) {
+		become403Page(UOJLocale::get('need login'));
+	}
+
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	$group_id = $_GET['id'];
 	$group = queryGroup($group_id);
 

web/app/controllers/groups.php

@@ -3,6 +3,14 @@
     requirePHPLib('judger');
     requirePHPLib('data');
 
+	if (!Auth::check()) {
+		become403Page(UOJLocale::get('need login'));
+	}
+
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
     if (isSuperUser($myUser)) {
     	$new_group_form = new UOJForm('new_group');
     	$new_group_form->handle = function() {

web/app/controllers/hack.php

@@ -5,6 +5,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	if (!validateUInt($_GET['id']) || !($hack = queryHack($_GET['id']))) {
 		become404Page();
 	}

web/app/controllers/hack_list.php

@@ -3,6 +3,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	$conds = array();
 
 	$q_problem_id = isset($_GET['problem_id']) && validateUInt($_GET['problem_id']) ? $_GET['problem_id'] : null;

web/app/controllers/index.php

@@ -44,7 +44,7 @@
 	</div>
 </div>
 
-<?php if (Auth::check()): ?>
+<?php if (Auth::check() && isNormalUser($myUser)): ?>
 <div class="row">
 	<div class="col-sm-12 mt-4">
 		<h3><?= UOJLocale::get('top solver') ?></h3>

web/app/controllers/problem.php

@@ -44,6 +44,10 @@
 		if (!isProblemVisibleToUser($problem, $myUser)) {
 			become404Page();
 		}
+
+		if (!isNormalUser($myUser)) {
+			become403Page();
+		}
 	}
 
 	$submission_requirement = json_decode($problem['submission_requirement'], true);

web/app/controllers/problem_data_manage.php

@@ -6,7 +6,11 @@
 	if (!Auth::check()) {
 		become403Page(UOJLocale::get('need login'));
 	}
-	
+
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	if (!validateUInt($_GET['id']) || !($problem = queryProblemBrief($_GET['id']))) {
 		become404Page();
 	}

web/app/controllers/problem_managers_manage.php

@@ -4,6 +4,10 @@
 	if (!Auth::check()) {
 		become403Page(UOJLocale::get('need login'));
 	}
+
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
 	
 	if (!validateUInt($_GET['id']) || !($problem = queryProblemBrief($_GET['id']))) {
 		become404Page();

web/app/controllers/problem_set.php

@@ -6,6 +6,10 @@
 	if (!Auth::check()) {
 		become403Page(UOJLocale::get('need login'));
 	}
+
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
 	
 	if (isSuperUser($myUser) || isProblemManager($myUser) || isProblemUploader($myUser)) {
 		$new_problem_form = new UOJForm('new_problem');

web/app/controllers/problem_statement_manage.php

@@ -5,6 +5,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	if (!validateUInt($_GET['id']) || !($problem = queryProblemBrief($_GET['id']))) {
 		become404Page();
 	}

web/app/controllers/problem_statistics.php

@@ -17,6 +17,10 @@
 		if (!isProblemVisibleToUser($problem, $myUser)) {
 			become404Page();
 		}
+
+		if (!isNormalUser($myUser)) {
+			become403Page();
+		}
 	}
 
 	function scoreDistributionData() {

web/app/controllers/ranklist.php

@@ -3,6 +3,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	if (isset($_GET['type']) && $_GET['type'] == 'accepted') {
 		$config = array('page_len' => 100, 'by_accepted' => true);
 		$title = UOJLocale::get('top solver');

web/app/controllers/submission.php

@@ -19,6 +19,10 @@
 		genMoreContestInfo($contest);
 	} else {
 		$contest = null;
+
+		if (!isNormalUser($myUser)) {
+			become403Page();
+		}
 	}
 	if (!isSubmissionVisibleToUser($submission, $problem, $myUser)) {
 		become403Page();

web/app/controllers/submission_status_details.php

@@ -18,6 +18,9 @@ foreach ($_GET['get'] as $id) {
 	if ($submission['submitter'] !== Auth::id()) {
 		become403Page();
 	}
+	if ($submission['contest_id'] == null && !isNormalUser($myUser)) {
+		become403Page();
+	}
 	
 	$problem = queryProblemBrief($submission['problem_id']);
 	if (!isSubmissionVisibleToUser($submission, $problem, Auth::user())) {

web/app/controllers/submissions_list.php

@@ -3,6 +3,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	$conds = array();
 	
 	$q_problem_id = isset($_GET['problem_id']) && validateUInt($_GET['problem_id']) ? $_GET['problem_id'] : null;

web/app/controllers/super_manage.php

@@ -124,6 +124,7 @@
 		'normaluser' => '设为普通用户',
 		'problem_uploader' => '设为题目上传者',
 		'problem_manager' => '设为题目管理员',
+		'contest_only' => '设为仅比赛参加者',
 		'superuser' => '设为超级用户'
 	);
 	$user_form->addSelect('op_type', $options, '操作类型', '');
@@ -152,6 +153,12 @@
 				$user = addUserType($user, 'problem_manager');
 				DB::update("update user_info set usertype = '{$user['usertype']}' where username = '{$username}'");
 				break;
+			case 'contest_only':
+				DB::update("update user_info set usergroup = 'U' where username = '{$username}'");
+				$user = queryUser($username);
+				$user = addUserType($user, 'contest_only');
+				DB::update("update user_info set usertype = '{$user['usertype']}' where username = '{$username}'");
+				break;
 			case 'superuser':
 				DB::update("update user_info set usergroup = 'S' where username = '{$username}'");
 				break;

web/app/controllers/user_info.php

@@ -3,6 +3,10 @@
 		become403Page(UOJLocale::get('need login'));
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	$username = $_GET['username'];
 
 	$REQUIRE_LIB['github_contribution_graph'] = '';

web/app/controllers/user_msg.php

@@ -3,6 +3,10 @@
 		redirectToLogin();
 	}
 
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	function handleMsgPost() {
 		global $myUser;
 		if (!isset($_POST['receiver'])) {

web/app/controllers/user_system_msg.php

@@ -2,7 +2,11 @@
 	if (!Auth::check()) {
 		redirectToLogin();
 	}
-	
+
+	if (!isNormalUser($myUser)) {
+		become403Page();
+	}
+
 	$header_row = <<<EOD
 <tr>
 	<th>消息</th>

web/app/libs/uoj-utility-lib.php

@@ -129,19 +129,41 @@ function blog_name_decode($name) {
 	return $name;
 }
 
+function addUserType($user, $type) {
+	$usertype = explode(',', $user['usertype']);
+	if (!in_array($type, $usertype)) {
+		$usertype[] = $type;
+	}
+	$user['usertype'] = implode(',', $usertype);
+	return $user;
+}
+function removeUserType($user, $type) {
+	$usertype = explode(',', $user['usertype']);
+	if (in_array($type, $usertype)) {
+		$usertype = array_diff($usertype, array($type));
+	}
+	$user['usertype'] = implode(',', $usertype);
+	return $user;
+}
+function hasUserType($user, $type) {
+	$usertype = explode(',', $user['usertype']);
+	return in_array($type, $usertype);
+}
+
+function isNormalUser($user) {
+	return $user != null && !hasUserType($user, 'contest_only');
+}
 function isProblemUploader($user) {
 	if ($user == null) {
 		return false;
 	}
-	$usertype = explode(',', $user['usertype']);
+	return hasUserType($user, 'problem_uploader');
-	return in_array('problem_uploader', $usertype);
 }
 function isProblemManager($user) {
 	if ($user == null) {
 		return false;
 	}
-	$usertype = explode(',', $user['usertype']);
+	return hasUserType($user, 'problem_manager');
-	return in_array('problem_manager', $usertype);
 }
 
 function isSuperUser($user) {
@@ -194,20 +216,3 @@ function sendSystemMsg($username, $title, $content) {
 	$title = DB::escape($title);
 	DB::insert("insert into user_system_msg (receiver, title, content, send_time) values ('$username', '$title', '$content', now())");
 }
-
-function addUserType($user, $type) {
-	$usertype = explode(',', $user['usertype']);
-	if (!in_array($type, $usertype)) {
-		$usertype[] = $type;		
-	}
-	$user['usertype'] = implode(',', $usertype);
-	return $user;
-}
-function removeUserType($user, $type) {
-	$usertype = explode(',', $user['usertype']);
-	if (in_array($type, $usertype)) {
-		$usertype = array_diff($usertype, array($type));
-	}
-	$user['usertype'] = implode(',', $usertype);
-	return $user;
-}