@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | $paginator=$paginator->where(["practice"=>$filter['practice']]); |
| 219 | 219 | } |
| 220 | 220 | $paginator = $paginator ->paginate(10); |
| 221 | - }elseif($filter['public']=='0'){ |
|
| 221 | + } elseif($filter['public']=='0'){ |
|
| 222 | 222 | $paginator=DB::table('group_member') |
| 223 | 223 | ->groupBy('contest.cid') |
| 224 | 224 | ->select('contest.*') |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | ) |
| 249 | 249 | ->orderBy('contest.begin_time', 'desc') |
| 250 | 250 | ->paginate(10); |
| 251 | - }else{ |
|
| 251 | + } else{ |
|
| 252 | 252 | $paginator=DB::table('group_member') |
| 253 | 253 | ->groupBy('contest.cid') |
| 254 | 254 | ->select('contest.*') |
@@ -791,19 +791,19 @@ discard block |
||
| 791 | 791 | if(time() < $end_time){ |
| 792 | 792 | if($clearance == 3){ |
| 793 | 793 | $contestRankRaw=Cache::tags(['contest', 'rank'])->get("contestAdmin$cid"); |
| 794 | - }else{ |
|
| 794 | + } else{ |
|
| 795 | 795 | $contestRankRaw=Cache::tags(['contest', 'rank'])->get($cid); |
| 796 | 796 | } |
| 797 | 797 | if(!isset($contestRankRaw)){ |
| 798 | 798 | $contestRankRaw=$this->contestRankCache($cid); |
| 799 | 799 | } |
| 800 | - }else{ |
|
| 800 | + } else{ |
|
| 801 | 801 | if($clearance == 3){ |
| 802 | 802 | $contestRankRaw=Cache::tags(['contest', 'rank'])->get("contestAdmin$cid"); |
| 803 | 803 | if (!isset($contestRankRaw)) { |
| 804 | 804 | $contestRankRaw=$this->contestRankCache($cid); |
| 805 | 805 | } |
| 806 | - }else{ |
|
| 806 | + } else{ |
|
| 807 | 807 | $contestRankRaw=$this->getContestRankFromMySQL($cid); |
| 808 | 808 | if(!isset($contestRankRaw)){ |
| 809 | 809 | $contestRankRaw=Cache::tags(['contest', 'rank'])->get($cid); |
@@ -888,7 +888,7 @@ discard block |
||
| 888 | 888 | return DB::table("contest_clarification")->where([ |
| 889 | 889 | "cid"=>$cid |
| 890 | 890 | ])->orderBy('create_time', 'desc')->get()->all(); |
| 891 | - }else{ |
|
| 891 | + } else{ |
|
| 892 | 892 | return DB::table("contest_clarification")->where([ |
| 893 | 893 | "cid"=>$cid |
| 894 | 894 | ])->where(function ($query) { |
@@ -1125,7 +1125,7 @@ discard block |
||
| 1125 | 1125 | "records"=>[] |
| 1126 | 1126 | ]; |
| 1127 | 1127 | } |
| 1128 | - }else{ |
|
| 1128 | + } else{ |
|
| 1129 | 1129 | if ($basicInfo["status_visibility"]==2) { |
| 1130 | 1130 | // View all |
| 1131 | 1131 | $paginator=DB::table("submission")->where([ |
@@ -1347,7 +1347,7 @@ discard block |
||
| 1347 | 1347 | if($ratingCalculator->calculate()){ |
| 1348 | 1348 | $ratingCalculator->storage(); |
| 1349 | 1349 | return true; |
| 1350 | - }else{ |
|
| 1350 | + } else{ |
|
| 1351 | 1351 | return false; |
| 1352 | 1352 | } |
| 1353 | 1353 | } else { |
@@ -1461,8 +1461,7 @@ discard block |
||
| 1461 | 1461 | Cache::tags(['contest', 'rank'])->put($cid, $ret); |
| 1462 | 1462 | } |
| 1463 | 1463 | Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $ret); |
| 1464 | - } |
|
| 1465 | - else{ |
|
| 1464 | + } else{ |
|
| 1466 | 1465 | $ret=[]; |
| 1467 | 1466 | $chache=[]; |
| 1468 | 1467 | $chache['contest_info']=DB::table("contest")->where("cid", $cid)->first(); |
@@ -1479,7 +1478,7 @@ discard block |
||
| 1479 | 1478 | "cid"=>$cid, |
| 1480 | 1479 | "audit"=>1 |
| 1481 | 1480 | ])->select('uid')->get()->all(); |
| 1482 | - }else{ |
|
| 1481 | + } else{ |
|
| 1483 | 1482 | $submissionUsers=DB::table("submission")->where([ |
| 1484 | 1483 | "cid"=>$cid |
| 1485 | 1484 | ])->where( |
@@ -1514,9 +1513,9 @@ discard block |
||
| 1514 | 1513 | Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $retAdmin); |
| 1515 | 1514 | } |
| 1516 | 1515 | } |
| 1517 | - }catch(LockTimeoutException $e){ |
|
| 1516 | + } catch(LockTimeoutException $e){ |
|
| 1518 | 1517 | Log::warning("Contest Rank Lock Timed Out"); |
| 1519 | - }finally{ |
|
| 1518 | + } finally{ |
|
| 1520 | 1519 | optional($lock)->release(); |
| 1521 | 1520 | } |
| 1522 | 1521 | } |
@@ -1539,7 +1538,7 @@ discard block |
||
| 1539 | 1538 | return 1; |
| 1540 | 1539 | } |
| 1541 | 1540 | }); |
| 1542 | - }else if ($contest_info["rule"]==2){ |
|
| 1541 | + } else if ($contest_info["rule"]==2){ |
|
| 1543 | 1542 | usort($ret, function ($a, $b) { |
| 1544 | 1543 | if ($a["score"]==$b["score"]) { |
| 1545 | 1544 | if ($a["solved"]==$b["solved"]) { |
@@ -1563,8 +1562,9 @@ discard block |
||
| 1563 | 1562 | { |
| 1564 | 1563 | $id = count($ret); |
| 1565 | 1564 | foreach($ret as $key => $r){ |
| 1566 | - if($r['uid'] == $uid) |
|
| 1567 | - $id = $key; |
|
| 1565 | + if($r['uid'] == $uid) { |
|
| 1566 | + $id = $key; |
|
| 1567 | + } |
|
| 1568 | 1568 | } |
| 1569 | 1569 | if ($contest_info["rule"]==1) { |
| 1570 | 1570 | // ACM/ICPC Mode |
@@ -1572,7 +1572,7 @@ discard block |
||
| 1572 | 1572 | $prob_detail = []; |
| 1573 | 1573 | $totPen = 0; |
| 1574 | 1574 | $totScore = 0; |
| 1575 | - }else{ |
|
| 1575 | + } else{ |
|
| 1576 | 1576 | $prob_detail = $ret[$id]['problem_detail']; |
| 1577 | 1577 | $totPen=$ret[$id]['penalty']; |
| 1578 | 1578 | $totScore=$ret[$id]['score']; |
@@ -1612,7 +1612,7 @@ discard block |
||
| 1612 | 1612 | $prob_detail = []; |
| 1613 | 1613 | $totSolved = 0; |
| 1614 | 1614 | $totScore = 0; |
| 1615 | - }else{ |
|
| 1615 | + } else{ |
|
| 1616 | 1616 | $prob_detail = $ret[$id]['problem_detail']; |
| 1617 | 1617 | $totSolved=$ret[$id]['solved']; |
| 1618 | 1618 | $totScore=$ret[$id]['score']; |
@@ -1675,18 +1675,18 @@ discard block |
||
| 1675 | 1675 | return false; |
| 1676 | 1676 | } |
| 1677 | 1677 | return true; |
| 1678 | - }else if($status === 0){ |
|
| 1678 | + } else if($status === 0){ |
|
| 1679 | 1679 | if($begin_time_new !== null){ |
| 1680 | 1680 | return false; |
| 1681 | 1681 | } |
| 1682 | 1682 | if($end_time_new !== null){ |
| 1683 | 1683 | if(strtotime($end_time_new) <= time()){ |
| 1684 | 1684 | return false; |
| 1685 | - }else{ |
|
| 1685 | + } else{ |
|
| 1686 | 1686 | return true; |
| 1687 | 1687 | } |
| 1688 | 1688 | } |
| 1689 | - }else{ |
|
| 1689 | + } else{ |
|
| 1690 | 1690 | return false; |
| 1691 | 1691 | } |
| 1692 | 1692 | |
@@ -1707,8 +1707,7 @@ discard block |
||
| 1707 | 1707 | return DB::table("contest_clarification")->where('ccid','=',$ccid)->update([ |
| 1708 | 1708 | "public"=>1 |
| 1709 | 1709 | ]); |
| 1710 | - } |
|
| 1711 | - else |
|
| 1710 | + } else |
|
| 1712 | 1711 | { |
| 1713 | 1712 | return DB::table("contest_clarification")->where('ccid','=',$ccid)->update([ |
| 1714 | 1713 | "public"=>0 |
@@ -1731,7 +1730,7 @@ discard block |
||
| 1731 | 1730 | ->whereIn('pid',array_column($contestRank[0]['problem_detail'],'pid')) |
| 1732 | 1731 | ->select('pid','title') |
| 1733 | 1732 | ->get()->all(); |
| 1734 | - }else{ |
|
| 1733 | + } else{ |
|
| 1735 | 1734 | $all_problems = []; |
| 1736 | 1735 | } |
| 1737 | 1736 | $tags = DB::table('group_problem_tag') |