From 78846bc1b8df137c1bec0133319a8714678c7a1f Mon Sep 17 00:00:00 2001
From: billchenchina <billchenchina2001@gmail.com>
Date: Sun, 25 Apr 2021 21:58:47 +0800
Subject: [PATCH] Fix #88

Thanks to @qz-cqy!
---
 web/app/controllers/contests.php  | 3 ++-
 web/app/controllers/user_info.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/app/controllers/contests.php b/web/app/controllers/contests.php
index eea2b46..0ecb2be 100644
--- a/web/app/controllers/contests.php
+++ b/web/app/controllers/contests.php
@@ -62,13 +62,14 @@ EOD;
 	);
 
 	if ($rest_second <= 86400) {
+		$notification = json_encode($upcoming_contest_name . "已经开始了。是否要跳转到比赛页面？");
 		echo <<<EOD
 <div class="text-center bot-buffer-lg">
 <div class="text-warning">$upcoming_contest_name 倒计时</div>
 <div id="contest-countdown"></div>
 <script type="text/javascript">
 $('#contest-countdown').countdown($rest_second, function() {
-	if (confirm('$upcoming_contest_name 已经开始了。是否要跳转到比赛页面？')) {
+	if (confirm($notification)) {
 		window.location.href = "$upcoming_contest_href";
 	}
 });
diff --git a/web/app/controllers/user_info.php b/web/app/controllers/user_info.php
index a5ab50c..5daf415 100644
--- a/web/app/controllers/user_info.php
+++ b/web/app/controllers/user_info.php
@@ -104,20 +104,20 @@
 var rating_data = [[
 <?php
 	$user_rating_min = $user_rating_max = 1500;
-	$result = DB::query("select contest_id, rank, user_rating from contests_registrants where username = '{$user['username']}' and has_participated = 1 order by contest_id");
+	$result = DB::query("select contest_id, `rank`, user_rating from contests_registrants where username = '{$user['username']}' and has_participated = 1 order by contest_id");
 	$is_first_row = true;
 	$last_rating = 1500;
 	while ($row = DB::fetch($result)) {
 		$contest = queryContest($row['contest_id']);
 		$rating_delta = $row['user_rating'] - $last_rating;
 		if (!$is_first_row) {
-			echo "[$last_contest_time, {$row['user_rating']}, $last_contest_id, '$last_contest_name', $last_rank, $rating_delta],";
+			echo "[$last_contest_time, {$row['user_rating']}, $last_contest_id, $last_contest_name, $last_rank, $rating_delta],";
 		} else {
 			$is_first_row = false;
 		}
 		$contest_start_time = new DateTime($contest['start_time']);
 		$last_contest_time = ($contest_start_time->getTimestamp() + $contest_start_time->getOffset()) * 1000;
-		$last_contest_name = $contest['name'];
+		$last_contest_name = json_encode($contest['name']);
 		$last_contest_id = $contest['id'];
 		$last_rank = $row['rank'];
 		$last_rating = $row['user_rating'];
@@ -134,7 +134,7 @@ var rating_data = [[
 		echo "[{$time_now_stamp}, {$user['rating']}, 0]";
 	} else {
 		$rating_delta = $user['rating'] - $last_rating;
-		echo "[$last_contest_time, {$user['rating']}, $last_contest_id, '$last_contest_name', $last_rank, $rating_delta]";
+		echo "[$last_contest_time, {$user['rating']}, $last_contest_id, $last_contest_name, $last_rank, $rating_delta]";
 	}
 	if ($user['rating'] < $user_rating_min) {
 		$user_rating_min = $user['rating'];