From 1227acf47a4492658e41830c7b3444bebb669896 Mon Sep 17 00:00:00 2001 From: Baoshuo Date: Sun, 23 Oct 2022 20:39:11 +0800 Subject: [PATCH] refactor(web/contest): contest manage v2 and contest confirmation --- web/app/controllers/add_contest.php | 40 +- web/app/controllers/contest_confirmation.php | 77 ++ web/app/controllers/contest_inside.php | 25 +- web/app/controllers/contest_manage.php | 889 +++++++++++++------ web/app/controllers/contest_members.php | 24 +- web/app/controllers/contest_registration.php | 69 +- web/app/controllers/contests.php | 16 +- web/app/controllers/list_edit.php | 2 +- web/app/controllers/problem.php | 24 +- web/app/libs/uoj-contest-lib.php | 1 + web/app/route.php | 3 +- web/js/uoj.js | 2 +- 12 files changed, 842 insertions(+), 330 deletions(-) create mode 100644 web/app/controllers/contest_confirmation.php diff --git a/web/app/controllers/add_contest.php b/web/app/controllers/add_contest.php index c9e8699..11b2e13 100644 --- a/web/app/controllers/add_contest.php +++ b/web/app/controllers/add_contest.php @@ -16,7 +16,23 @@ $time_form = new UOJForm('time'); $time_form->addVInput( 'name', 'text', '比赛标题', 'New Contest', - function($str) { + function($name, &$vdata) { + if ($name == '') { + return '标题不能为空'; + } + + if (strlen($name) > 100) { + return '标题过长'; + } + + $name = HTML::escape($name); + + if ($name === '') { + return '无效编码'; + } + + $vdata['name'] = $name; + return ''; }, null @@ -35,23 +51,25 @@ ); $time_form->addVInput( 'last_min', 'text', '时长（单位：分钟）', 180, - function($str) { - return !validateUInt($str) ? '必须为一个整数' : ''; + function($str, &$vdata) { + if (!validateUInt($str)) { + return '必须为一个整数'; + } + + $vdata['last_min'] = $str; + + return ''; }, null ); $time_form->handle = function(&$vdata) { $start_time_str = $vdata['start_time']->format('Y-m-d H:i:s'); - - $purifier = HTML::purifier_inline(); + $esc_name = DB::escape($vdata['name']); + $esc_last_min = DB::escape($vdata['last_min']); - $esc_name = $_POST['name']; - $esc_name = $purifier->purify($esc_name); - $esc_name = DB::escape($esc_name); - - DB::query("insert into contests (name, start_time, last_min, status) values ('$esc_name', '$start_time_str', ${_POST['last_min']}, 'unfinished')"); + DB::query("insert into contests (name, start_time, last_min, status) values ('$esc_name', '$start_time_str', $esc_last_min, 'unfinished')"); }; - $time_form->succ_href="/contests"; + $time_form->succ_href = "/contests"; $time_form->runAtServer(); ?> diff --git a/web/app/controllers/contest_confirmation.php b/web/app/controllers/contest_confirmation.php new file mode 100644 index 0000000..c72c39a --- /dev/null +++ b/web/app/controllers/contest_confirmation.php @@ -0,0 +1,77 @@ + CONTEST_IN_PROGRESS) { + redirectTo("/contest/{$contest['id']}"); + } + + $confirm_form = new UOJForm('confirm'); + $confirm_form->submit_button_config['class_str'] = 'btn btn-primary'; + $confirm_form->submit_button_config['margin_class'] = 'mt-3'; + $confirm_form->submit_button_config['text'] = '我已核对信息，确认参加比赛'; + $confirm_form->handle = function() use ($myUser, $contest) { + DB::update("update contests_registrants set has_participated = 1 where username = '{$myUser['username']}' and contest_id = {$contest['id']}"); + }; + $confirm_form->succ_href = "/contest/{$contest['id']}"; + $confirm_form->runAtServer(); + ?> + + + +
+
+

确认参赛

+ +

您即将参加比赛 “”，请在正式参赛前仔细核对以下比赛信息：

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
比赛名称
参赛选手
开始时间
结束时间
比赛赛制
+
+ + printHTML() ?> +
+
+ + diff --git a/web/app/controllers/contest_inside.php b/web/app/controllers/contest_inside.php index a66ea91..cc0ccea 100644 --- a/web/app/controllers/contest_inside.php +++ b/web/app/controllers/contest_inside.php @@ -12,21 +12,32 @@ } genMoreContestInfo($contest); - if (!hasContestPermission(Auth::user(), $contest)) { + if (!hasContestPermission($myUser, $contest)) { if ($contest['cur_progress'] == CONTEST_NOT_STARTED) { - header("Location: /contest/{$contest['id']}/register"); - die(); + redirectTo("/contest/{$contest['id']}/register"); } elseif ($contest['cur_progress'] == CONTEST_IN_PROGRESS) { - if ($myUser == null || !hasRegistered(Auth::user(), $contest)) { - becomeMsgPage("

比赛正在进行中

很遗憾，您尚未报名。比赛结束后再来看吧～

"); + if (Auth::check()) { + if (!hasParticipated($myUser, $contest)) { + redirectTo("/contest/{$contest['id']}/confirm"); + } + } else { + redirectToLogin(); } } else { - if (!isNormalUser($myUser)) { + if (!hasRegistered($myUser, $contest) && !isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) { become403Page(); } } + } else { + if ($contest['cur_progress'] == CONTEST_IN_PROGRESS) { + if (hasRegistered($myUser, $contest)) { + if (!hasParticipated($myUser, $contest)) { + redirectTo("/contest/{$contest['id']}/confirm"); + } + } + } } - + if (isset($_GET['tab'])) { $cur_tab = $_GET['tab']; } else { diff --git a/web/app/controllers/contest_manage.php b/web/app/controllers/contest_manage.php index 3a0c36f..d9e60a8 100644 --- a/web/app/controllers/contest_manage.php +++ b/web/app/controllers/contest_manage.php @@ -2,7 +2,8 @@ if (!Auth::check()) { redirectToLogin(); } - + + requireLib('bootstrap5'); requirePHPLib('form'); if (!validateUInt($_GET['id']) || !($contest = queryContest($_GET['id']))) { @@ -10,298 +11,672 @@ } genMoreContestInfo($contest); - if (!isSuperUser($myUser)) { + if (!hasContestPermission($myUser, $contest)) { become403Page(); } - - $time_form = new UOJForm('time'); - $time_form->addInput( - 'name', 'text', '比赛标题', $contest['name'], - function($str) { - return ''; - }, - null - ); - $time_form->addInput( - 'start_time', 'text', '开始时间', $contest['start_time_str'], - function($str, &$vdata) { - try { - $vdata['start_time'] = new DateTime($str); - } catch (Exception $e) { - return '无效时间格式'; - } - return ''; - }, - null - ); - $time_form->addInput( - 'last_min', 'text', '时长（单位：分钟）', $contest['last_min'], - function($str) { - return !validateUInt($str) ? '必须为一个整数' : ''; - }, - null - ); - $time_form->handle = function(&$vdata) { - global $contest; - $start_time_str = $vdata['start_time']->format('Y-m-d H:i:s'); - - $purifier = HTML::purifier_inline(); - - $esc_name = $_POST['name']; - $esc_name = $purifier->purify($esc_name); - $esc_name = DB::escape($esc_name); - - DB::update("update contests set start_time = '$start_time_str', last_min = {$_POST['last_min']}, name = '$esc_name' where id = {$contest['id']}"); - }; - - $managers_form = newAddDelCmdForm('managers', - function($username) { - if (!validateUsername($username) || !queryUser($username)) { - return "不存在名为{$username}的用户"; - } - return ''; - }, - function($type, $username) { - global $contest; - if ($type == '+') { - DB::query("insert into contests_permissions (contest_id, username) values (${contest['id']}, '$username')"); - } elseif ($type == '-') { - DB::query("delete from contests_permissions where contest_id = ${contest['id']} and username = '$username'"); - } - } - ); + if (isset($_GET['tab'])) { + $cur_tab = $_GET['tab']; + } else { + $cur_tab = 'profile'; + } + + $tabs_info = [ + 'profile' => [ + 'name' => '基本信息', + 'url' => "/contest/{$contest['id']}/manage/profile", + ], + 'problems' => [ + 'name' => '试题', + 'url' => "/contest/{$contest['id']}/manage/problems", + ], + 'managers' => [ + 'name' => '管理者', + 'url' => "/contest/{$contest['id']}/manage/managers", + ], + 'others' => [ + 'name' => '其他', + 'url' => "/contest/{$contest['id']}/manage/others", + ], + ]; - $problems_form = newAddDelCmdForm('problems', - function($cmd) { - if (!preg_match('/^(\d+)\s*(\[\S+\])?$/', $cmd, $matches)) { - return "无效题号"; - } - $problem_id = $matches[1]; - if (!validateUInt($problem_id) || !($problem = queryProblemBrief($problem_id))) { - return "不存在题号为{$problem_id}的题"; - } - if (!hasProblemPermission(Auth::user(), $problem)) { - return "无权添加题号为{$problem_id}的题"; - } - return ''; - }, - function($type, $cmd) { - global $contest; - - if (!preg_match('/^(\d+)\s*(\[\S+\])?$/', $cmd, $matches)) { - return "无效题号"; - } - - $problem_id = $matches[1]; - - if ($type == '+') { - $dfn = DB::selectFirst("select max(dfn) from contests_problems where contest_id = {$contest['id']}")['max(dfn)'] + 1; - DB::insert("insert into contests_problems (contest_id, problem_id, dfn) values ({$contest['id']}, '$problem_id', $dfn)"); - } elseif ($type == '-') { - DB::delete("delete from contests_problems where contest_id = {$contest['id']} and problem_id = '$problem_id'"); - } - - if (isset($matches[2])) { - switch ($matches[2]) { - case '[sample]': - unset($contest['extra_config']["problem_$problem_id"]); - break; - case '[full]': - $contest['extra_config']["problem_$problem_id"] = 'full'; - break; - case '[no-details]': - $contest['extra_config']["problem_$problem_id"] = 'no-details'; - break; + if (!isset($tabs_info[$cur_tab])) { + become404Page(); + } + + if ($cur_tab == 'profile') { + $profile_form = new UOJForm('time'); + $profile_form->addVInput( + 'name', 'text', '比赛标题', $contest['name'], + function($name, &$vdata) { + if ($name == '') { + return '标题不能为空'; + } + + if (strlen($name) > 100) { + return '标题过长'; } - $esc_extra_config = json_encode($contest['extra_config']); - $esc_extra_config = DB::escape($esc_extra_config); - DB::update("update contests set extra_config = '$esc_extra_config' where id = {$contest['id']}"); - } - } - ); - if (isSuperUser($myUser)) { - $version_form = new UOJForm('version'); - $version_form->addInput('standings_version', 'text', '排名版本', $contest['extra_config']['standings_version'], - function ($x) { - if (!validateUInt($x) || $x < 1 || $x > 2) { - return '不是合法的版本号'; + $name = HTML::escape($name); + + if ($name === '') { + return '无效编码'; + } + + $vdata['name'] = $name; + + return ''; + }, + null + ); + $profile_form->addVInput( + 'start_time', 'text', '开始时间', $contest['start_time_str'], + function($str, &$vdata) { + try { + $vdata['start_time'] = new DateTime($str); + } catch (Exception $e) { + return '无效时间格式'; } return ''; }, null ); - $version_form->handle = function() { - global $contest; + $profile_form->addVInput( + 'last_min', 'text', '时长（单位：分钟）', $contest['last_min'], + function($str, &$vdata) { + if (!validateUInt($str)) { + return '必须为一个整数'; + } + + $vdata['last_min'] = $str; + + return ''; + }, + null + ); + $profile_form->handle = function(&$vdata) use ($contest) { + $start_time_str = $vdata['start_time']->format('Y-m-d H:i:s'); + $esc_name = DB::escape($vdata['name']); + $esc_last_min = DB::escape($vdata['last_min']); + + DB::update("update contests set start_time = '$start_time_str', last_min = {$_POST['last_min']}, name = '$esc_name' where id = {$contest['id']}"); + + dieWithJsonData(['status' => 'success', 'message' => '修改成功']); + }; + $profile_form->setAjaxSubmit(<<runAtServer(); + } elseif ($cur_tab == 'problems') { + if (isset($_POST['submit-remove_problem']) && $_POST['submit-remove_problem'] == 'remove_problem') { + $problem_id = $_POST['problem_id']; + + if (!validateUInt($problem_id)) { + dieWithAlert('无效的题目 ID。'); + } + + if (!queryProblemBrief($problem_id)) { + dieWithAlert('题目不存在。'); + } + + if (!DB::selectFirst("SELECT * FROM contests_problems WHERE contest_id = {$contest['id']} AND problem_id = $problem_id")) { + dieWithAlert('题目不在比赛中。'); + } + + DB::delete("DELETE FROM contests_problems WHERE contest_id = {$contest['id']} AND problem_id = $problem_id"); + + unset($contest['extra_config']["problem_$problem_id"]); + $esc_extra_config = DB::escape(json_encode($contest['extra_config'])); + DB::update("UPDATE `contests` SET extra_config = '$esc_extra_config' WHERE id = {$contest['id']}"); + + dieWithAlert('移除成功！'); + } + + $add_problem_form = new UOJForm('add_problem'); + $add_problem_form->addVInput('problem_id', 'text', '题目 ID', '', + function($problem_id, &$vdata) { + if (!validateUInt($problem_id)) { + return '无效的题目 ID。'; + } + + $problem = queryProblemBrief($problem_id); + if (!$problem) { + return '题目不存在。'; + } + + if (!hasProblemPermission(Auth::user(), $problem)) { + return "无权添加题目 #$problem_id。"; + } + + $vdata['problem_id'] = $problem_id; + + return ''; + }, + null + ); + $add_problem_form->addVSelect('judge_config', [ + 'sample' => '只测样例', + 'no-details' => '测试全部数据，但不显示测试点详情', + 'full' => '测试全部数据', + ], '评测设置', 'sample'); + $add_problem_form->handle = function(&$vdata) use ($contest) { + $dfn = DB::selectFirst("SELECT max(dfn) FROM contests_problems WHERE contest_id = {$contest['id']}")['max(dfn)'] + 1; + DB::insert("INSERT INTO `contests_problems` (contest_id, problem_id, dfn) VALUES ({$contest['id']}, '{$vdata['problem_id']}', $dfn)"); + + if ($_POST['judge_config'] != 'sample') { + $contest['extra_config']["problem_$problem_id"] = $_POST['judge_config']; + $esc_extra_config = DB::escape(json_encode($contest['extra_config'])); + DB::update("UPDATE `contests` SET extra_config = '$esc_extra_config' WHERE id = {$contest['id']}"); + } + + dieWithJsonData(['status' => 'success', 'message' => "题目 #{$vdata['problem_id']} 添加成功！"]); + }; + $add_problem_form->submit_button_config['text'] = '添加'; + $add_problem_form->submit_button_config['margin_class'] = 'mt-3'; + $add_problem_form->setAjaxSubmit(<<runAtServer(); + } elseif ($cur_tab == 'managers') { + if (isset($_POST['submit-remove_manager']) && $_POST['submit-remove_manager'] == 'remove_manager') { + $username = $_POST['username']; + + if (!validateUsername($username)) { + dieWithAlert('用户名不合法。'); + } + + if (!queryUser($username)) { + dieWithAlert('用户不存在。'); + } + + if (!DB::selectFirst("SELECT * FROM contests_permissions WHERE contest_id = {$contest['id']} AND username = '$username'")) { + dieWithAlert('用户不是这场比赛的管理员。'); + } + + DB::delete("DELETE FROM `contests_permissions` WHERE contest_id = ${contest['id']} AND username = '$username'"); + dieWithAlert('移除成功！'); + } + + $add_manager_form = new UOJForm('add_manager'); + $add_manager_form->addVInput('username', 'text', '用户名', '', + function($username, &$vdata) { + if (!validateUsername($username)) { + return '用户名不合法'; + } + + if (!queryUser($username)) { + return '用户不存在'; + } + + if (DB::selectFirst("SELECT * FROM contests_permissions WHERE contest_id = {$contest['id']} AND username = '$username'")) { + return '用户已经是这场比赛的管理员'; + } + + $vdata['username'] = $username; + + return ''; + }, + null + ); + $add_manager_form->handle = function(&$vdata) use ($contest) { + DB::query("INSERT INTO `contests_permissions` (contest_id, username) VALUES (${contest['id']}, '{$vdata['username']}')"); + + dieWithJsonData(['status' => 'success', 'message' => '已将用户名为 ' . $vdata['username'] . ' 的用户设置为本场比赛的管理者。']); + }; + $add_manager_form->submit_button_config['text'] = '添加'; + $add_manager_form->submit_button_config['margin_class'] = 'mt-3'; + $add_manager_form->setAjaxSubmit(<<runAtServer(); + } elseif ($cur_tab == 'others') { + $version_form = new UOJForm('version'); + $version_form->addVSelect('standings_version', [ + '1' => '1', + '2' => '2', + ], '比赛排名版本', $contest['extra_config']['standings_version']); + $version_form->handle = function() use ($contest) { $contest['extra_config']['standings_version'] = $_POST['standings_version']; $esc_extra_config = json_encode($contest['extra_config']); $esc_extra_config = DB::escape($esc_extra_config); - DB::update("update contests set extra_config = '$esc_extra_config' where id = {$contest['id']}"); + DB::update("UPDATE contests SET extra_config = '$esc_extra_config' WHERE id = {$contest['id']}"); + + dieWithJsonData(['status' => 'success', 'message' => '修改成功']); }; + $version_form->setAjaxSubmit(<<runAtServer(); $contest_type_form = new UOJForm('contest_type'); - $contest_type_form->addInput('contest_type', 'text', '赛制', $contest['extra_config']['contest_type'], - function ($x) { - if ($x != 'OI' && $x != 'ACM' && $x != 'IOI') { - return '不是合法的赛制名'; + $contest_type_form->addVSelect('contest_type', [ + 'OI' => 'OI', + 'IOI' => 'IOI' + ], '比赛类型', $contest['extra_config']['contest_type']); + $contest_type_form->handle = function() use ($contest) { + $contest['extra_config']['contest_type'] = $_POST['contest_type']; + $esc_extra_config = json_encode($contest['extra_config']); + $esc_extra_config = DB::escape($esc_extra_config); + DB::update("UPDATE contests set extra_config = '$esc_extra_config' where id = {$contest['id']}"); + + dieWithJsonData(['status' => 'success', 'message' => '修改成功']); + }; + $contest_type_form->setAjaxSubmit(<<runAtServer(); + + $blog_link_contests = new UOJForm('blog_link_contests'); + $blog_link_contests->addVInput('blog_id', 'text', '博客 ID', '', + function ($blog_id, &$vdata) { + if (!validateUInt($blog_id)) { + return 'ID 不合法'; } + + if (!queryBlog($blog_id)) { + return '博客不存在'; + } + + $vdata['blog_id'] = $blog_id; + return ''; }, null ); - $contest_type_form->handle = function() { - global $contest; - $contest['extra_config']['contest_type'] = $_POST['contest_type']; - $esc_extra_config = json_encode($contest['extra_config']); - $esc_extra_config = DB::escape($esc_extra_config); - DB::update("update contests set extra_config = '$esc_extra_config' where id = {$contest['id']}"); - }; - $contest_type_form->runAtServer(); - } - - $time_form->runAtServer(); - $managers_form->runAtServer(); - $problems_form->runAtServer(); + $blog_link_contests->addVInput('title', 'text', '名称', '', + function($title, &$vdata) { + if ($title == '') { + return '名称不能为空'; + } + + if (strlen($title) > 40) { + return '名称过长'; + } - $blog_link_contests = new UOJForm('blog_link_contests'); - $blog_link_contests->addInput('blog_link_contests__blog_id', 'text', '博客ID', '', - function ($x) { - if (!validateUInt($x)) { - return 'ID不合法'; - } - if (!queryBlog($x)) { - return '博客不存在'; - } - return ''; - }, - null - ); - $blog_link_contests->addInput('blog_link_contests__title', 'text', '标题', '', - function ($x) { - return ''; - }, - null - ); - $options = array( - 'add' => '添加', - 'del' => '删除' - ); - $blog_link_contests->addSelect('blog_link_contests__op-type', $options, '操作类型', ''); - $blog_link_contests->handle = function() { - global $contest; + $title = HTML::escape($title); + if ($title === '') { + return '无效编码'; + } - $blog_id = $_POST['blog_link_contests__blog_id']; - $contest_id = $contest['id']; - $str = DB::selectFirst("select * from contests where id='${contest_id}'"); - $all_config = json_decode($str['extra_config'], true); - $config = $all_config['links']; + $vdata['title'] = $title; - $n = count($config); - - if ($_POST['blog_link_contests__op-type'] == 'add') { - $row = array(); - $row[0] = $_POST['blog_link_contests__title']; - $row[1] = $blog_id; - $config[$n] = $row; - } - if ($_POST['blog_link_contests__op-type'] == 'del') { - for ($i = 0; $i < $n; $i++) { - if ($config[$i][1] == $blog_id) { - $config[$i] = $config[$n - 1]; - unset($config[$n - 1]); - break; + return ''; + }, + null + ); + $blog_link_contests->addVSelect('op_type', [ + 'add' => '添加', + 'del' => '移除', + ], '操作类型', ''); + $blog_link_contests->handle = function($vdata) use ($contest) { + if ($_POST['op_type'] == 'add') { + if (!isset($contest['extra_config']['links'])) { + $contest['extra_config']['links'] = []; + } + + $contest['extra_config']['links'][] = [$vdata['title'], $vdata['blog_id']]; + } elseif ($_POST['op_type'] == 'del') { + $n = count($contest['extra_config']['links']); + for ($i = 0; $i < $n; $i++) { + if ($contest['extra_config']['links'][$i][1] == $vdata['blog_id']) { + $contest['extra_config']['links'][$i] = $contest['extra_config']['links'][$n - 1]; + unset($contest['extra_config']['links'][$n - 1]); + break; + } + } + + if (!count($contest['extra_config']['links'])) { + unset($contest['extra_config']['links']); } } - } + + $esc_extra_config = json_encode($contest['extra_config']); + $esc_extra_config = DB::escape($esc_extra_config); + DB::update("UPDATE contests set extra_config = '$esc_extra_config' where id = {$contest['id']}"); - $all_config['links'] = $config; - $str = json_encode($all_config); - $str = DB::escape($str); - DB::query("update contests set extra_config='${str}' where id='${contest_id}'"); - }; - $blog_link_contests->runAtServer(); - - ?> - -

管理

- -
-
- printHTML(); ?> -
- -
- - - - - - - - -', '', '', ''; + dieWithJsonData(['status' => 'success', 'message' => '修改成功']); + }; + $blog_link_contests->setAjaxSubmit(<< - -
#用户名
', $row_id, '', getUserLink($row['username']), '
-

命令格式：命令一行一个，+mike表示把mike加入管理者，-mike表示把mike从管理者中移除

- printHTML(); ?> -
- -
- - - - - - - - -', '', '', ''; + + $(window).scrollTop(0); +} +EOD); + $blog_link_contests->runAtServer(); } + ?> - -
#试题名
', $problem['id'], '', getProblemLink($problem), ' ', "[$problem_config_str]", '
-

命令格式：命令一行一个，+233表示把题号为233的试题加入比赛，-233表示把题号为233的试题从比赛中移除

- printHTML(); ?> + +

+ + (ID: ) + 管理 +

+ +
+ +
+ + + +"> + 返回 + + +
+ + + +
+ + +
+
+ +
+
+ printHTML(); ?> +
+
+
注意事项
+
    +
  • 请为选手预留合理的做题时间。一般而言，CSP 和 NOIP 的比赛时长为 4 小时，省选 / NOI 的比赛时长为 5 小时。
    • +
+
-
- printHTML(); ?> +
+
+ +
+
+
- -
-
-
-

版本控制

- printHTML(); ?> -
-
-

赛制

- printHTML(); ?> +
+
+ + ID + 标题 + 评测设置 + 操作 + +EOD, + function($row) { + $problem = queryProblemBrief($row['problem_id']); + echo ''; + echo '', $row['problem_id'], ''; + echo '', getProblemLink($problem), ''; + echo '', isset($contest['extra_config']["problem_{$problem['id']}"]) ? $contest['extra_config']["problem_{$problem['id']}"] : 'sample', ''; + echo ''; + echo '
'; + echo ''; + echo ''; + echo ''; + echo '
'; + echo ''; + echo ''; + }, + [ + 'echo_full' => true, + 'div_classes' => ['table-responsive'], + 'table_classes' => ['table', 'align-middle'], + ] + ) + ?> +
+
+ +
+
+ printHTML() ?> +
+
+
注意事项
+
    +
  • 推荐在比赛结束前将题目设置为隐藏。
    • +
  • 对于「评测设置」选项，一般情况下保持默认（即只测样例）即可。
    • +
+
-
+ +
+
+ +
+
+
+ + 用户名 + 操作 + + EOD, + function ($row) { + echo ''; + echo '', getUserLink($row['username']), ''; + echo ''; + echo '
'; + echo ''; + echo ''; + echo ''; + echo '
'; + echo ''; + echo ''; + }, + [ + 'echo_full' => true, + 'div_classes' => ['table-responsive'], + 'table_classes' => ['table'], + ] + ); + ?> +
+
+ +
+
+ printHTML(); ?> +
+
+
注意事项
+
    +
  • 添加管理者前请确认用户名是否正确以免带来不必要的麻烦。
    • +
  • 比赛管理者如果报名了比赛仍可以正常参赛，但不报名比赛也可以查看并管理本场比赛。
    • +
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+
+ printHTML(); ?> +
+
+
注意事项
+
    +
  • 目前 S2OJ 支持 OI 和 IOI 赛制。
    • +
+
+
+
+
+ +
+
+ printHTML(); ?> +
+
+
注意事项
+
    +
  • 正常情况下无需调整此项设置。
    • +
+
+
+
+
+ +
+
+ printHTML(); ?> +
+
+
注意事项
+
    +
  • 添加比赛资料前请确认博客是否处于公开状态。
    • +
+
+
+
+
+
+
+ +
+ +
+ diff --git a/web/app/controllers/contest_members.php b/web/app/controllers/contest_members.php index e8d4e09..3689f99 100644 --- a/web/app/controllers/contest_members.php +++ b/web/app/controllers/contest_members.php @@ -183,7 +183,7 @@
- 已报名 + 已报名
printHTML(); ?> @@ -199,16 +199,6 @@ $header_row = '#'.UOJLocale::get('username').''; if ($show_ip) { $header_row .= 'remote_addrhttp_x_forwarded_for'; - - $ip_owner = array(); - $forwarded_ip_owner = array(); - $has_participated = array(); - foreach (DB::selectAll("select * from contests_registrants where contest_id = {$contest['id']} order by username desc") as $reg) { - $user = queryUser($reg['username']); - $ip_owner[$user['remote_addr']] = $reg['username']; - $forwarded_ip_owner[$user['http_x_forwarded_for']] = $reg['username']; - $has_participated[$reg['username']] = $reg['has_participated']; - } } if ($has_contest_permission) { $header_row .= '是否参赛'; @@ -221,18 +211,10 @@ "contest_id = {$contest['id']}", 'order by username desc', $header_row, - function($contestant, $num) use ($myUser, $has_contest_permission, $show_ip, $ip_owner, $has_participated) { + function($contestant, $num) use ($myUser, $has_contest_permission, $show_ip, $has_participated) { $user = queryUser($contestant['username']); - if (!$show_ip) { - echo ''; - } else { - if ($ip_owner[$user['remote_addr']] != $user['username'] || $forwarded_ip_owner[$user['http_x_forwarded_for']] != $user['username']) { - echo ''; - } else { - echo ''; - } - } + echo ''; echo ''.$num.''; echo ''.getUserLink($contestant['username']).''; if ($show_ip) { diff --git a/web/app/controllers/contest_registration.php b/web/app/controllers/contest_registration.php index 66f2a9d..3203cb7 100644 --- a/web/app/controllers/contest_registration.php +++ b/web/app/controllers/contest_registration.php @@ -1,42 +1,73 @@ CONTEST_IN_PROGRESS) { + redirectTo("/contest/{$contest['id']}"); } $register_form = new UOJForm('register'); - $register_form->handle = function() { - global $myUser, $contest; + $register_form->handle = function() use ($myUser, $contest) { DB::query("replace into contests_registrants (username, contest_id, has_participated) values ('{$myUser['username']}', {$contest['id']}, 0)"); + updateContestPlayerNum($contest); }; $register_form->submit_button_config['class_str'] = 'btn btn-primary'; - $register_form->submit_button_config['text'] = '报名比赛'; - $register_form->succ_href = "/contests"; + $register_form->submit_button_config['text'] = '我已阅读规则，确认报名比赛'; + + if ($contest['cur_progress'] == CONTEST_IN_PROGRESS) { + $register_form->succ_href = "/contest/{$contest['id']}/confirm"; + } else { + $register_form->succ_href = "/contests"; + } $register_form->runAtServer(); ?> - -

比赛规则

-
    -
  • 比赛报名后不算正式参赛，报名后进了比赛页面也不算参赛，看了题目才算正式参赛。
    • -
  • 比赛中途可以提交，若同一题有多次提交按最后一次不是 Compile Error 的提交算成绩。（其实UOJ会自动无视你所有 Compile Error 的提交）
    • -
  • 比赛中途提交后，可以看到测样例的结果。（若为提交答案题则对于每个测试点，该测试点有分则该测试点为满分）
    • -
  • 比赛结束后会进行最终测试，最终测试后的排名为最终排名。
    • -
  • 比赛排名按分数为第一关键字，完成题目的总时间为第二关键字。完成题目的总时间等于完成每道题所花时间之和（无视掉爆零的题目）。
    • -
  • 请遵守比赛规则，一位选手在一场比赛内不得报名多个账号，选手之间不能交流或者抄袭代码，如果被检测到将以 0 分处理或者封禁。
    • -
-printHTML(); ?> + + +
+
+

比赛规则

+ +

您即将报名比赛 “”，请在报名前仔细阅读以下比赛规则：

+ +
    + +
  • 本场比赛正在进行中，将于 结束。
    • + +
  • 本场比赛将于 开始，并于 结束。
    • + +
  • 比赛开始后点击 “确认参赛” 按钮才会被视为正式参赛，未正式参赛的选手不会显示在排行榜上。
    • + +
  • 本场比赛为 OI 赛制。比赛中途可以提交代码，但 只显示测样例的结果。
    • + +
  • 本场比赛为 IOI 赛制。比赛时的提交会测试题目的全部数据，但无法查看数据点详情。
    • + +
  • 若选手在比赛中多次提交了同一题，则最后按照 最后一次不是 Compile Error 的提交 计算排行。
    • +
  • 比赛结束后会进行最终测试，最终测试后的排名为最终排名。
    • +
  • 比赛排名按分数为第一关键字，完成题目的总时间为第二关键字。完成题目的总时间等于完成每道题所花时间之和（无视掉爆零的题目）。
    • +
  • 请遵守比赛规则，一位选手在一场比赛内不得报名多个账号，选手之间不能交流或者抄袭代码，如果被检测到将以 0 分处理或者封禁。
    • +
+ + printHTML() ?> +
+
+ diff --git a/web/app/controllers/contests.php b/web/app/controllers/contests.php index cd80ef5..aa8e348 100644 --- a/web/app/controllers/contests.php +++ b/web/app/controllers/contests.php @@ -24,18 +24,22 @@ EOD; $rest_second = $cur_rest_second; } if ($myUser != null && hasRegistered($myUser, $contest)) { - $contest_name_link .= ''.UOJLocale::get('contests::registered').''; + $contest_name_link .= ''.UOJLocale::get('contests::registered').''; } else { - $contest_name_link .= ''.UOJLocale::get('contests::register').''; + $contest_name_link .= ''.UOJLocale::get('contests::register').''; } } elseif ($contest['cur_progress'] == CONTEST_IN_PROGRESS) { - $contest_name_link .= ''.UOJLocale::get('contests::in progress').''; + if (hasRegistered($myUser, $contest)) { + $contest_name_link .= ''.UOJLocale::get('contests::in progress').''; + } else { + $contest_name_link .= ''.UOJLocale::get('contests::in progress').''; + } } elseif ($contest['cur_progress'] == CONTEST_PENDING_FINAL_TEST) { - $contest_name_link .= ''.UOJLocale::get('contests::pending final test').''; + $contest_name_link .= ''.UOJLocale::get('contests::pending final test').''; } elseif ($contest['cur_progress'] == CONTEST_TESTING) { - $contest_name_link .= ''.UOJLocale::get('contests::final testing').''; + $contest_name_link .= ''.UOJLocale::get('contests::final testing').''; } elseif ($contest['cur_progress'] == CONTEST_FINISHED) { - $contest_name_link .= ''.UOJLocale::get('contests::ended').''; + $contest_name_link .= ''.UOJLocale::get('contests::ended').''; } $last_hour = round($contest['last_min'] / 60, 2); diff --git a/web/app/controllers/list_edit.php b/web/app/controllers/list_edit.php index 0f79cd5..8e9899d 100644 --- a/web/app/controllers/list_edit.php +++ b/web/app/controllers/list_edit.php @@ -407,7 +407,7 @@ EOD, echo ''; echo '', $row['id'], ''; - echo '', '', $row['title'], ''; + echo '', getProblemLink($row); if ($row['is_hidden']) { echo ' ', UOJLocale::get('hidden'), ' '; } diff --git a/web/app/controllers/problem.php b/web/app/controllers/problem.php index 98939f4..625a148 100644 --- a/web/app/controllers/problem.php +++ b/web/app/controllers/problem.php @@ -33,19 +33,31 @@ if ($contest['cur_progress'] == CONTEST_NOT_STARTED) { become404Page(); } elseif ($contest['cur_progress'] == CONTEST_IN_PROGRESS) { - if ($myUser == null || !hasRegistered($myUser, $contest)) { - becomeMsgPage("

比赛正在进行中

很遗憾，您尚未报名。比赛结束后再来看吧～

"); + if (Auth::check()) { + if (hasParticipated($myUser, $contest)) { + $is_in_contest = true; + } else { + redirectTo("/contest/{$contest['id']}/confirm"); + } } else { - $is_in_contest = true; - DB::update("update contests_registrants set has_participated = 1 where username = '{$myUser['username']}' and contest_id = {$contest['id']}"); + redirectToLogin(); } } else { $ban_in_contest = !isProblemVisibleToUser($problem, $myUser); + + if (!hasRegistered($myUser, $contest) && !isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) { + become403Page(); + } } } else { if ($contest['cur_progress'] == CONTEST_IN_PROGRESS) { - $is_in_contest = true; - DB::update("update contests_registrants set has_participated = 1 where username = '{$myUser['username']}' and contest_id = {$contest['id']}"); + if (hasRegistered($myUser, $contest)) { + if (hasParticipated($myUser, $contest)) { + $is_in_contest = true; + } else { + redirectTo("/contest/{$contest['id']}/confirm"); + } + } } } } else { diff --git a/web/app/libs/uoj-contest-lib.php b/web/app/libs/uoj-contest-lib.php index d2115b6..c884522 100644 --- a/web/app/libs/uoj-contest-lib.php +++ b/web/app/libs/uoj-contest-lib.php @@ -10,6 +10,7 @@ function genMoreContestInfo(&$contest) { $contest['start_time'] = new DateTime($contest['start_time']); $contest['end_time'] = clone $contest['start_time']; $contest['end_time']->add(new DateInterval("PT${contest['last_min']}M")); + $contest['end_time_str'] = $contest['end_time']->format('Y-m-d H:i:s'); if ($contest['status'] == 'unfinished') { if (UOJTime::$time_now < $contest['start_time']) { diff --git a/web/app/route.php b/web/app/route.php index b140d0c..59216bf 100644 --- a/web/app/route.php +++ b/web/app/route.php @@ -31,7 +31,8 @@ Route::group([ Route::any('/contest/{id}', '/contest_inside.php'); Route::any('/contest/{id}/registrants', '/contest_members.php'); Route::any('/contest/{id}/register', '/contest_registration.php'); - Route::any('/contest/{id}/manage', '/contest_manage.php'); + Route::any('/contest/{id}/confirm', '/contest_confirmation.php'); + Route::any('/contest/{id}/manage(?:/{tab})?', '/contest_manage.php'); Route::any('/contest/{id}/submissions', '/contest_inside.php?tab=submissions'); Route::any('/contest/{id}/standings', '/contest_inside.php?tab=standings'); Route::any('/contest/{id}/after_contest_standings', '/contest_inside.php?tab=after_contest_standings'); diff --git a/web/js/uoj.js b/web/js/uoj.js index 86d2860..087f661 100644 --- a/web/js/uoj.js +++ b/web/js/uoj.js @@ -1144,7 +1144,7 @@ function showStandings(config) { var col_tr = ''; col_tr += '' + row[3] + ''; col_tr += '' + getUserLink(row[2][0], row[2][1]) + ''; - col_tr += '' + '
' + row[0] + '
' + '
' + (row[1] == 0 ? '(未提交)' : getPenaltyTimeStr(row[1])) + '
'; + col_tr += '' + '
' + row[0] + '
' + '
' + getPenaltyTimeStr(row[1]) + '
'; for (var i = 0; i < problems.length; i++) { col_tr += ''; col = score[row[2][0]][i];