From 410631075eba7e7b73fc6aa292e2de3234bad439 Mon Sep 17 00:00:00 2001 From: Baoshuo Date: Sun, 18 Sep 2022 12:58:35 +0800 Subject: [PATCH] fix: style --- web/app/controllers/add_contest.php | 6 +- web/app/controllers/announcements.php | 2 +- web/app/controllers/blog_show.php | 2 +- web/app/controllers/blogs.php | 2 +- web/app/controllers/change_user_info.php | 4 +- web/app/controllers/click_zan.php | 2 +- web/app/controllers/contest_inside.php | 54 ++++++------ web/app/controllers/contest_manage.php | 10 +-- web/app/controllers/contest_members.php | 88 +++++++++---------- web/app/controllers/contest_registration.php | 2 +- web/app/controllers/contests.php | 32 +++---- web/app/controllers/download.php | 2 +- web/app/controllers/faq.php | 2 +- web/app/controllers/forgot_pw.php | 2 +- web/app/controllers/group.php | 28 +++--- web/app/controllers/groups.php | 50 +++++------ web/app/controllers/hack.php | 4 +- web/app/controllers/hack_list.php | 6 +- web/app/controllers/index.php | 16 ++-- web/app/controllers/judge/download.php | 2 +- web/app/controllers/judge/submit.php | 2 +- .../controllers/judge/sync_judge_client.php | 2 +- web/app/controllers/login.php | 4 +- web/app/controllers/logout.php | 2 +- web/app/controllers/problem.php | 6 +- web/app/controllers/problem_data_manage.php | 4 +- .../controllers/problem_managers_manage.php | 6 +- web/app/controllers/problem_set.php | 6 +- .../controllers/problem_statement_manage.php | 2 +- web/app/controllers/problem_statistics.php | 4 +- web/app/controllers/ranklist.php | 2 +- web/app/controllers/register.php | 4 +- web/app/controllers/reset_pw.php | 4 +- .../controllers/subdomain/blog/aboutme.php | 2 +- .../controllers/subdomain/blog/archive.php | 2 +- web/app/controllers/subdomain/blog/blog.php | 6 +- .../subdomain/blog/blog_delete.php | 2 +- .../controllers/subdomain/blog/blog_write.php | 2 +- web/app/controllers/subdomain/blog/index.php | 4 +- web/app/controllers/subdomain/blog/route.php | 1 - web/app/controllers/subdomain/blog/slide.php | 2 +- .../subdomain/blog/slide_write.php | 2 +- web/app/controllers/submission.php | 4 +- web/app/controllers/submissions_list.php | 6 +- web/app/controllers/super_manage.php | 70 +++++++-------- web/app/controllers/user_info.php | 50 +++++------ web/app/controllers/user_msg.php | 42 ++++----- web/app/controllers/user_system_msg.php | 2 +- web/app/libs/uoj-data-lib.php | 2 +- web/app/libs/uoj-form-lib.php | 4 +- web/app/libs/uoj-judger-lib.php | 2 +- web/app/libs/uoj-lib.php | 2 +- web/app/models/UOJBlogEditor.php | 2 +- web/app/views/blog-preview.php | 2 +- web/app/views/contest-dashboard.php | 6 +- web/app/views/page-footer.php | 2 +- web/app/views/page-header.php | 2 +- web/app/views/slide.php | 2 +- 58 files changed, 293 insertions(+), 294 deletions(-) diff --git a/web/app/controllers/add_contest.php b/web/app/controllers/add_contest.php index e23c8b7..c60cdb9 100644 --- a/web/app/controllers/add_contest.php +++ b/web/app/controllers/add_contest.php @@ -52,12 +52,12 @@ }; $time_form->succ_href="/contests"; $time_form->runAtServer(); -?> + ?>

添加比赛

printHTML(); -?> + $time_form->printHTML(); + ?>
diff --git a/web/app/controllers/announcements.php b/web/app/controllers/announcements.php index dd86797..13c3610 100644 --- a/web/app/controllers/announcements.php +++ b/web/app/controllers/announcements.php @@ -44,7 +44,7 @@ EOD; 'table_classes' => ['table', 'table-hover'], 'page_len' => 100 ]; -?> + ?>

公告

diff --git a/web/app/controllers/blog_show.php b/web/app/controllers/blog_show.php index c4ca3b9..ad1f5d1 100644 --- a/web/app/controllers/blog_show.php +++ b/web/app/controllers/blog_show.php @@ -12,4 +12,4 @@ } redirectTo(HTML::blog_url($blog['poster'], '/post/'.$_GET['id'])); -?> + ?> diff --git a/web/app/controllers/blogs.php b/web/app/controllers/blogs.php index d032ff6..d26ac36 100644 --- a/web/app/controllers/blogs.php +++ b/web/app/controllers/blogs.php @@ -29,7 +29,7 @@ EOD; $config = array(); $config['table_classes'] = array('table', 'table-hover'); -?> + ?>
diff --git a/web/app/controllers/change_user_info.php b/web/app/controllers/change_user_info.php index 06978d6..da70b78 100644 --- a/web/app/controllers/change_user_info.php +++ b/web/app/controllers/change_user_info.php @@ -58,11 +58,11 @@ if (isset($_POST['change'])) { die(handlePost()); } -?> + ?> + ?>

diff --git a/web/app/controllers/click_zan.php b/web/app/controllers/click_zan.php index e2a178f..05817fe 100644 --- a/web/app/controllers/click_zan.php +++ b/web/app/controllers/click_zan.php @@ -64,5 +64,5 @@ } $cnt = $row['zan']; } -?> + ?> \ No newline at end of file diff --git a/web/app/controllers/contest_inside.php b/web/app/controllers/contest_inside.php index bccdbd6..3dbe0ef 100644 --- a/web/app/controllers/contest_inside.php +++ b/web/app/controllers/contest_inside.php @@ -239,13 +239,13 @@ return '您尚未登录'; } switch ($_POST['rtype']) { - case 'public': - case 'private': - if (strlen($content) == 0) { - return '回复不能为空'; - } + case 'public': + case 'private': + if (strlen($content) == 0) { + return '回复不能为空'; + } break; - } + } return ''; }, null @@ -447,7 +447,7 @@ EOD; } $page_header = HTML::stripTags($contest['name']) . ' - '; -?> + ?>

@@ -462,18 +462,18 @@ EOD;
+ if ($cur_tab == 'dashboard') { + echoDashboard(); + } elseif ($cur_tab == 'submissions') { + echoMySubmissions(); + } elseif ($cur_tab == 'standings') { + echoStandings(); + } elseif ($cur_tab == 'after_contest_standings') { + echoStandings(true); + } elseif ($cur_tab == 'backstage') { + echoBackstage(); + } + ?>
@@ -485,14 +485,14 @@ EOD;
+ if ($contest['cur_progress'] <= CONTEST_IN_PROGRESS) { + echoContestCountdown(); + } elseif ($contest['cur_progress'] <= CONTEST_TESTING) { + echoContestJudgeProgress(); + } else { + echoContestFinished(); + } + ?>
diff --git a/web/app/controllers/contest_manage.php b/web/app/controllers/contest_manage.php index 8ec7a27..3a0980b 100644 --- a/web/app/controllers/contest_manage.php +++ b/web/app/controllers/contest_manage.php @@ -166,7 +166,7 @@ $time_form->runAtServer(); $managers_form->runAtServer(); $problems_form->runAtServer(); -?> + ?>

管理

    @@ -193,13 +193,13 @@ ', '', $row_id, '', '', getUserLink($row['username']), '', ''; } -?> + ?>

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

    @@ -216,13 +216,13 @@ ', '', $problem['id'], '', '', getProblemLink($problem), ' ', "[$problem_config_str]", '', ''; } -?> + ?>

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

    diff --git a/web/app/controllers/contest_members.php b/web/app/controllers/contest_members.php index 2de5d28..50b0352 100644 --- a/web/app/controllers/contest_members.php +++ b/web/app/controllers/contest_members.php @@ -106,7 +106,7 @@ $unregister_form->runAtServer(); } } -?> + ?>

    @@ -123,55 +123,55 @@ #'.UOJLocale::get('username').'remote_addr'; + if ($show_ip) { + $header_row = '#'.UOJLocale::get('username').'remote_addr'; - $ip_owner = 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']; + $ip_owner = 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']; + } + } else { + $header_row = '#'.UOJLocale::get('username').''; } - } else { - $header_row = '#'.UOJLocale::get('username').''; - } - echoLongTable(array('*'), 'contests_registrants', "contest_id = {$contest['id']}", 'order by username desc', - $header_row, - function($contest, $num) { - global $myUser; - global $show_ip, $ip_owner; + echoLongTable(array('*'), 'contests_registrants', "contest_id = {$contest['id']}", 'order by username desc', + $header_row, + function($contest, $num) { + global $myUser; + global $show_ip, $ip_owner; - $user = queryUser($contest['username']); - $user_link = getUserLink($contest['username']); - if (!$show_ip) { - echo ''; - } else { - if ($ip_owner[$user['remote_addr']] != $user['username']) { - echo ''; - } else { + $user = queryUser($contest['username']); + $user_link = getUserLink($contest['username']); + if (!$show_ip) { echo ''; + } else { + if ($ip_owner[$user['remote_addr']] != $user['username']) { + echo ''; + } else { + echo ''; + } } - } - echo ''.$num.''; - echo ''.$user_link.''; - if ($show_ip) { - echo ''.$user['remote_addr'].''; - } - echo ''; - }, - array('page_len' => 100, - 'get_row_index' => '', - 'print_after_table' => function() { - global $add_new_contestant_form, $add_group_to_contest_form; + echo ''.$num.''; + echo ''.$user_link.''; + if ($show_ip) { + echo ''.$user['remote_addr'].''; + } + echo ''; + }, + array('page_len' => 100, + 'get_row_index' => '', + 'print_after_table' => function() { + global $add_new_contestant_form, $add_group_to_contest_form; - if (isset($add_new_contestant_form)) { - $add_new_contestant_form->printHTML(); + if (isset($add_new_contestant_form)) { + $add_new_contestant_form->printHTML(); + } + if (isset($add_group_to_contest_form)) { + $add_group_to_contest_form->printHTML(); + } } - if (isset($add_group_to_contest_form)) { - $add_group_to_contest_form->printHTML(); - } - } - ) - ); -?> + ) + ); + ?> diff --git a/web/app/controllers/contest_registration.php b/web/app/controllers/contest_registration.php index 6f96e71..1b5a2e0 100644 --- a/web/app/controllers/contest_registration.php +++ b/web/app/controllers/contest_registration.php @@ -28,7 +28,7 @@ $register_form->succ_href = "/contests"; $register_form->runAtServer(); -?> + ?>

    比赛规则

      diff --git a/web/app/controllers/contests.php b/web/app/controllers/contests.php index 1440787..daa5c7a 100644 --- a/web/app/controllers/contests.php +++ b/web/app/controllers/contests.php @@ -48,11 +48,11 @@ EOD; echo '', '
      '.$click_zan_block.'
      ', ''; echo ''; } -?> + ?>

      '; $table_header .= ''.UOJLocale::get('contests::contest name').''; $table_header .= ''.UOJLocale::get('contests::start time').''; @@ -81,22 +81,22 @@ $('#contest-countdown').countdown($rest_second, function() {
EOD; } -?> + ?>

100, - 'print_after_table' => function() { - global $myUser; - if (isSuperUser($myUser)) { - echo '
'; - echo ''.UOJLocale::get('contests::add new contest').''; - echo '
'; + echoLongTable(array('*'), 'contests', "status = 'finished'", 'order by id desc', $table_header, + echoContest, + array('page_len' => 100, + 'print_after_table' => function() { + global $myUser; + if (isSuperUser($myUser)) { + echo '
'; + echo ''.UOJLocale::get('contests::add new contest').''; + echo '
'; + } } - } - ) - ); -?> + ) + ); + ?> diff --git a/web/app/controllers/download.php b/web/app/controllers/download.php index dab2f2e..84bbb42 100644 --- a/web/app/controllers/download.php +++ b/web/app/controllers/download.php @@ -53,4 +53,4 @@ header("X-Sendfile: $file_name"); header("Content-type: $mimetype"); header("Content-Disposition: attachment; filename=$download_name"); -?> + ?> diff --git a/web/app/controllers/faq.php b/web/app/controllers/faq.php index b94bba5..e648444 100644 --- a/web/app/controllers/faq.php +++ b/web/app/controllers/faq.php @@ -7,7 +7,7 @@ } echoUOJPageHeader(UOJLocale::get('help')); -?> + ?>

常见问题及其解答(FAQ)

diff --git a/web/app/controllers/forgot_pw.php b/web/app/controllers/forgot_pw.php index 510be06..357bbd4 100644 --- a/web/app/controllers/forgot_pw.php +++ b/web/app/controllers/forgot_pw.php @@ -51,7 +51,7 @@ EOD; $forgot_form->submit_button_config['align'] = 'offset'; $forgot_form->runAtServer(); -?> + ?>

找回密码

请输入需要找回密码的用户名：

diff --git a/web/app/controllers/group.php b/web/app/controllers/group.php index 1b0ee0e..aabaebb 100644 --- a/web/app/controllers/group.php +++ b/web/app/controllers/group.php @@ -97,7 +97,7 @@ }; $delete_user_form->runAtServer(); } -?> + ?> @@ -109,19 +109,19 @@
    '; - echo getUserLink($ac['submitter']); - echo ' 解决了问题 '; - echo '', $ac['problem_title'], ' '; - echo ''; - echo ''; - } - if (!$current_ac) { - echo '(无)'; - } - ?> + $current_ac = queryGroupCurrentAC($group['id']); + foreach ($current_ac as $ac) { + echo '
  • '; + echo getUserLink($ac['submitter']); + echo ' 解决了问题 '; + echo '', $ac['problem_title'], ' '; + echo ''; + echo '
    • '; + } + if (!$current_ac) { + echo '(无)'; + } + ?>
diff --git a/web/app/controllers/groups.php b/web/app/controllers/groups.php index 8867a5d..8f47c6f 100644 --- a/web/app/controllers/groups.php +++ b/web/app/controllers/groups.php @@ -3,13 +3,13 @@ requirePHPLib('judger'); requirePHPLib('data'); - if (!Auth::check()) { - become403Page(UOJLocale::get('need login')); - } + if (!Auth::check()) { + become403Page(UOJLocale::get('need login')); + } - if (!isNormalUser($myUser)) { - become403Page(); - } + if (!isNormalUser($myUser)) { + become403Page(); + } if (isSuperUser($myUser)) { $new_group_form = new UOJForm('new_group'); @@ -41,12 +41,12 @@ echo ''; } -?> + ?> @@ -65,22 +65,22 @@ EOD; $from = "`groups` a left join groups_users b on a.id = b.group_id"; echoLongTable( - array('a.id as group_id', 'a.title as title', 'a.is_hidden as is_hidden', 'count(b.username) as user_count'), - $from, $cond, 'group by a.id order by a.id asc', - $header, - 'echoGroup', - array('page_len' => 100, - 'table_classes' => array('table', 'table-bordered', 'table-hover', 'table-striped'), - 'print_after_table' => function() { - global $myUser; - if (isSuperUser($myUser)) { - global $new_group_form; - $new_group_form->printHTML(); - } - }, - 'head_pagination' => true - ) - ); -?> + array('a.id as group_id', 'a.title as title', 'a.is_hidden as is_hidden', 'count(b.username) as user_count'), + $from, $cond, 'group by a.id order by a.id asc', + $header, + 'echoGroup', + array('page_len' => 100, + 'table_classes' => array('table', 'table-bordered', 'table-hover', 'table-striped'), + 'print_after_table' => function() { + global $myUser; + if (isSuperUser($myUser)) { + global $new_group_form; + $new_group_form->printHTML(); + } + }, + 'head_pagination' => true + ) + ); + ?> diff --git a/web/app/controllers/hack.php b/web/app/controllers/hack.php index d9ad3fe..d152c68 100644 --- a/web/app/controllers/hack.php +++ b/web/app/controllers/hack.php @@ -60,10 +60,10 @@ $styler->show_small_tip = false; } } -?> + ?> + ?> diff --git a/web/app/controllers/hack_list.php b/web/app/controllers/hack_list.php index 8ecb7ca..1457267 100644 --- a/web/app/controllers/hack_list.php +++ b/web/app/controllers/hack_list.php @@ -48,7 +48,7 @@ $cond = '1'; } -?> + ?>
@@ -104,6 +104,6 @@
''), $myUser); -?> + echoHacksList($cond, 'order by id desc', array('judge_time_hidden' => ''), $myUser); + ?> diff --git a/web/app/controllers/index.php b/web/app/controllers/index.php index a75a66c..a0ebfab 100644 --- a/web/app/controllers/index.php +++ b/web/app/controllers/index.php @@ -1,7 +1,7 @@ + ?>
@@ -19,11 +19,11 @@  new'; - } + $now_cnt++; + $new_tag = ''; + if ((time() - strtotime($blog['post_time'])) / 3600 / 24 <= 7) { + $new_tag = ' new'; + } ?> @@ -60,8 +60,8 @@

0): ?> diff --git a/web/app/controllers/judge/download.php b/web/app/controllers/judge/download.php index 6358ccd..4c49108 100644 --- a/web/app/controllers/judge/download.php +++ b/web/app/controllers/judge/download.php @@ -40,4 +40,4 @@ header("X-Sendfile: $file_name"); header("Content-type: $mimetype"); header("Content-Disposition: attachment; filename=$download_name"); -?> + ?> diff --git a/web/app/controllers/judge/submit.php b/web/app/controllers/judge/submit.php index 29cd2cc..f54dab6 100644 --- a/web/app/controllers/judge/submit.php +++ b/web/app/controllers/judge/submit.php @@ -209,4 +209,4 @@ } echo json_encode($submission); -?> + ?> diff --git a/web/app/controllers/judge/sync_judge_client.php b/web/app/controllers/judge/sync_judge_client.php index ba7ee51..8858ffb 100644 --- a/web/app/controllers/judge/sync_judge_client.php +++ b/web/app/controllers/judge/sync_judge_client.php @@ -18,4 +18,4 @@ } die("ok"); -?> + ?> diff --git a/web/app/controllers/login.php b/web/app/controllers/login.php index 071cd40..34485fa 100644 --- a/web/app/controllers/login.php +++ b/web/app/controllers/login.php @@ -49,10 +49,10 @@ unset($_SESSION['phrase']); die(); } -?> + ?> + ?>

diff --git a/web/app/controllers/logout.php b/web/app/controllers/logout.php index 12bfd6d..ffab348 100644 --- a/web/app/controllers/logout.php +++ b/web/app/controllers/logout.php @@ -1,7 +1,7 @@ + ?> '; + echo '
'; echo ''; echo ''; echo $header; @@ -201,5 +201,5 @@ $('#input-show_submit_mode').click(function() { } echo $pag->pagination(); -?> + ?> diff --git a/web/app/controllers/problem_statement_manage.php b/web/app/controllers/problem_statement_manage.php index 2fdf79a..b320857 100644 --- a/web/app/controllers/problem_statement_manage.php +++ b/web/app/controllers/problem_statement_manage.php @@ -53,7 +53,7 @@ }; $problem_editor->runAtServer(); -?> + ?>

# : 管理

    diff --git a/web/app/controllers/problem_statistics.php b/web/app/controllers/problem_statistics.php index fff1701..ed203ae 100644 --- a/web/app/controllers/problem_statistics.php +++ b/web/app/controllers/problem_statistics.php @@ -61,10 +61,10 @@ } $submissions_sort_by_choice = !isset($_COOKIE['submissions-sort-by-code-length']) ? 'time' : 'tot_size'; -?> + ?> + ?>

    diff --git a/web/app/controllers/ranklist.php b/web/app/controllers/ranklist.php index 7b23bc7..0d464ac 100644 --- a/web/app/controllers/ranklist.php +++ b/web/app/controllers/ranklist.php @@ -13,7 +13,7 @@ } else { become404Page(); } -?> + ?> diff --git a/web/app/controllers/register.php b/web/app/controllers/register.php index 6ee7492..a418574 100644 --- a/web/app/controllers/register.php +++ b/web/app/controllers/register.php @@ -59,11 +59,11 @@ } die(); } -?> + ?> + ?>

    diff --git a/web/app/controllers/reset_pw.php b/web/app/controllers/reset_pw.php index 3e10705..cf55844 100644 --- a/web/app/controllers/reset_pw.php +++ b/web/app/controllers/reset_pw.php @@ -29,11 +29,11 @@ if (isset($_POST['reset'])) { die(resetPassword()); } -?> + ?> + ?>

    更改密码

    diff --git a/web/app/controllers/subdomain/blog/aboutme.php b/web/app/controllers/subdomain/blog/aboutme.php index 5875436..3d8bf8d 100644 --- a/web/app/controllers/subdomain/blog/aboutme.php +++ b/web/app/controllers/subdomain/blog/aboutme.php @@ -4,7 +4,7 @@ if (!Auth::check()) { become403Page(UOJLocale::get('need login')); } -?> + ?> diff --git a/web/app/controllers/subdomain/blog/archive.php b/web/app/controllers/subdomain/blog/archive.php index 018d223..279f1e6 100644 --- a/web/app/controllers/subdomain/blog/archive.php +++ b/web/app/controllers/subdomain/blog/archive.php @@ -31,7 +31,7 @@ requireLib('mathjax'); requireLib('shjs'); -?> + ?>
    diff --git a/web/app/controllers/subdomain/blog/blog.php b/web/app/controllers/subdomain/blog/blog.php index 26882b1..5a34317 100644 --- a/web/app/controllers/subdomain/blog/blog.php +++ b/web/app/controllers/subdomain/blog/blog.php @@ -140,11 +140,11 @@ 'tail' => 'order by id asc', 'page_len' => 20 )); -?> + ?> + ?> isset($_GET['page']) && $_GET['page'] != 1)) ?>

    评论

    @@ -162,7 +162,7 @@ $replies[$idx]['poster_realname'] = queryUser($reply['poster'])['realname']; } $replies_json = json_encode($replies); - ?> + ?>
    diff --git a/web/app/controllers/subdomain/blog/blog_delete.php b/web/app/controllers/subdomain/blog/blog_delete.php index 1253c47..d115a17 100644 --- a/web/app/controllers/subdomain/blog/blog_delete.php +++ b/web/app/controllers/subdomain/blog/blog_delete.php @@ -22,7 +22,7 @@ $delete_form->succ_href = "/archive"; $delete_form->runAtServer(); -?> + ?>

    您真的要删除博客 吗？该操作不可逆！

    printHTML(); ?> diff --git a/web/app/controllers/subdomain/blog/blog_write.php b/web/app/controllers/subdomain/blog/blog_write.php index 661ca0f..f1b2239 100644 --- a/web/app/controllers/subdomain/blog/blog_write.php +++ b/web/app/controllers/subdomain/blog/blog_write.php @@ -67,7 +67,7 @@ }; $blog_editor->runAtServer(); -?> + ?>
    这玩意儿怎么用？ diff --git a/web/app/controllers/subdomain/blog/index.php b/web/app/controllers/subdomain/blog/index.php index 4494476..39504d9 100644 --- a/web/app/controllers/subdomain/blog/index.php +++ b/web/app/controllers/subdomain/blog/index.php @@ -10,11 +10,11 @@ 'tail' => 'order by post_time desc limit 5', 'echo_full' => true )); -?> + ?> + ?>
    diff --git a/web/app/controllers/subdomain/blog/route.php b/web/app/controllers/subdomain/blog/route.php index 461e2ff..d1774cb 100644 --- a/web/app/controllers/subdomain/blog/route.php +++ b/web/app/controllers/subdomain/blog/route.php @@ -1,7 +1,6 @@ + ?> diff --git a/web/app/controllers/subdomain/blog/slide_write.php b/web/app/controllers/subdomain/blog/slide_write.php index 20da15e..369dc44 100644 --- a/web/app/controllers/subdomain/blog/slide_write.php +++ b/web/app/controllers/subdomain/blog/slide_write.php @@ -66,7 +66,7 @@ }; $blog_editor->runAtServer(); -?> + ?>
    这玩意儿怎么用？ diff --git a/web/app/controllers/submission.php b/web/app/controllers/submission.php index 21fc8f2..3783415 100644 --- a/web/app/controllers/submission.php +++ b/web/app/controllers/submission.php @@ -132,10 +132,10 @@ } } } -?> + ?> + ?> diff --git a/web/app/controllers/submissions_list.php b/web/app/controllers/submissions_list.php index 426fb8e..6ba48c1 100644 --- a/web/app/controllers/submissions_list.php +++ b/web/app/controllers/submissions_list.php @@ -37,7 +37,7 @@ } else { $cond = '1'; } -?> + ?>
    @@ -86,6 +86,6 @@
    ''), $myUser); -?> + echoSubmissionsList($cond, 'order by id desc', array('judge_time_hidden' => ''), $myUser); + ?> diff --git a/web/app/controllers/super_manage.php b/web/app/controllers/super_manage.php index a7331d2..bd29a4c 100644 --- a/web/app/controllers/super_manage.php +++ b/web/app/controllers/super_manage.php @@ -307,14 +307,14 @@ null ); $countdown_adder->addInput('new_countdown_endtime', 'text', '截止日期', date("Y-m-d H:i:s"), - function($str, &$vdata) { - try { - $vdata['new_countdown_endtime'] = new DateTime($str); - } catch (Exception $e) { - return '无效时间格式'; - } - return ''; - }, + function($str, &$vdata) { + try { + $vdata['new_countdown_endtime'] = new DateTime($str); + } catch (Exception $e) { + return '无效时间格式'; + } + return ''; + }, null ); $countdown_adder->handle = function() { @@ -326,21 +326,21 @@ }; $countdown_adder->runAtServer(); - $countdown_deleter = new UOJForm('delete_countdown'); - $countdown_deleter->submit_button_config['align'] = 'compressed'; - $countdown_deleter->addInput('delete_countdown_id', 'text', 'ID', '', - function ($delete_countdown_id) { - return ''; - }, - null - ); - $countdown_deleter->handle = function() { - $delete_countdown_id = $_POST['delete_countdown_id']; - $delete_countdown_id = DB::escape($delete_countdown_id); + $countdown_deleter = new UOJForm('delete_countdown'); + $countdown_deleter->submit_button_config['align'] = 'compressed'; + $countdown_deleter->addInput('delete_countdown_id', 'text', 'ID', '', + function ($delete_countdown_id) { + return ''; + }, + null + ); + $countdown_deleter->handle = function() { + $delete_countdown_id = $_POST['delete_countdown_id']; + $delete_countdown_id = DB::escape($delete_countdown_id); - DB::query("delete from countdowns where id = '$delete_countdown_id'"); - }; - $countdown_deleter->runAtServer(); + DB::query("delete from countdowns where id = '$delete_countdown_id'"); + }; + $countdown_deleter->runAtServer(); $countdowns_header_row = << @@ -349,15 +349,15 @@
EOD; - $countdowns_print_row = function($row) { - echo << EOD; - }; + }; $contest_submissions_deleter = new UOJForm('contest_submissions'); $contest_submissions_deleter->addInput('contest_id', 'text', '比赛ID', '', @@ -535,11 +535,11 @@ EOD; if (!isset($tabs_info[$cur_tab])) { become404Page(); } -?> + ?> + ?>
@@ -615,13 +615,13 @@ EOD; printHTML() ?> array('*'), - 'table_name' => 'custom_test_submissions', - 'cond' => '1', - 'tail' => 'order by id asc', - 'page_len' => 5 - )); + $submissions_pag = new Paginator(array( + 'col_names' => array('*'), + 'table_name' => 'custom_test_submissions', + 'cond' => '1', + 'tail' => 'order by id asc', + 'page_len' => 5 + )); foreach ($submissions_pag->get() as $submission) { $problem = queryProblemBrief($submission['problem_id']); $submission_result = json_decode($submission['result'], true); @@ -640,7 +640,7 @@ EOD; echoSubmissionContent($submission, getProblemCustomTestRequirement($problem)); echoCustomTestSubmissionDetails($submission_result['details'], "submission-{$submission['id']}-details"); } - ?> + ?> pagination() ?>
diff --git a/web/app/controllers/user_info.php b/web/app/controllers/user_info.php index 2caf43d..ff85c2d 100644 --- a/web/app/controllers/user_info.php +++ b/web/app/controllers/user_info.php @@ -10,11 +10,11 @@ $username = $_GET['username']; $REQUIRE_LIB['github_contribution_graph'] = ''; -?> + ?>
@@ -84,25 +84,25 @@
+ $result = []; + $vis = []; + while ($row = DB::fetch($_result)) { + $id = $row['date(submit_time)'] . ':' . $row['problem_id']; + if (!$vis[$id]) { + $vis[$id] = 1; + $result[strtotime($row['date(submit_time)']) * 1000]++; + } + } + ?>

EOD - ); + ); $this->is_big = true; $this->has_file = true; @@ -818,4 +818,4 @@ EOD; }; return $form; } -?> + ?> diff --git a/web/app/libs/uoj-judger-lib.php b/web/app/libs/uoj-judger-lib.php index 01c1db6..3daf884 100644 --- a/web/app/libs/uoj-judger-lib.php +++ b/web/app/libs/uoj-judger-lib.php @@ -183,4 +183,4 @@ DB::update("update problems set ac_num = (select count(*) from submissions where problem_id = problems.id and score = 100), submit_num = (select count(*) from submissions where problem_id = problems.id) where id = $problem_id"); } -?> + ?> diff --git a/web/app/libs/uoj-lib.php b/web/app/libs/uoj-lib.php index 128355c..e538a2e 100644 --- a/web/app/libs/uoj-lib.php +++ b/web/app/libs/uoj-lib.php @@ -33,4 +33,4 @@ UOJLocale::setLocale($_GET['locale']); } UOJLocale::requireModule('basic'); -?> + ?> diff --git a/web/app/models/UOJBlogEditor.php b/web/app/models/UOJBlogEditor.php index 34345be..12a8047 100644 --- a/web/app/models/UOJBlogEditor.php +++ b/web/app/models/UOJBlogEditor.php @@ -156,7 +156,7 @@ marked.setOptions({ } }) EOD - ); + ); } catch (V8JsException $e) { die(json_encode(array('content_md' => '未知错误'))); } diff --git a/web/app/views/blog-preview.php b/web/app/views/blog-preview.php index 271a739..6f6e2a4 100644 --- a/web/app/views/blog-preview.php +++ b/web/app/views/blog-preview.php @@ -13,7 +13,7 @@ $extra_text = $blog['is_hidden'] ? '[已隐藏] ' : ''; $blog_type = $blog['type'] == 'B' ? 'post' : 'slide'; -?> + ?>

By
diff --git a/web/app/views/contest-dashboard.php b/web/app/views/contest-dashboard.php index fbf0e7f..bd54c36 100644 --- a/web/app/views/contest-dashboard.php +++ b/web/app/views/contest-dashboard.php @@ -11,9 +11,9 @@
' : ''; - ?> + echo chr(ord('A') + $i); + echo ''; + ?> diff --git a/web/app/views/page-footer.php b/web/app/views/page-footer.php index e0856db..5930540 100644 --- a/web/app/views/page-footer.php +++ b/web/app/views/page-footer.php @@ -2,7 +2,7 @@ if (!isset($ShowPageFooter)) { $ShowPageFooter = true; } -?> + ?>
diff --git a/web/app/views/page-header.php b/web/app/views/page-header.php index 6727005..277e933 100644 --- a/web/app/views/page-header.php +++ b/web/app/views/page-header.php @@ -28,7 +28,7 @@ if (!isset($ShowPageHeader)) { $ShowPageHeader = true; } -?> + ?> diff --git a/web/app/views/slide.php b/web/app/views/slide.php index 1fc73b8..e886bb0 100644 --- a/web/app/views/slide.php +++ b/web/app/views/slide.php @@ -11,7 +11,7 @@ if (!isset($slide_config['theme'])) { $slide_config['theme'] = 'moon'; } -?> + ?>
时间
{$row['id']} {$row['title']} {$row['endtime']}
'; - echo chr(ord('A') + $i); - echo '