Passed
Branch feature/babel (9a8402)
by John
03:52
created
app/Jobs/ProcessSubmission.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 {
15 15
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
16 16
 
17
-    public $tries = 5;
17
+    public $tries=5;
18 18
     protected $all_data=[];
19 19
 
20 20
     /**
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
     public function failed()
42 42
     {
43
-        $submissionModel = new SubmissionModel();
43
+        $submissionModel=new SubmissionModel();
44 44
         $submissionModel->updateSubmission($this->all_data["sid"], ["verdict"=>"Submission Error"]);
45 45
     }
46 46
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/SubmissionController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -57,14 +57,14 @@
 block discarded – undo
57 57
             return ResponseModel::err(3002);
58 58
         }
59 59
         $submissionModel=new SubmissionModel();
60
-        if($all_data["method"]==1){
60
+        if ($all_data["method"]==1) {
61 61
             // NOJ Share
62 62
             $status=$submissionModel->share($all_data["sid"], Auth::check() ? Auth::user()->id : null);
63
-            return empty($status)?ResponseModel::err(1001):ResponseModel::success(200, null, $status);
64
-        } elseif($all_data["method"]==2){
63
+            return empty($status) ?ResponseModel::err(1001) : ResponseModel::success(200, null, $status);
64
+        } elseif ($all_data["method"]==2) {
65 65
             // Pastebin
66 66
             $status=$submissionModel->sharePB($all_data["sid"], Auth::check() ? Auth::user()->id : null);
67
-            return empty($status)?ResponseModel::err(1001):ResponseModel::success(200, null, $status);
67
+            return empty($status) ?ResponseModel::err(1001) : ResponseModel::success(200, null, $status);
68 68
         } else {
69 69
             return ResponseModel::err(6002);
70 70
         }
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/ProblemController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
         if (empty($basic)) {
112 112
             return ResponseModel::err(3001);
113 113
         }
114
-        $ret=$problemModel->addSolution($pid,Auth::user()->id,$content);
115
-        return $ret?ResponseModel::success(200):ResponseModel::err(3003);
114
+        $ret=$problemModel->addSolution($pid, Auth::user()->id, $content);
115
+        return $ret ?ResponseModel::success(200) : ResponseModel::err(3003);
116 116
     }
117 117
     /**
118 118
      * The Ajax Problem Solution Discussion Update.
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
127 127
         $problemModel=new ProblemModel();
128 128
         $psoid=$all_data["psoid"];
129 129
         $content=$all_data["content"];
130
-        $ret=$problemModel->updateSolution($psoid,Auth::user()->id,$content);
131
-        return $ret?ResponseModel::success(200):ResponseModel::err(3004);
130
+        $ret=$problemModel->updateSolution($psoid, Auth::user()->id, $content);
131
+        return $ret ?ResponseModel::success(200) : ResponseModel::err(3004);
132 132
     }
133 133
     /**
134 134
      * The Ajax Problem Solution Discussion Delete.
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
         $all_data=$request->all();
143 143
         $problemModel=new ProblemModel();
144 144
         $psoid=$all_data["psoid"];
145
-        $ret=$problemModel->removeSolution($psoid,Auth::user()->id);
146
-        return $ret?ResponseModel::success(200):ResponseModel::err(3004);
145
+        $ret=$problemModel->removeSolution($psoid, Auth::user()->id);
146
+        return $ret ?ResponseModel::success(200) : ResponseModel::err(3004);
147 147
     }
148 148
     /**
149 149
      * The Ajax Problem Solution Discussion Vote.
@@ -158,8 +158,8 @@  discard block
 block discarded – undo
158 158
         $problemModel=new ProblemModel();
159 159
         $psoid=$all_data["psoid"];
160 160
         $type=$all_data["type"];
161
-        $ret=$problemModel->voteSolution($psoid,Auth::user()->id,$type);
162
-        return $ret["ret"]?ResponseModel::success(200,null,["votes"=>$ret["votes"],"select"=>$ret["select"]]):ResponseModel::err(3004);
161
+        $ret=$problemModel->voteSolution($psoid, Auth::user()->id, $type);
162
+        return $ret["ret"] ?ResponseModel::success(200, null, ["votes"=>$ret["votes"], "select"=>$ret["select"]]) : ResponseModel::err(3004);
163 163
     }
164 164
     /**
165 165
      * The Ajax Problem Solution Submit.
Please login to merge, or discard this patch.
app/Models/JudgerModel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
     {
62 62
         $curl=curl_init();
63 63
 
64
-        if($curl===false) return [];
64
+        if ($curl===false) return [];
65 65
 
66 66
         curl_setopt_array($curl, array(
67 67
             CURLOPT_PORT => $port,
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/ForgotPasswordController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
      */
38 38
     public function showLinkRequestForm()
39 39
     {
40
-        return view('auth.passwords.email',[
40
+        return view('auth.passwords.email', [
41 41
             'page_title'=>"Reset Password",
42 42
             'site_title'=>"NOJ",
43 43
             'navigation' => "Account"
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/ResetPasswordController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@
 block discarded – undo
52 52
      * @param  string|null  $token
53 53
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
54 54
      */
55
-    public function showResetForm(Request $request, $token = null)
55
+    public function showResetForm(Request $request, $token=null)
56 56
     {
57
-        return view('auth.passwords.reset',[
57
+        return view('auth.passwords.reset', [
58 58
             'token' => $token,
59 59
             'email' => $request->email,
60 60
             'page_title'=>"Reset Password",
Please login to merge, or discard this patch.
app/Models/RankModel.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 use Illuminate\Support\Facades\DB;
8 8
 use Illuminate\Support\Arr;
9 9
 use App\Models\Rating\RatingCalculator;
10
-use Cache,Redis;
10
+use Cache, Redis;
11 11
 
12 12
 class RankModel extends Model
13 13
 {
@@ -65,26 +65,26 @@  discard block
 block discarded – undo
65 65
 
66 66
     public static function getColor($rankTitle)
67 67
     {
68
-        if(is_null($rankTitle)) return "";
68
+        if (is_null($rankTitle)) return "";
69 69
         return self::$casualRanking[$rankTitle];
70 70
     }
71 71
 
72 72
     public static function getProfessionalColor($rankTitle)
73 73
     {
74
-        if(is_null($rankTitle)) return self::$professionalRanking["None"];
74
+        if (is_null($rankTitle)) return self::$professionalRanking["None"];
75 75
         return self::$professionalRanking[$rankTitle];
76 76
     }
77 77
 
78 78
     public function list()
79 79
     {
80 80
         $rankList=Cache::tags(['rank'])->get('general');
81
-        $userInfoRaw=DB::table("users")->select("id as uid","avatar","name")->get()->all();
81
+        $userInfoRaw=DB::table("users")->select("id as uid", "avatar", "name")->get()->all();
82 82
         $userInfo=[];
83
-        foreach($userInfoRaw as $u){
83
+        foreach ($userInfoRaw as $u) {
84 84
             $userInfo[$u["uid"]]=$u;
85 85
         }
86
-        foreach($rankList as &$r){
87
-            $r["details"]=isset($userInfo[$r["uid"]])?$userInfo[$r["uid"]]:[];
86
+        foreach ($rankList as &$r) {
87
+            $r["details"]=isset($userInfo[$r["uid"]]) ? $userInfo[$r["uid"]] : [];
88 88
         }
89 89
         // var_dump($rankList); exit();
90 90
         return $rankList;
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
                     $rankSolved=$rankItem["totValue"];
108 108
                 }
109 109
                 $rankTitle=$this->getRankTitle($rankValue);
110
-                Cache::tags(['rank',$rankItem["uid"]])->put("rank", $rankValue, 86400);
111
-                Cache::tags(['rank',$rankItem["uid"]])->put("title", $rankTitle, 86400);
110
+                Cache::tags(['rank', $rankItem["uid"]])->put("rank", $rankValue, 86400);
111
+                Cache::tags(['rank', $rankItem["uid"]])->put("title", $rankTitle, 86400);
112 112
                 $rankListCached[]=[
113 113
                     "uid"=>$rankItem["uid"],
114 114
                     "rank"=>$rankValue,
@@ -125,14 +125,14 @@  discard block
 block discarded – undo
125 125
 
126 126
     public function getProfessionalRanking()
127 127
     {
128
-        $professionalRankList = [];
129
-        $verifiedUsers = DB::table("users")->select("professional_rate","id as uid","avatar","name")->get()->all();
130
-        $rankIter = 0;
131
-        foreach($verifiedUsers as $user) {
132
-            $rankVal = $user['professional_rate'];
133
-            $rankTitle = self::getProfessionalTitle($rankVal);
134
-            $titleColor = self::getProfessionalColor($rankTitle);
135
-            $professionalRankList[$rankIter++] = [
128
+        $professionalRankList=[];
129
+        $verifiedUsers=DB::table("users")->select("professional_rate", "id as uid", "avatar", "name")->get()->all();
130
+        $rankIter=0;
131
+        foreach ($verifiedUsers as $user) {
132
+            $rankVal=$user['professional_rate'];
133
+            $rankTitle=self::getProfessionalTitle($rankVal);
134
+            $titleColor=self::getProfessionalColor($rankTitle);
135
+            $professionalRankList[$rankIter++]=[
136 136
                 "name"=>$user["name"],
137 137
                 "uid"=>$user["uid"],
138 138
                 "avatar"=>$user["avatar"],
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
                 $tot+=$c;
155 155
             }
156 156
             foreach ($this->casualRankingPer as &$c) {
157
-                $c=round($c*$totUsers/$tot);
157
+                $c=round($c * $totUsers / $tot);
158 158
                 $cur+=$c;
159 159
                 $c=$cur;
160 160
             }
@@ -165,16 +165,16 @@  discard block
 block discarded – undo
165 165
 
166 166
     public function getRankTitle($rankVal)
167 167
     {
168
-        foreach($this->casualRankingPer as $title=>$c){
169
-            if($rankVal<=$c) return $title;
168
+        foreach ($this->casualRankingPer as $title=>$c) {
169
+            if ($rankVal<=$c) return $title;
170 170
         }
171 171
         return Arr::last($this->casualRankingPer);
172 172
     }
173 173
 
174 174
     public static function getProfessionalTitle($rankVal)
175 175
     {
176
-        foreach(self::$professionalRankingPer as $title=>$point) {
177
-            if($rankVal >= $point) return $title;
176
+        foreach (self::$professionalRankingPer as $title=>$point) {
177
+            if ($rankVal>=$point) return $title;
178 178
         }
179 179
         return Arr::last(self::$professionalRankingPer);
180 180
     }
Please login to merge, or discard this patch.
app/Http/Controllers/GroupController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
         $groupModel=new GroupModel();
40 40
         $contestModel=new ContestModel();
41 41
         $basic_info=$groupModel->details($gcode);
42
-        if(empty($basic_info)) return Redirect::route('group_index');
42
+        if (empty($basic_info)) return Redirect::route('group_index');
43 43
         $my_profile=$groupModel->userProfile(Auth::user()->id, $basic_info["gid"]);
44 44
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
45 45
         $member_list=$groupModel->userList($basic_info["gid"]);
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/ContestController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
         $all_data=$request->all();
45 45
 
46 46
         $contestModel=new ContestModel();
47
-        return $contestModel->updateProfessionalRate($all_data["cid"])?ResponseModel::success(200):ResponseModel::err(1001);
47
+        return $contestModel->updateProfessionalRate($all_data["cid"]) ?ResponseModel::success(200) : ResponseModel::err(1001);
48 48
     }
49 49
 
50 50
     public function requestClarification(Request $request)
@@ -101,16 +101,16 @@  discard block
 block discarded – undo
101 101
         $groupModel=new GroupModel();
102 102
         $basic=$contestModel->basic($all_data["cid"]);
103 103
 
104
-        if(!$basic["registration"]){
104
+        if (!$basic["registration"]) {
105 105
             return ResponseModel::err(4003);
106 106
         }
107
-        if(strtotime($basic["registration_due"])<time()){
107
+        if (strtotime($basic["registration_due"])<time()) {
108 108
             return ResponseModel::err(4004);
109 109
         }
110
-        if(!$basic["registant_type"]){
110
+        if (!$basic["registant_type"]) {
111 111
             return ResponseModel::err(4005);
112 112
         }
113
-        if($basic["registant_type"]==1 && !$groupModel->isMember($basic["gid"], Auth::user()->id)){
113
+        if ($basic["registant_type"]==1 && !$groupModel->isMember($basic["gid"], Auth::user()->id)) {
114 114
             return ResponseModel::err(4005);
115 115
         }
116 116
 
Please login to merge, or discard this patch.