Passed
Pull Request — master (#184)
by Chenyi
03:56
created
app/Models/JudgerModel.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,9 @@
 block discarded – undo
61 61
     {
62 62
         $curl=curl_init();
63 63
 
64
-        if($curl===false) return [];
64
+        if($curl===false) {
65
+            return [];
66
+        }
65 67
 
66 68
         curl_setopt_array($curl, array(
67 69
             CURLOPT_PORT => $port,
Please login to merge, or discard this patch.
app/Models/Rating/RatingCalculator.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
             $mid = floor(($right + $left)/2);
79 79
             if($this->getSeed($mid) < $rank){
80 80
                 $right = $mid;
81
-            }else{
81
+            } else{
82 82
                 $left = $mid;
83 83
             }
84 84
         }
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/AccountController.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
         if(empty($last_send) || time() - $last_send >= 300){
91 91
             $request->session()->put('last_email_send',time());
92 92
             return ResponseModel::success(200,null,0);
93
-        }else{
93
+        } else{
94 94
             $cooldown =  300 - (time() - $last_send);
95 95
             return ResponseModel::success(200,null,$cooldown);
96 96
         }
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
         foreach ($input as $key => $value) {
110 110
             if(strlen($value) != 0){
111 111
                 $account_model->setExtra($user_id,$key,$value,0);
112
-            }else{
112
+            } else{
113 113
                 $account_model->setExtra($user_id,$key,null);
114 114
             }
115 115
         }
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
         foreach ($input as $key => $value) {
130 130
             if(strlen($value) != 0){
131 131
                 $account_model->setExtra($user_id,$key,$value,0);
132
-            }else{
132
+            } else{
133 133
                 $account_model->setExtra($user_id,$key,null);
134 134
             }
135 135
         }
Please login to merge, or discard this patch.
app/Babel/Submit/Submitter.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,9 @@
 block discarded – undo
35 35
         ];
36 36
 
37 37
         $submitter=self::create($this->post_data["oj"], $sub, $all_data);
38
-        if(!is_null($submitter)) $submitter->submit();
38
+        if(!is_null($submitter)) {
39
+            $submitter->submit();
40
+        }
39 41
 
40 42
         // insert submission
41 43
 
Please login to merge, or discard this patch.
app/Models/AccountModel.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
                     }
156 156
                 }
157 157
                 return null;
158
-            }else{
158
+            } else{
159 159
                 foreach ($ret as $value) {
160 160
                     if(empty($value['secret_level']) || $value['secret_level'] <= $secret_level){
161 161
                         $key_name = $this->user_extra[$value['key']] ?? 'unknown';
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
             unset($ret['id']);
188 188
             if(!is_null($value)){
189 189
                 $ret['value'] = $value;
190
-            }else{
190
+            } else{
191 191
                 DB::table('users_extra')->where('uid',$uid)->where('key',$key)->delete();
192 192
                 return true;
193 193
             }
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
                 $ret['secret_level'] = $secret_level;
196 196
             }
197 197
             return DB::table('users_extra')->where('uid',$uid)->where('key',$key)->update($ret);
198
-        }else{
198
+        } else{
199 199
             if($value === null){
200 200
                 return true;
201 201
             }
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
         $key = array_search($key,$this->user_extra);
221 221
         if($key){
222 222
             return DB::table('users_extra')->where('key',$key)->where('value',$value)->first();
223
-        }else{
223
+        } else{
224 224
             return null;
225 225
         }
226 226
     }
Please login to merge, or discard this patch.
app/Http/Controllers/ProblemController.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,9 @@
 block discarded – undo
132 132
         }
133 133
 
134 134
         $editor_left_width = $account->getExtra(Auth::user()->id, 'editor_left_width');
135
-        if(empty($editor_left_width)) $editor_left_width='40';
135
+        if(empty($editor_left_width)) {
136
+            $editor_left_width='40';
137
+        }
136 138
 
137 139
         return is_null($prob_detail) ?  redirect("/problem") : view('problem.editor', [
138 140
                                             'page_title'=>$prob_detail["title"],
Please login to merge, or discard this patch.
app/Models/Rating/GroupRatingCalculator.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
             $mid = floor(($right + $left)/2);
79 79
             if($this->getSeed($mid) < $rank){
80 80
                 $right = $mid;
81
-            }else{
81
+            } else{
82 82
                 $left = $mid;
83 83
             }
84 84
         }
Please login to merge, or discard this patch.
app/Models/ContestModel.php 1 patch
Braces   +22 added lines, -23 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
                     $paginator=$paginator->where(["practice"=>$filter['practice']]);
212 212
                 }
213 213
                 $paginator = $paginator ->paginate(10);
214
-            }elseif($filter['public']=='0'){
214
+            } elseif($filter['public']=='0'){
215 215
                 $paginator=DB::table('group_member')
216 216
                 ->groupBy('contest.cid')
217 217
                 ->select('contest.*')
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
                 )
242 242
                 ->orderBy('contest.begin_time', 'desc')
243 243
                 ->paginate(10);
244
-            }else{
244
+            } else{
245 245
                 $paginator=DB::table('group_member')
246 246
                 ->groupBy('contest.cid')
247 247
                 ->select('contest.*')
@@ -786,19 +786,19 @@  discard block
 block discarded – undo
786 786
         if(time() < $end_time){
787 787
             if($clearance == 3){
788 788
                 $contestRankRaw=Cache::tags(['contest', 'rank'])->get("contestAdmin$cid");
789
-            }else{
789
+            } else{
790 790
                 $contestRankRaw=Cache::tags(['contest', 'rank'])->get($cid);
791 791
             }
792 792
             if(!isset($contestRankRaw)){
793 793
                 $contestRankRaw=$this->contestRankCache($cid);
794 794
             }
795
-        }else{
795
+        } else{
796 796
             if($clearance == 3){
797 797
                 $contestRankRaw=Cache::tags(['contest', 'rank'])->get("contestAdmin$cid");
798 798
                 if (!isset($contestRankRaw)) {
799 799
                     $contestRankRaw=$this->contestRankCache($cid);
800 800
                 }
801
-            }else{
801
+            } else{
802 802
                 $contestRankRaw=$this->getContestRankFromMySQL($cid);
803 803
                 if(!isset($contestRankRaw)){
804 804
                     $contestRankRaw=Cache::tags(['contest', 'rank'])->get($cid);
@@ -872,7 +872,7 @@  discard block
 block discarded – undo
872 872
             return DB::table("contest_clarification")->where([
873 873
                 "cid"=>$cid
874 874
             ])->orderBy('create_time', 'desc')->get()->all();
875
-        }else{
875
+        } else{
876 876
             return DB::table("contest_clarification")->where([
877 877
                 "cid"=>$cid
878 878
             ])->where(function ($query) {
@@ -1105,7 +1105,7 @@  discard block
 block discarded – undo
1105 1105
                     "records"=>[]
1106 1106
                 ];
1107 1107
             }
1108
-        }else{
1108
+        } else{
1109 1109
             if ($basicInfo["status_visibility"]==2) {
1110 1110
                 // View all
1111 1111
                 $paginator=DB::table("submission")->where([
@@ -1327,7 +1327,7 @@  discard block
 block discarded – undo
1327 1327
             if($ratingCalculator->calculate()){
1328 1328
                 $ratingCalculator->storage();
1329 1329
                 return true;
1330
-            }else{
1330
+            } else{
1331 1331
                 return false;
1332 1332
             }
1333 1333
         } else {
@@ -1424,8 +1424,7 @@  discard block
 block discarded – undo
1424 1424
                         Cache::tags(['contest', 'rank'])->put($cid, $ret);
1425 1425
                     }
1426 1426
                     Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $ret);
1427
-                }
1428
-                else{
1427
+                } else{
1429 1428
                     $ret=[];
1430 1429
                     $chache=[];
1431 1430
                     $chache['contest_info']=DB::table("contest")->where("cid", $cid)->first();
@@ -1442,7 +1441,7 @@  discard block
 block discarded – undo
1442 1441
                             "cid"=>$cid,
1443 1442
                             "audit"=>1
1444 1443
                         ])->select('uid')->get()->all();
1445
-                    }else{
1444
+                    } else{
1446 1445
                         $submissionUsers=DB::table("submission")->where([
1447 1446
                             "cid"=>$cid
1448 1447
                         ])->where(
@@ -1477,9 +1476,9 @@  discard block
 block discarded – undo
1477 1476
                     Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $retAdmin);
1478 1477
                 }
1479 1478
             }
1480
-        }catch(LockTimeoutException $e){
1479
+        } catch(LockTimeoutException $e){
1481 1480
             Log::warning("Contest Rank Lock Timed Out");
1482
-        }finally{
1481
+        } finally{
1483 1482
             optional($lock)->release();
1484 1483
         }
1485 1484
     }
@@ -1502,7 +1501,7 @@  discard block
 block discarded – undo
1502 1501
                     return 1;
1503 1502
                 }
1504 1503
             });
1505
-        }else if ($contest_info["rule"]==2){
1504
+        } else if ($contest_info["rule"]==2){
1506 1505
             usort($ret, function ($a, $b) {
1507 1506
                 if ($a["score"]==$b["score"]) {
1508 1507
                     if ($a["solved"]==$b["solved"]) {
@@ -1526,8 +1525,9 @@  discard block
 block discarded – undo
1526 1525
     {
1527 1526
         $id = count($ret);
1528 1527
         foreach($ret as $key => $r){
1529
-            if($r['uid'] == $uid)
1530
-                $id = $key;
1528
+            if($r['uid'] == $uid) {
1529
+                            $id = $key;
1530
+            }
1531 1531
         }
1532 1532
         if ($contest_info["rule"]==1) {
1533 1533
             // ACM/ICPC Mode
@@ -1535,7 +1535,7 @@  discard block
 block discarded – undo
1535 1535
                     $prob_detail = [];
1536 1536
                     $totPen = 0;
1537 1537
                     $totScore = 0;
1538
-                }else{
1538
+                } else{
1539 1539
                     $prob_detail = $ret[$id]['problem_detail'];
1540 1540
                     $totPen=$ret[$id]['penalty'];
1541 1541
                     $totScore=$ret[$id]['score'];
@@ -1575,7 +1575,7 @@  discard block
 block discarded – undo
1575 1575
                 $prob_detail = [];
1576 1576
                 $totSolved = 0;
1577 1577
                 $totScore = 0;
1578
-            }else{
1578
+            } else{
1579 1579
                 $prob_detail = $ret[$id]['problem_detail'];
1580 1580
                 $totSolved=$ret[$id]['solved'];
1581 1581
                 $totScore=$ret[$id]['score'];
@@ -1638,18 +1638,18 @@  discard block
 block discarded – undo
1638 1638
                 return false;
1639 1639
             }
1640 1640
             return true;
1641
-        }else if($status === 0){
1641
+        } else if($status === 0){
1642 1642
             if($begin_time_new !== null){
1643 1643
                 return false;
1644 1644
             }
1645 1645
             if($end_time_new !== null){
1646 1646
                 if(strtotime($end_time_new) <= time()){
1647 1647
                     return false;
1648
-                }else{
1648
+                } else{
1649 1649
                     return true;
1650 1650
                 }
1651 1651
             }
1652
-        }else{
1652
+        } else{
1653 1653
             return false;
1654 1654
         }
1655 1655
 
@@ -1670,8 +1670,7 @@  discard block
 block discarded – undo
1670 1670
             return DB::table("contest_clarification")->where('ccid','=',$ccid)->update([
1671 1671
                 "public"=>1
1672 1672
             ]);
1673
-        }
1674
-        else
1673
+        } else
1675 1674
         {
1676 1675
             return DB::table("contest_clarification")->where('ccid','=',$ccid)->update([
1677 1676
                 "public"=>0
Please login to merge, or discard this patch.
app/Babel/Install/InstallerBase.php 1 patch
Braces   +27 added lines, -15 removed lines patch added patch discarded remove patch
@@ -23,8 +23,12 @@  discard block
 block discarded – undo
23 23
         $babelConfig=json_decode(file_get_contents(babel_path("Extension/$ocode/babel.json")),true);
24 24
 
25 25
         // support __cur__ variables
26
-        if($babelConfig["version"]=="__cur__") $babelConfig["version"]=explode("-",version())[0];
27
-        if($babelConfig["require"]["NOJ"]=="__cur__") $babelConfig["require"]["NOJ"]=explode("-",version())[0];
26
+        if($babelConfig["version"]=="__cur__") {
27
+            $babelConfig["version"]=explode("-",version())[0];
28
+        }
29
+        if($babelConfig["require"]["NOJ"]=="__cur__") {
30
+            $babelConfig["require"]["NOJ"]=explode("-",version())[0];
31
+        }
28 32
 
29 33
         // check version info
30 34
         if(!isset($babelConfig["version"]) || is_null($babelConfig["version"]) || trim($babelConfig["version"])==""){
@@ -120,11 +124,11 @@  discard block
 block discarded – undo
120 124
         try {
121 125
             if (isset($babelConfig["custom"]["css"]) && !is_null($babelConfig["custom"]["css"]) && trim($babelConfig["custom"]["css"])!="") {
122 126
                 $cssPath=babel_path("Extension/$ocode/".$babelConfig["custom"]["css"]);
123
-            }else{
127
+            } else{
124 128
                 $cssPath=null;
125 129
             }
126 130
             $this->applyCustom($ocode, $cssPath);
127
-        }catch(Exception $e){
131
+        } catch(Exception $e){
128 132
             DB::rollback();
129 133
             $this->command->line("\n  <bg=red;fg=white> Unable to add an custom css for this extension, aborting. </>\n");
130 134
             return;
@@ -136,7 +140,7 @@  discard block
 block discarded – undo
136 140
             $imgPath=babel_path("Extension/$ocode/".$babelConfig["icon"]);
137 141
             $storePath=$this->applyIcon($ocode, $imgPath);
138 142
             OJModel::updateOJ($this->oid,["logo"=>$storePath]);
139
-        }catch(Exception $e){
143
+        } catch(Exception $e){
140 144
             DB::rollback();
141 145
             $this->command->line("\n  <bg=red;fg=white> Unable to add an icon for this extension, aborting. </>\n");
142 146
             return;
@@ -178,22 +182,30 @@  discard block
 block discarded – undo
178 182
                     "available"=>1,
179 183
                     "deleted"=>0
180 184
                 ]);
181
-            }elseif($m["method"]=="modify"){
185
+            } elseif($m["method"]=="modify"){
182 186
                 $modifyItem=[];
183
-                if(isset($m["compability"])) $modifyItem["comp"]=$m["compability"];
184
-                if(isset($m["language"])) $modifyItem["lang"]=$m["language"];
185
-                if(isset($m["icon"])) $modifyItem["icon"]=$m["icon"];
186
-                if(isset($m["display"])) $modifyItem["display_name"]=$m["display"];
187
+                if(isset($m["compability"])) {
188
+                    $modifyItem["comp"]=$m["compability"];
189
+                }
190
+                if(isset($m["language"])) {
191
+                    $modifyItem["lang"]=$m["language"];
192
+                }
193
+                if(isset($m["icon"])) {
194
+                    $modifyItem["icon"]=$m["icon"];
195
+                }
196
+                if(isset($m["display"])) {
197
+                    $modifyItem["display_name"]=$m["display"];
198
+                }
187 199
                 CompilerModel::modify([
188 200
                     "oid"=>$this->oid,
189 201
                     "lcode"=>$m["code"],
190 202
                 ], $modifyItem);
191
-            }elseif($m["method"]=="remove"){
203
+            } elseif($m["method"]=="remove"){
192 204
                 CompilerModel::remove([
193 205
                     "oid"=>$this->oid,
194 206
                     "lcode"=>$m["code"],
195 207
                 ]);
196
-            }else{
208
+            } else{
197 209
                 continue;
198 210
             }
199 211
         }
@@ -205,7 +217,7 @@  discard block
 block discarded – undo
205 217
         $storePath=base_path("public/static/img/oj/$ocode/");
206 218
         if(is_dir($storePath)) {
207 219
             $this->delFile($storePath);
208
-        }else{
220
+        } else{
209 221
             mkdir($storePath);
210 222
         }
211 223
         file_put_contents($storePath.basename($imgPath),file_get_contents($imgPath));
@@ -220,7 +232,7 @@  discard block
 block discarded – undo
220 232
         }
221 233
         if (is_null($cssPath)) {
222 234
             file_put_contents($storePath."$ocode.css", "\/*Silence is Golden*\/");
223
-        }else {
235
+        } else {
224 236
             file_put_contents($storePath."$ocode.css", file_get_contents($cssPath));
225 237
         }
226 238
     }
@@ -231,7 +243,7 @@  discard block
 block discarded – undo
231 243
                 if($item!= "." && $item != ".."){
232 244
                     if(file_exists($dirName.'/'.$item) && is_dir($dirName.'/'.$item)){
233 245
                         delFile($dirName.'/'.$item);
234
-                    }else{
246
+                    } else{
235 247
                         if(unlink($dirName.'/'.$item)){
236 248
                             return true;
237 249
                         }
Please login to merge, or discard this patch.