Completed
Push — master ( c106d2...7c3edb )
by John
14s queued 10s
created
app/Models/ProblemModel.php 1 patch
Braces   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -446,7 +446,9 @@  discard block
 block discarded – undo
446 446
 
447 447
         if (!empty($data["sample"])) {
448 448
             foreach ($data["sample"] as $d) {
449
-                if(!isset($d['sample_note'])) $d['sample_note']=null;
449
+                if(!isset($d['sample_note'])) {
450
+                    $d['sample_note']=null;
451
+                }
450 452
                 DB::table("problem_sample")->insert([
451 453
                     'pid'=>$pid,
452 454
                     'sample_input'=>$d['sample_input'],
@@ -492,7 +494,9 @@  discard block
 block discarded – undo
492 494
 
493 495
         if (!empty($data["sample"])) {
494 496
             foreach ($data["sample"] as $d) {
495
-                if(!isset($d['sample_note'])) $d['sample_note']=null;
497
+                if(!isset($d['sample_note'])) {
498
+                    $d['sample_note']=null;
499
+                }
496 500
                 DB::table("problem_sample")->insert([
497 501
                     'pid'=>$pid,
498 502
                     'sample_input'=>$d['sample_input'],
@@ -679,7 +683,7 @@  discard block
 block discarded – undo
679 683
         $top=DB::table('problem_discussion_comment')->where('pdcid','=',$reply_id)->get()->first()['reply_id'];
680 684
         if(isset($top)){
681 685
             return $this->replyParent($reply_id);
682
-        }else{
686
+        } else{
683 687
             return $reply_id;
684 688
         }
685 689
     }
Please login to merge, or discard this patch.
app/Models/Babel/ExtensionModel.php 1 patch
Braces   +16 added lines, -8 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
                     $temp["settings"]=false;
69 69
                     $temp["available"]=$installedConfig->status;
70 70
                 }
71
-            }catch (Throwable $e){
71
+            } catch (Throwable $e){
72 72
                 continue;
73 73
             }
74 74
             $ret[]=$temp;
@@ -80,7 +80,9 @@  discard block
 block discarded – undo
80 80
     {
81 81
         $ret=[];
82 82
         $marketspaceRaw=self::getRemote();
83
-        if(empty($marketspaceRaw)) return [];
83
+        if(empty($marketspaceRaw)) {
84
+            return [];
85
+        }
84 86
         foreach($marketspaceRaw["packages"] as $extension){
85 87
             $temp=[
86 88
                 "details"=>$extension,
@@ -94,7 +96,7 @@  discard block
 block discarded – undo
94 96
             try {
95 97
                 try {
96 98
                     $BabelConfig=json_decode(file_get_contents(babel_path("Extension/{$extension['code']}/babel.json")), true);
97
-                }catch (Throwable $e){
99
+                } catch (Throwable $e){
98 100
                     $BabelConfig=[];
99 101
                 }
100 102
                 if (!empty($BabelConfig)) {
@@ -120,7 +122,7 @@  discard block
 block discarded – undo
120 122
                         $temp["available"]=$installedConfig->status;
121 123
                     }
122 124
                 }
123
-            }catch (Throwable $e){
125
+            } catch (Throwable $e){
124 126
                 continue;
125 127
             }
126 128
             $ret[]=$temp;
@@ -136,7 +138,9 @@  discard block
 block discarded – undo
136 138
         foreach($dirs as $d){
137 139
             $extension=basename($d);
138 140
             $BabelConfig=json_decode(file_get_contents(babel_path("Extension/$extension/babel.json")), true);
139
-            if($extension==$BabelConfig["code"]) $ret[]=$BabelConfig;
141
+            if($extension==$BabelConfig["code"]) {
142
+                $ret[]=$BabelConfig;
143
+            }
140 144
         }
141 145
         return $ret;
142 146
     }
@@ -145,7 +149,7 @@  discard block
 block discarded – undo
145 149
     {
146 150
         try {
147 151
             return json_decode(file_get_contents(config('babel.mirror')."/babel.json"), true);
148
-        }catch(Throwable $e){
152
+        } catch(Throwable $e){
149 153
             return [];
150 154
         }
151 155
     }
@@ -153,10 +157,14 @@  discard block
 block discarded – undo
153 157
     public static function remoteDetail($code)
154 158
     {
155 159
         $babelConfig=self::getRemote();
156
-        if(empty($babelConfig)) return [];
160
+        if(empty($babelConfig)) {
161
+            return [];
162
+        }
157 163
         $babelConfigPackages=$babelConfig["packages"];
158 164
         foreach($babelConfigPackages as $package) {
159
-            if($package["code"]==$code) return $package;
165
+            if($package["code"]==$code) {
166
+                return $package;
167
+            }
160 168
         }
161 169
         return [];
162 170
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/GroupManageController.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -245,11 +245,17 @@
 block discarded – undo
245 245
 
246 246
         $groupModel=new GroupModel();
247 247
         $is_user=$groupModel->isUser($all_data["email"]);
248
-        if(!$is_user) return ResponseModel::err(2006);
248
+        if(!$is_user) {
249
+            return ResponseModel::err(2006);
250
+        }
249 251
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
250
-        if($clearance<2) return ResponseModel::err(7002);
252
+        if($clearance<2) {
253
+            return ResponseModel::err(7002);
254
+        }
251 255
         $targetClearance=$groupModel->judgeEmailClearance($all_data["gid"], $all_data["email"]);
252
-        if($targetClearance!=-3) return ResponseModel::err(7003);
256
+        if($targetClearance!=-3) {
257
+            return ResponseModel::err(7003);
258
+        }
253 259
         $groupModel->inviteMember($all_data["gid"], $all_data["email"]);
254 260
         $basic = $groupModel->basic($all_data['gid']);
255 261
         $url = route('group.detail',['gcode' => $basic['gcode']]);
Please login to merge, or discard this patch.
app/Http/Controllers/Contest/BoardController.php 1 patch
Braces   +12 added lines, -10 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
         if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
38 38
             if($clearance == 3){
39 39
                 return Redirect::route('contest.admin', ['cid' => $cid]);
40
-            }else{
40
+            } else{
41 41
                 return Redirect::route('contest.detail', ['cid' => $cid]);
42 42
             }
43 43
         }
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
         if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
87 87
             if($clearance == 3){
88 88
                 return Redirect::route('contest.admin', ['cid' => $cid]);
89
-            }else{
89
+            } else{
90 90
                 return Redirect::route('contest.detail', ['cid' => $cid]);
91 91
             }
92 92
         }
@@ -123,7 +123,9 @@  discard block
 block discarded – undo
123 123
         }
124 124
 
125 125
         $editor_left_width = $accountModel->getExtra(Auth::user()->id, 'editor_left_width');
126
-        if(empty($editor_left_width)) $editor_left_width='40';
126
+        if(empty($editor_left_width)) {
127
+            $editor_left_width='40';
128
+        }
127 129
 
128 130
         return view('contest.board.editor', [
129 131
             'page_title'=>"Problem Detail",
@@ -160,7 +162,7 @@  discard block
 block discarded – undo
160 162
         if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
161 163
             if($clearance == 3){
162 164
                 return Redirect::route('contest.admin', ['cid' => $cid]);
163
-            }else{
165
+            } else{
164 166
                 return Redirect::route('contest.detail', ['cid' => $cid]);
165 167
             }
166 168
         }
@@ -179,10 +181,10 @@  discard block
 block discarded – undo
179 181
             if($i != 0) {
180 182
                 if($r['score'] == $contestRank[$i-1]['score'] && ($contest_rule == 1 ? ($r['penalty'] == $contestRank[$i-1]['penalty']) : 1) ){
181 183
                     $r['rank'] = $contestRank[$i-1]['rank'];
182
-                }else{
184
+                } else{
183 185
                     $r['rank'] = $i + 1;
184 186
                 }
185
-            }else{
187
+            } else{
186 188
                 $r['rank'] = 1;
187 189
             }
188 190
         }
@@ -223,7 +225,7 @@  discard block
 block discarded – undo
223 225
         if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
224 226
             if($clearance == 3){
225 227
                 return Redirect::route('contest.admin', ['cid' => $cid]);
226
-            }else{
228
+            } else{
227 229
                 return Redirect::route('contest.detail', ['cid' => $cid]);
228 230
             }
229 231
         }
@@ -265,7 +267,7 @@  discard block
 block discarded – undo
265 267
         if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
266 268
             if($clearance == 3){
267 269
                 return Redirect::route('contest.admin', ['cid' => $cid]);
268
-            }else{
270
+            } else{
269 271
                 return Redirect::route('contest.detail', ['cid' => $cid]);
270 272
             }
271 273
         }
@@ -303,7 +305,7 @@  discard block
 block discarded – undo
303 305
         if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
304 306
             if($clearance == 3){
305 307
                 return Redirect::route('contest.admin', ['cid' => $cid]);
306
-            }else{
308
+            } else{
307 309
                 return Redirect::route('contest.detail', ['cid' => $cid]);
308 310
             }
309 311
         }
@@ -331,7 +333,7 @@  discard block
 block discarded – undo
331 333
         if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
332 334
             if($clearance == 3){
333 335
                 return Redirect::route('contest.admin', ['cid' => $cid]);
334
-            }else{
336
+            } else{
335 337
                 return Redirect::route('contest.detail', ['cid' => $cid]);
336 338
             }
337 339
         }
Please login to merge, or discard this patch.
app/Models/Eloquent/ContestModel.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,12 +28,12 @@  discard block
 block discarded – undo
28 28
                 $users->add($user);
29 29
             }
30 30
             return $users->unique();
31
-        }else{
31
+        } else{
32 32
             $this->load('submissions.user');
33 33
             if($ignore_frozen){
34 34
                 $frozen_time = $this->frozen_time;
35 35
                 $submissions = $this->submissions()->where('submission_date','<',$frozen_time)->get();
36
-            }else{
36
+            } else{
37 37
                 $submissions = $this->submissions;
38 38
             }
39 39
             $users = new EloquentCollection;
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
             });
103 103
             Cache::tags(['contest', 'rank'])->put($this->cid, $ret, 60);
104 104
             return $ret;
105
-        }else{
105
+        } else{
106 106
             // IO Mode
107 107
             $c = new OutdatedContestModel();
108 108
             return $c->contestRankCache($this->cid);
Please login to merge, or discard this patch.
app/Models/Eloquent/ContestProblem.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
             $ret['solved_time_parsed'] = formatProblemSolvedTime($ret['solved_time']);
46 46
             $ret['wrong_doings']       = $ac_record[2];
47 47
             $ret['color']              = $ac_record[1] ? 'wemd-green-text' : 'wemd-teal-text';
48
-        }else{
48
+        } else{
49 49
             $ret['wrong_doings']       = $ac_record[2];
50 50
         }
51 51
         return $ret;
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
                     'Presentation Error',
77 77
                     'Output Limit Exceeded'
78 78
                 ])->where('submission_date', '<', $user_ac->submission_date)->count();
79
-        }else{
79
+        } else{
80 80
             $wrong_trys = $this->submissions()->where([
81 81
                 'uid'     => $user->id,
82 82
             ])->whereIn('verdict', [
Please login to merge, or discard this patch.
app/Models/ContestModel.php 1 patch
Braces   +26 added lines, -27 removed lines patch added patch discarded remove patch
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
                     $paginator=$paginator->where(["practice"=>$filter['practice']]);
228 228
                 }
229 229
                 $paginator = $paginator ->paginate(10);
230
-            }elseif($filter['public']=='0'){
230
+            } elseif($filter['public']=='0'){
231 231
                 $paginator=DB::table('group_member')
232 232
                 ->groupBy('contest.cid')
233 233
                 ->select('contest.*')
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
                 )
258 258
                 ->orderBy('contest.begin_time', 'desc')
259 259
                 ->paginate(10);
260
-            }else{
260
+            } else{
261 261
                 $paginator=DB::table('group_member')
262 262
                 ->groupBy('contest.cid')
263 263
                 ->select('contest.*')
@@ -809,13 +809,13 @@  discard block
 block discarded – undo
809 809
         if(time() < $end_time){
810 810
             if($clearance == 3){
811 811
                 $contestRankRaw=Cache::tags(['contest', 'rank'])->get("contestAdmin$cid");
812
-            }else{
812
+            } else{
813 813
                 $contestRankRaw=Cache::tags(['contest', 'rank'])->get($cid);
814 814
             }
815 815
             if(!isset($contestRankRaw)){
816 816
                 $contestRankRaw=$contest_eloquent->rankRefresh();
817 817
             }
818
-        }else{
818
+        } else{
819 819
             if($clearance == 3){
820 820
                 $contestRankRaw=Cache::tags(['contest', 'rank'])->get("contestAdmin$cid");
821 821
                 if (!isset($contestRankRaw)) {
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
                         $this->storeContestRankInMySQL($cid, $contestRankRaw);
826 826
                     }
827 827
                 }
828
-            }else{
828
+            } else{
829 829
                 $contestRankRaw=$this->getContestRankFromMySQL($cid);
830 830
                 if(!isset($contestRankRaw)){
831 831
                     $contestRankRaw=Cache::tags(['contest', 'rank'])->get($cid);
@@ -910,7 +910,7 @@  discard block
 block discarded – undo
910 910
             return DB::table("contest_clarification")->where([
911 911
                 "cid"=>$cid
912 912
             ])->orderBy('create_time', 'desc')->get()->all();
913
-        }else{
913
+        } else{
914 914
             return DB::table("contest_clarification")->where([
915 915
                 "cid"=>$cid
916 916
             ])->where(function ($query) {
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
1075 1075
         $filter['pid'] = array_search($filter['ncode'], array_column($problemSet_temp, 'ncode'));
1076 1076
         if($filter['pid']==false){
1077 1077
             $filter['pid'] = null;
1078
-        }else{
1078
+        } else{
1079 1079
             $filter['pid'] = $problemSet_temp[$filter['pid']]['pid'];
1080 1080
         }
1081 1081
 
@@ -1183,7 +1183,7 @@  discard block
 block discarded – undo
1183 1183
                     "records"=>[]
1184 1184
                 ];
1185 1185
             }
1186
-        }else{
1186
+        } else{
1187 1187
             if ($basicInfo["status_visibility"]==2) {
1188 1188
                 // View all
1189 1189
                 $paginator=DB::table("submission")->where([
@@ -1433,7 +1433,7 @@  discard block
 block discarded – undo
1433 1433
             if($ratingCalculator->calculate()){
1434 1434
                 $ratingCalculator->storage();
1435 1435
                 return true;
1436
-            }else{
1436
+            } else{
1437 1437
                 return false;
1438 1438
             }
1439 1439
         } else {
@@ -1482,7 +1482,7 @@  discard block
 block discarded – undo
1482 1482
             $contestRankRaw = $this->contestRankCache($cid);
1483 1483
             Cache::tags(['contest', 'rank'])->put($cid, $contestRankRaw);
1484 1484
             Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $contestRankRaw);
1485
-        }else{
1485
+        } else{
1486 1486
             DB::table($this->tableName)
1487 1487
                 ->where('cid',$cid)
1488 1488
                 ->update($data);
@@ -1584,8 +1584,7 @@  discard block
 block discarded – undo
1584 1584
                     if(time() > $chache['end_time']){
1585 1585
                         $this->storeContestRankInMySQL($cid, $ret);
1586 1586
                     }
1587
-                }
1588
-                else{
1587
+                } else{
1589 1588
                     $ret=[];
1590 1589
                     $chache=[];
1591 1590
                     $chache['contest_info']=DB::table("contest")->where("cid", $cid)->first();
@@ -1600,7 +1599,7 @@  discard block
 block discarded – undo
1600 1599
                             "cid"=>$cid,
1601 1600
                             "audit"=>1
1602 1601
                         ])->select('uid')->get()->all();
1603
-                    }else{
1602
+                    } else{
1604 1603
                         $submissionUsers=DB::table("submission")->where([
1605 1604
                             "cid"=>$cid
1606 1605
                         ])->where(
@@ -1635,9 +1634,9 @@  discard block
 block discarded – undo
1635 1634
                     Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $retAdmin);
1636 1635
                 }
1637 1636
             }
1638
-        }catch(LockTimeoutException $e){
1637
+        } catch(LockTimeoutException $e){
1639 1638
             Log::warning("Contest Rank Lock Timed Out");
1640
-        }finally{
1639
+        } finally{
1641 1640
             optional($lock)->release();
1642 1641
         }
1643 1642
     }
@@ -1660,7 +1659,7 @@  discard block
 block discarded – undo
1660 1659
                     return 1;
1661 1660
                 }
1662 1661
             });
1663
-        }else if ($contest_info["rule"]==2){
1662
+        } else if ($contest_info["rule"]==2){
1664 1663
             usort($ret, function ($a, $b) {
1665 1664
                 if ($a["score"]==$b["score"]) {
1666 1665
                     if ($a["solved"]==$b["solved"]) {
@@ -1684,8 +1683,9 @@  discard block
 block discarded – undo
1684 1683
     {
1685 1684
         $id = count($ret);
1686 1685
         foreach($ret as $key => $r){
1687
-            if($r['uid'] == $uid)
1688
-                $id = $key;
1686
+            if($r['uid'] == $uid) {
1687
+                            $id = $key;
1688
+            }
1689 1689
         }
1690 1690
         if ($contest_info["rule"]==1) {
1691 1691
             // ACM/ICPC Mode
@@ -1693,7 +1693,7 @@  discard block
 block discarded – undo
1693 1693
                 $prob_detail = [];
1694 1694
                 $totPen = 0;
1695 1695
                 $totScore = 0;
1696
-            }else{
1696
+            } else{
1697 1697
                 $prob_detail = $ret[$id]['problem_detail'];
1698 1698
                 $totPen=$ret[$id]['penalty'];
1699 1699
                 $totScore=$ret[$id]['score'];
@@ -1748,7 +1748,7 @@  discard block
 block discarded – undo
1748 1748
                 $prob_detail = [];
1749 1749
                 $totSolved = 0;
1750 1750
                 $totScore = 0;
1751
-            }else{
1751
+            } else{
1752 1752
                 $prob_detail = $ret[$id]['problem_detail'];
1753 1753
                 $totSolved=$ret[$id]['solved'];
1754 1754
                 $totScore=$ret[$id]['score'];
@@ -1811,18 +1811,18 @@  discard block
 block discarded – undo
1811 1811
                 return false;
1812 1812
             }
1813 1813
             return true;
1814
-        }else if($status === 0){
1814
+        } else if($status === 0){
1815 1815
             if($begin_time_new !== null){
1816 1816
                 return false;
1817 1817
             }
1818 1818
             if($end_time_new !== null){
1819 1819
                 if(strtotime($end_time_new) <= time()){
1820 1820
                     return false;
1821
-                }else{
1821
+                } else{
1822 1822
                     return true;
1823 1823
                 }
1824 1824
             }
1825
-        }else{
1825
+        } else{
1826 1826
             return false;
1827 1827
         }
1828 1828
 
@@ -1843,8 +1843,7 @@  discard block
 block discarded – undo
1843 1843
             return DB::table("contest_clarification")->where('ccid','=',$ccid)->update([
1844 1844
                 "public"=>1
1845 1845
             ]);
1846
-        }
1847
-        else
1846
+        } else
1848 1847
         {
1849 1848
             return DB::table("contest_clarification")->where('ccid','=',$ccid)->update([
1850 1849
                 "public"=>0
@@ -1868,7 +1867,7 @@  discard block
 block discarded – undo
1868 1867
             ->whereIn('pid',array_column($contestRank[0]['problem_detail'],'pid'))
1869 1868
             ->select('pid','title')
1870 1869
             ->get()->all();
1871
-        }else{
1870
+        } else{
1872 1871
             $all_problems = [];
1873 1872
         }
1874 1873
         $tags = DB::table('group_problem_tag')
@@ -1963,7 +1962,7 @@  discard block
 block discarded – undo
1963 1962
             return [
1964 1963
                 'result' => true
1965 1964
             ];
1966
-        }else{
1965
+        } else{
1967 1966
             return [
1968 1967
                 'result' => false,
1969 1968
                 'sid' => $submissions
Please login to merge, or discard this patch.