Passed
Branch dev (ead432)
by John
04:24
created
app/Http/Controllers/GroupController.php 1 patch
Braces   +16 added lines, -6 removed lines patch added patch discarded remove patch
@@ -43,7 +43,9 @@  discard block
 block discarded – undo
43 43
         $groupModel=new GroupModel();
44 44
         $contestModel=new ContestModel();
45 45
         $basic_info=$groupModel->details($gcode);
46
-        if(empty($basic_info)) return Redirect::route('group.index');
46
+        if(empty($basic_info)) {
47
+            return Redirect::route('group.index');
48
+        }
47 49
         $my_profile=$groupModel->userProfile(Auth::user()->id, $basic_info["gid"]);
48 50
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
49 51
         $member_list=$groupModel->userList($basic_info["gid"]);
@@ -110,7 +112,9 @@  discard block
 block discarded – undo
110 112
     {
111 113
         $groupModel=new GroupModel();
112 114
         $basic_info=$groupModel->details($gcode);
113
-        if(empty($basic_info)) return Redirect::route('group.index');
115
+        if(empty($basic_info)) {
116
+            return Redirect::route('group.index');
117
+        }
114 118
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
115 119
         $member_list=$groupModel->userList($basic_info["gid"]);
116 120
         return view('group.settings.general', [
@@ -152,7 +156,9 @@  discard block
 block discarded – undo
152 156
     {
153 157
         $groupModel=new GroupModel();
154 158
         $basic_info=$groupModel->details($gcode);
155
-        if(empty($basic_info)) return Redirect::route('group.index');
159
+        if(empty($basic_info)) {
160
+            return Redirect::route('group.index');
161
+        }
156 162
         return view('group.settings.danger', [
157 163
             'page_title'=>"Group Setting danger",
158 164
             'site_title'=>config("app.name"),
@@ -188,7 +194,9 @@  discard block
 block discarded – undo
188 194
         $groupModel=new GroupModel();
189 195
         $contestModel=new ContestModel();
190 196
         $basic_info=$groupModel->details($gcode);
191
-        if(empty($basic_info)) return Redirect::route('group.index');
197
+        if(empty($basic_info)) {
198
+            return Redirect::route('group.index');
199
+        }
192 200
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
193 201
         $member_list=$groupModel->userList($basic_info["gid"]);
194 202
         $group_notice=$groupModel->detailNotice($gcode);
@@ -208,7 +216,9 @@  discard block
 block discarded – undo
208 216
         $groupModel=new GroupModel();
209 217
         $contestModel=new ContestModel();
210 218
         $basic_info=$groupModel->details($gcode);
211
-        if(empty($basic_info)) return Redirect::route('group.index');
219
+        if(empty($basic_info)) {
220
+            return Redirect::route('group.index');
221
+        }
212 222
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
213 223
         $contest_list=$contestModel->listForSetting($basic_info["gid"]);
214 224
         $member_list=$groupModel->userList($basic_info["gid"]);
@@ -244,7 +254,7 @@  discard block
 block discarded – undo
244 254
                 ),
245 255
                 $gcode . '_Group_Contest_Analysis.xlsx'
246 256
             );
247
-        }else{
257
+        } else{
248 258
             $data = $groupModel->groupMemberPracticeTagStat($group_info['gid']);
249 259
             return Excel::download(
250 260
                 new GroupAnalysisExport(
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/SearchController.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
                 }
44 44
                 $result = $model->search($key);
45 45
                 $all_result[$name] = $result;
46
-            }else{
46
+            } else{
47 47
                 $all_result[$name] = [
48 48
                     'code' => -1,
49 49
                     'msg' => 'cannot find class named '.$model_class
Please login to merge, or discard this patch.
app/Models/ContestModel.php 1 patch
Braces   +25 added lines, -26 removed lines patch added patch discarded remove patch
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
                     $paginator=$paginator->where(["practice"=>$filter['practice']]);
225 225
                 }
226 226
                 $paginator = $paginator ->paginate(10);
227
-            }elseif($filter['public']=='0'){
227
+            } elseif($filter['public']=='0'){
228 228
                 $paginator=DB::table('group_member')
229 229
                 ->groupBy('contest.cid')
230 230
                 ->select('contest.*')
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
                 )
255 255
                 ->orderBy('contest.begin_time', 'desc')
256 256
                 ->paginate(10);
257
-            }else{
257
+            } else{
258 258
                 $paginator=DB::table('group_member')
259 259
                 ->groupBy('contest.cid')
260 260
                 ->select('contest.*')
@@ -797,13 +797,13 @@  discard block
 block discarded – undo
797 797
         if(time() < $end_time){
798 798
             if($clearance == 3){
799 799
                 $contestRankRaw=Cache::tags(['contest', 'rank'])->get("contestAdmin$cid");
800
-            }else{
800
+            } else{
801 801
                 $contestRankRaw=Cache::tags(['contest', 'rank'])->get($cid);
802 802
             }
803 803
             if(!isset($contestRankRaw)){
804 804
                 $contestRankRaw=$this->contestRankCache($cid);
805 805
             }
806
-        }else{
806
+        } else{
807 807
             if($clearance == 3){
808 808
                 $contestRankRaw=Cache::tags(['contest', 'rank'])->get("contestAdmin$cid");
809 809
                 if (!isset($contestRankRaw)) {
@@ -813,7 +813,7 @@  discard block
 block discarded – undo
813 813
                         $this->storeContestRankInMySQL($cid, $contestRankRaw);
814 814
                     }
815 815
                 }
816
-            }else{
816
+            } else{
817 817
                 $contestRankRaw=$this->getContestRankFromMySQL($cid);
818 818
                 if(!isset($contestRankRaw)){
819 819
                     $contestRankRaw=Cache::tags(['contest', 'rank'])->get($cid);
@@ -898,7 +898,7 @@  discard block
 block discarded – undo
898 898
             return DB::table("contest_clarification")->where([
899 899
                 "cid"=>$cid
900 900
             ])->orderBy('create_time', 'desc')->get()->all();
901
-        }else{
901
+        } else{
902 902
             return DB::table("contest_clarification")->where([
903 903
                 "cid"=>$cid
904 904
             ])->where(function ($query) {
@@ -1062,7 +1062,7 @@  discard block
 block discarded – undo
1062 1062
         $filter['pid'] = array_search($filter['ncode'], array_column($problemSet_temp, 'ncode'));
1063 1063
         if($filter['pid']==false){
1064 1064
             $filter['pid'] = null;
1065
-        }else{
1065
+        } else{
1066 1066
             $filter['pid'] = $problemSet_temp[$filter['pid']]['pid'];
1067 1067
         }
1068 1068
 
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
                     "records"=>[]
1171 1171
                 ];
1172 1172
             }
1173
-        }else{
1173
+        } else{
1174 1174
             if ($basicInfo["status_visibility"]==2) {
1175 1175
                 // View all
1176 1176
                 $paginator=DB::table("submission")->where([
@@ -1420,7 +1420,7 @@  discard block
 block discarded – undo
1420 1420
             if($ratingCalculator->calculate()){
1421 1421
                 $ratingCalculator->storage();
1422 1422
                 return true;
1423
-            }else{
1423
+            } else{
1424 1424
                 return false;
1425 1425
             }
1426 1426
         } else {
@@ -1469,7 +1469,7 @@  discard block
 block discarded – undo
1469 1469
             $contestRankRaw = $this->contestRankCache($cid);
1470 1470
             Cache::tags(['contest', 'rank'])->put($cid, $contestRankRaw);
1471 1471
             Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $contestRankRaw);
1472
-        }else{
1472
+        } else{
1473 1473
             DB::table($this->tableName)
1474 1474
                 ->where('cid',$cid)
1475 1475
                 ->update($data);
@@ -1569,8 +1569,7 @@  discard block
 block discarded – undo
1569 1569
                     if(time() > $chache['end_time']){
1570 1570
                         $this->storeContestRankInMySQL($cid, $ret);
1571 1571
                     }
1572
-                }
1573
-                else{
1572
+                } else{
1574 1573
                     $ret=[];
1575 1574
                     $chache=[];
1576 1575
                     $chache['contest_info']=DB::table("contest")->where("cid", $cid)->first();
@@ -1585,7 +1584,7 @@  discard block
 block discarded – undo
1585 1584
                             "cid"=>$cid,
1586 1585
                             "audit"=>1
1587 1586
                         ])->select('uid')->get()->all();
1588
-                    }else{
1587
+                    } else{
1589 1588
                         $submissionUsers=DB::table("submission")->where([
1590 1589
                             "cid"=>$cid
1591 1590
                         ])->where(
@@ -1620,9 +1619,9 @@  discard block
 block discarded – undo
1620 1619
                     Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $retAdmin);
1621 1620
                 }
1622 1621
             }
1623
-        }catch(LockTimeoutException $e){
1622
+        } catch(LockTimeoutException $e){
1624 1623
             Log::warning("Contest Rank Lock Timed Out");
1625
-        }finally{
1624
+        } finally{
1626 1625
             optional($lock)->release();
1627 1626
         }
1628 1627
     }
@@ -1645,7 +1644,7 @@  discard block
 block discarded – undo
1645 1644
                     return 1;
1646 1645
                 }
1647 1646
             });
1648
-        }else if ($contest_info["rule"]==2){
1647
+        } else if ($contest_info["rule"]==2){
1649 1648
             usort($ret, function ($a, $b) {
1650 1649
                 if ($a["score"]==$b["score"]) {
1651 1650
                     if ($a["solved"]==$b["solved"]) {
@@ -1669,8 +1668,9 @@  discard block
 block discarded – undo
1669 1668
     {
1670 1669
         $id = count($ret);
1671 1670
         foreach($ret as $key => $r){
1672
-            if($r['uid'] == $uid)
1673
-                $id = $key;
1671
+            if($r['uid'] == $uid) {
1672
+                            $id = $key;
1673
+            }
1674 1674
         }
1675 1675
         if ($contest_info["rule"]==1) {
1676 1676
             // ACM/ICPC Mode
@@ -1678,7 +1678,7 @@  discard block
 block discarded – undo
1678 1678
                 $prob_detail = [];
1679 1679
                 $totPen = 0;
1680 1680
                 $totScore = 0;
1681
-            }else{
1681
+            } else{
1682 1682
                 $prob_detail = $ret[$id]['problem_detail'];
1683 1683
                 $totPen=$ret[$id]['penalty'];
1684 1684
                 $totScore=$ret[$id]['score'];
@@ -1733,7 +1733,7 @@  discard block
 block discarded – undo
1733 1733
                 $prob_detail = [];
1734 1734
                 $totSolved = 0;
1735 1735
                 $totScore = 0;
1736
-            }else{
1736
+            } else{
1737 1737
                 $prob_detail = $ret[$id]['problem_detail'];
1738 1738
                 $totSolved=$ret[$id]['solved'];
1739 1739
                 $totScore=$ret[$id]['score'];
@@ -1796,18 +1796,18 @@  discard block
 block discarded – undo
1796 1796
                 return false;
1797 1797
             }
1798 1798
             return true;
1799
-        }else if($status === 0){
1799
+        } else if($status === 0){
1800 1800
             if($begin_time_new !== null){
1801 1801
                 return false;
1802 1802
             }
1803 1803
             if($end_time_new !== null){
1804 1804
                 if(strtotime($end_time_new) <= time()){
1805 1805
                     return false;
1806
-                }else{
1806
+                } else{
1807 1807
                     return true;
1808 1808
                 }
1809 1809
             }
1810
-        }else{
1810
+        } else{
1811 1811
             return false;
1812 1812
         }
1813 1813
 
@@ -1828,8 +1828,7 @@  discard block
 block discarded – undo
1828 1828
             return DB::table("contest_clarification")->where('ccid','=',$ccid)->update([
1829 1829
                 "public"=>1
1830 1830
             ]);
1831
-        }
1832
-        else
1831
+        } else
1833 1832
         {
1834 1833
             return DB::table("contest_clarification")->where('ccid','=',$ccid)->update([
1835 1834
                 "public"=>0
@@ -1852,7 +1851,7 @@  discard block
 block discarded – undo
1852 1851
             ->whereIn('pid',array_column($contestRank[0]['problem_detail'],'pid'))
1853 1852
             ->select('pid','title')
1854 1853
             ->get()->all();
1855
-        }else{
1854
+        } else{
1856 1855
             $all_problems = [];
1857 1856
         }
1858 1857
         $tags = DB::table('group_problem_tag')
Please login to merge, or discard this patch.
app/Models/Babel/ExtensionModel.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,9 @@  discard block
 block discarded – undo
21 21
     {
22 22
         $ret=[];
23 23
         $marketspaceRaw=self::getRemote();
24
-        if(empty($marketspaceRaw)) return [];
24
+        if(empty($marketspaceRaw)) {
25
+            return [];
26
+        }
25 27
         foreach($marketspaceRaw["packages"] as $extension){
26 28
             $temp=[
27 29
                 "details"=>$extension,
@@ -35,7 +37,7 @@  discard block
 block discarded – undo
35 37
             try {
36 38
                 try {
37 39
                     $BabelConfig=json_decode(file_get_contents(babel_path("Extension/{$extension['code']}/babel.json")), true);
38
-                }catch (Throwable $e){
40
+                } catch (Throwable $e){
39 41
                     $BabelConfig=[];
40 42
                 }
41 43
                 if (!empty($BabelConfig)) {
@@ -61,7 +63,7 @@  discard block
 block discarded – undo
61 63
                         $temp["available"]=$installedConfig->status;
62 64
                     }
63 65
                 }
64
-            }catch (Throwable $e){
66
+            } catch (Throwable $e){
65 67
                 $temp["status"]=-1;
66 68
             }
67 69
             $ret[]=$temp;
@@ -74,7 +76,7 @@  discard block
 block discarded – undo
74 76
     {
75 77
         try {
76 78
             return json_decode(file_get_contents(env("BABEL_MIRROR", "https://acm.njupt.edu.cn/babel")."/babel.json"), true);
77
-        }catch(Throwable $e){
79
+        } catch(Throwable $e){
78 80
             return [];
79 81
         }
80 82
     }
Please login to merge, or discard this patch.
app/Models/Update/UpdateModel.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
                 "name"=>$versionInfo[0]["name"],
25 25
                 "updatable"=>$updatable
26 26
             ];
27
-        }catch(Throwable $e){
27
+        } catch(Throwable $e){
28 28
             return null;
29 29
         }
30 30
     }
Please login to merge, or discard this patch.
app/Babel/Submit/Curl.php 1 patch
Braces   +95 added lines, -19 removed lines patch added patch discarded remove patch
@@ -18,11 +18,31 @@  discard block
 block discarded – undo
18 18
 
19 19
     public function login($all_data)
20 20
     {
21
-        if(isset($all_data["url"]))    $url = $all_data["url"];       else throw new Exception("url is not exist in all_data");
22
-        if(isset($all_data["data"]))   $data = $all_data["data"];     else throw new Exception("data is not exist in all_data");
23
-        if(isset($all_data["oj"]))     $oj = $all_data["oj"];         else throw new Exception("oj is not exist in all_data");
24
-        if(isset($all_data["ret"]))    $ret = $all_data["ret"];       else $ret = 'false';
25
-        if(isset($all_data["handle"])) $handle = $all_data["handle"]; else $handle = "default";
21
+        if(isset($all_data["url"])) {
22
+            $url = $all_data["url"];
23
+        } else {
24
+            throw new Exception("url is not exist in all_data");
25
+        }
26
+        if(isset($all_data["data"])) {
27
+            $data = $all_data["data"];
28
+        } else {
29
+            throw new Exception("data is not exist in all_data");
30
+        }
31
+        if(isset($all_data["oj"])) {
32
+            $oj = $all_data["oj"];
33
+        } else {
34
+            throw new Exception("oj is not exist in all_data");
35
+        }
36
+        if(isset($all_data["ret"])) {
37
+            $ret = $all_data["ret"];
38
+        } else {
39
+            $ret = 'false';
40
+        }
41
+        if(isset($all_data["handle"])) {
42
+            $handle = $all_data["handle"];
43
+        } else {
44
+            $handle = "default";
45
+        }
26 46
 
27 47
         $datapost=curl_init();
28 48
         $headers=array("Expect:");
@@ -54,11 +74,31 @@  discard block
 block discarded – undo
54 74
 
55 75
     public function grab_page($all_data)
56 76
     {
57
-        if(isset($all_data["site"]))    $site = $all_data["site"];          else throw new Exception("site is not exist in all_data");
58
-        if(isset($all_data["oj"]))      $oj = $all_data["oj"];              else throw new Exception("oj is not exist in all_data");
59
-        if(isset($all_data["headers"])) $headers = $all_data["headers"];    else $headers = [];
60
-        if(isset($all_data["handle"]))  $handle = $all_data["handle"];      else $handle = "default";
61
-        if(isset($all_data["follow"]))  $follow = $all_data["follow"];      else $handle = false;
77
+        if(isset($all_data["site"])) {
78
+            $site = $all_data["site"];
79
+        } else {
80
+            throw new Exception("site is not exist in all_data");
81
+        }
82
+        if(isset($all_data["oj"])) {
83
+            $oj = $all_data["oj"];
84
+        } else {
85
+            throw new Exception("oj is not exist in all_data");
86
+        }
87
+        if(isset($all_data["headers"])) {
88
+            $headers = $all_data["headers"];
89
+        } else {
90
+            $headers = [];
91
+        }
92
+        if(isset($all_data["handle"])) {
93
+            $handle = $all_data["handle"];
94
+        } else {
95
+            $handle = "default";
96
+        }
97
+        if(isset($all_data["follow"])) {
98
+            $follow = $all_data["follow"];
99
+        } else {
100
+            $handle = false;
101
+        }
62 102
 
63 103
         $handle=urlencode($handle);
64 104
 
@@ -85,15 +125,51 @@  discard block
 block discarded – undo
85 125
 
86 126
     public function post_data($all_data)
87 127
     {
88
-        if(isset($all_data["site"]))         $site = $all_data["site"];                 else throw new Exception("site is not exist in all_data");
89
-        if(isset($all_data["data"]))         $data = $all_data["data"];                 else throw new Exception("data is not exist in all_data");
90
-        if(isset($all_data["oj"]))           $oj = $all_data["oj"];                     else throw new Exception("oj is not exist in all_data");
91
-        if(isset($all_data["ret"]))          $ret = $all_data["ret"];                   else $ret = false;
92
-        if(isset($all_data["follow"]))       $follow = $all_data["follow"];             else $follow = true;
93
-        if(isset($all_data["returnHeader"])) $returnHeader = $all_data["returnHeader"]; else $returnHeader = true;
94
-        if(isset($all_data["postJson"]))     $postJson = $all_data["postJson"];         else $postJson = false;
95
-        if(isset($all_data["extraHeaders"])) $extraHeaders = $all_data["extraHeaders"]; else $extraHeaders = [];
96
-        if(isset($all_data["handle"]))       $handle = $all_data["handle"];             else $handle = "default";
128
+        if(isset($all_data["site"])) {
129
+            $site = $all_data["site"];
130
+        } else {
131
+            throw new Exception("site is not exist in all_data");
132
+        }
133
+        if(isset($all_data["data"])) {
134
+            $data = $all_data["data"];
135
+        } else {
136
+            throw new Exception("data is not exist in all_data");
137
+        }
138
+        if(isset($all_data["oj"])) {
139
+            $oj = $all_data["oj"];
140
+        } else {
141
+            throw new Exception("oj is not exist in all_data");
142
+        }
143
+        if(isset($all_data["ret"])) {
144
+            $ret = $all_data["ret"];
145
+        } else {
146
+            $ret = false;
147
+        }
148
+        if(isset($all_data["follow"])) {
149
+            $follow = $all_data["follow"];
150
+        } else {
151
+            $follow = true;
152
+        }
153
+        if(isset($all_data["returnHeader"])) {
154
+            $returnHeader = $all_data["returnHeader"];
155
+        } else {
156
+            $returnHeader = true;
157
+        }
158
+        if(isset($all_data["postJson"])) {
159
+            $postJson = $all_data["postJson"];
160
+        } else {
161
+            $postJson = false;
162
+        }
163
+        if(isset($all_data["extraHeaders"])) {
164
+            $extraHeaders = $all_data["extraHeaders"];
165
+        } else {
166
+            $extraHeaders = [];
167
+        }
168
+        if(isset($all_data["handle"])) {
169
+            $handle = $all_data["handle"];
170
+        } else {
171
+            $handle = "default";
172
+        }
97 173
 
98 174
         $handle=urlencode($handle);
99 175
 
Please login to merge, or discard this patch.
app/Babel/Install/InstallerBase.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
             //writing database
39 39
             $this->transactionDB();
40 40
 
41
-        }catch(Throwable $e){
41
+        } catch(Throwable $e){
42 42
             if ($e->getMessage()!==""){
43 43
                 $this->command->line("\n  <bg=red;fg=white> {$e->getMessage()} </>\n");
44 44
             }
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 
221 221
             DB::commit();
222 222
 
223
-        }catch(Throwable $e){
223
+        } catch(Throwable $e){
224 224
             DB::rollback();
225 225
             if ($e->getMessage()!=="") {
226 226
                 $this->command->line("\n  <bg=red;fg=white> {$e->getMessage()} </>\n");
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/ContestAdminController.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         }
61 61
         if($assign_uid != 0){
62 62
             $assignee = $groupModel->userProfile($assign_uid,$contest_detail['gid']);
63
-        }else{
63
+        } else{
64 64
             $assignee = null;
65 65
         }
66 66
         $ret = [
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
             }
221 221
             $contestModel->contestUpdate($cid,$all_data,$problemSet);
222 222
             return ResponseModel::success(200);
223
-        }else{
223
+        } else{
224 224
             $allow_update = ['name','description'];
225 225
 
226 226
             foreach($all_data as $key => $value){
Please login to merge, or discard this patch.
app/Http/Controllers/Contest/AdminController.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
         $account=$contestModel->getContestAccount($cid);
59 59
         if($account==null){
60 60
             return ;
61
-        }else{
61
+        } else{
62 62
             $AccountExport=new AccountExport($account);
63 63
             $filename="ContestAccount$cid";
64 64
             return Excel::download($AccountExport, $filename.'.xlsx');
Please login to merge, or discard this patch.