Passed
Pull Request — master (#583)
by
unknown
10:53
created
app/Http/Controllers/Contest/IndexController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
         $filter["rated"]=isset($all_data["rated"]) ? $all_data["rated"] : null;
28 28
         $filter["anticheated"]=isset($all_data["anticheated"]) ? $all_data["anticheated"] : null;
29 29
         $filter["practice"]=isset($all_data["practice"]) ? $all_data["practice"] : null;
30
-        $return_list=$contestModel->list($filter,Auth::check()?Auth::user()->id:0);
30
+        $return_list=$contestModel->list($filter, Auth::check() ?Auth::user()->id : 0);
31 31
         $featured=$contestModel->featured();
32 32
         if (is_null($return_list)) {
33 33
             if (isset($all_data["page"]) && $all_data["page"]>1) {
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
         $contestModel=new ContestModel();
67 67
         $groupModel=new GroupModel();
68 68
         $clearance=Auth::check() ? $contestModel->judgeClearance($cid, Auth::user()->id) : 0;
69
-        $basic = $contestModel->basic($cid);
69
+        $basic=$contestModel->basic($cid);
70 70
         if (Auth::check()) {
71 71
             $contest_detail=$contestModel->detail($cid, Auth::user()->id);
72 72
             $registration=$contestModel->registration($cid, Auth::user()->id);
Please login to merge, or discard this patch.
app/Babel/Extension/noj/JudgeClient.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
     }
65 65
     public function getLanguageConfigByLanguage($language, $spj=false)
66 66
     {
67
-        return $this->getLanguageConfigByKey($language.($spj?'_lang_spj_config':'_lang_config'));
67
+        return $this->getLanguageConfigByKey($language.($spj ? '_lang_spj_config' : '_lang_config'));
68 68
     }
69 69
     public function getLanguageConfigByKey($key)
70 70
     {
Please login to merge, or discard this patch.
app/Models/Search/ProblemSearchModel.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,20 +13,20 @@
 block discarded – undo
13 13
 
14 14
     public function search($key)
15 15
     {
16
-        $result = [];
17
-        if(strlen($key) >= 2){
18
-            $ret = self::where('pcode', $key)
19
-                ->orWhereRaw('MATCH(`title`) AGAINST (? IN BOOLEAN MODE)',[$key])
16
+        $result=[];
17
+        if (strlen($key)>=2) {
18
+            $ret=self::where('pcode', $key)
19
+                ->orWhereRaw('MATCH(`title`) AGAINST (? IN BOOLEAN MODE)', [$key])
20 20
                 ->select('pcode', 'title')
21 21
                 ->limit(120)
22 22
                 ->get()->all();
23
-            if(!empty($ret)){
24
-                $result += $ret;
23
+            if (!empty($ret)) {
24
+                $result+=$ret;
25 25
             }
26 26
         }
27
-        $problemModel = new ProblemModel();
27
+        $problemModel=new ProblemModel();
28 28
         foreach ($result as $p_index => $p) {
29
-            if($problemModel->isBlocked($p['pid']) || $problemModel->isHidden($p["pid"])){
29
+            if ($problemModel->isBlocked($p['pid']) || $problemModel->isHidden($p["pid"])) {
30 30
                 unset($result[$p_index]);
31 31
             }
32 32
         }
Please login to merge, or discard this patch.
app/Admin/Controllers/SubmissionController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
         $grid->column('sid', "ID")->sortable();
84 84
         $grid->time("Time");
85 85
         $grid->memory("Memory");
86
-        $grid->verdict("Verdict")->display(function ($verdict) {
86
+        $grid->verdict("Verdict")->display(function($verdict) {
87 87
             return '<i class="fa fa-circle '.$this->color.'"></i> '.$verdict;
88 88
         });
89 89
         $grid->language("Language");
90
-        $grid->submission_date("Submission Date")->display(function ($submission_date) {
90
+        $grid->submission_date("Submission Date")->display(function($submission_date) {
91 91
             return date("Y-m-d H:i:s", $submission_date);
92 92
         });
93 93
         ;
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
97 97
         $grid->jid("JID");
98 98
         $grid->coid("COID");
99 99
         $grid->score("Raw Score");
100
-        $grid->filter(function (Grid\Filter $filter) {
101
-            $filter->column(6, function ($filter) {
100
+        $grid->filter(function(Grid\Filter $filter) {
101
+            $filter->column(6, function($filter) {
102 102
                 $filter->like('verdict');
103 103
             });
104
-            $filter->column(6, function ($filter) {
104
+            $filter->column(6, function($filter) {
105 105
                 $filter->equal('cid', 'Contest ID');
106 106
                 $filter->equal('uid', 'User ID');
107 107
                 $filter->equal('pid', 'Problem ID');
@@ -138,14 +138,14 @@  discard block
 block discarded – undo
138 138
         $show->coid('COID');
139 139
         $show->vcid('VCID');
140 140
         $show->score();
141
-        $show->share()->using(['No','Yes']);
141
+        $show->share()->using(['No', 'Yes']);
142 142
         return $show;
143 143
     }
144 144
 
145 145
     private function codify($field, $lang=null)
146 146
     {
147
-        $field->unescape()->as(function ($value) use ($field,$lang) {
148
-            $field->border = false;
147
+        $field->unescape()->as(function($value) use ($field, $lang) {
148
+            $field->border=false;
149 149
             $hash=md5($value);
150 150
             if (blank($value)) {
151 151
                 $value=" ";
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
     {
187 187
         $form=new Form(new EloquentSubmissionModel);
188 188
         $form->model()->makeVisible('password');
189
-        $form->tab('Basic', function (Form $form) {
189
+        $form->tab('Basic', function(Form $form) {
190 190
             $form->display('sid');
191 191
             $form->text('time')->rules('required');
192 192
             $form->text('memory')->rules('required');
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/ProblemController.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -110,8 +110,8 @@  discard block
 block discarded – undo
110 110
         if (empty($basic)) {
111 111
             return ResponseModel::err(3001);
112 112
         }
113
-        $ret=$problemModel->addSolution($pid,Auth::user()->id,$content);
114
-        return $ret?ResponseModel::success(200):ResponseModel::err(3003);
113
+        $ret=$problemModel->addSolution($pid, Auth::user()->id, $content);
114
+        return $ret ?ResponseModel::success(200) : ResponseModel::err(3003);
115 115
     }
116 116
     /**
117 117
      * The Ajax Problem Solution Discussion Update.
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
         $problemModel=new ProblemModel();
127 127
         $psoid=$all_data["psoid"];
128 128
         $content=$all_data["content"];
129
-        $ret=$problemModel->updateSolution($psoid,Auth::user()->id,$content);
130
-        return $ret?ResponseModel::success(200):ResponseModel::err(3004);
129
+        $ret=$problemModel->updateSolution($psoid, Auth::user()->id, $content);
130
+        return $ret ?ResponseModel::success(200) : ResponseModel::err(3004);
131 131
     }
132 132
     /**
133 133
      * The Ajax Problem Solution Discussion Delete.
@@ -141,8 +141,8 @@  discard block
 block discarded – undo
141 141
         $all_data=$request->all();
142 142
         $problemModel=new ProblemModel();
143 143
         $psoid=$all_data["psoid"];
144
-        $ret=$problemModel->removeSolution($psoid,Auth::user()->id);
145
-        return $ret?ResponseModel::success(200):ResponseModel::err(3004);
144
+        $ret=$problemModel->removeSolution($psoid, Auth::user()->id);
145
+        return $ret ?ResponseModel::success(200) : ResponseModel::err(3004);
146 146
     }
147 147
     /**
148 148
      * The Ajax Problem Solution Discussion Vote.
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
         $problemModel=new ProblemModel();
158 158
         $psoid=$all_data["psoid"];
159 159
         $type=$all_data["type"];
160
-        $ret=$problemModel->voteSolution($psoid,Auth::user()->id,$type);
161
-        return $ret["ret"]?ResponseModel::success(200,null,["votes"=>$ret["votes"],"select"=>$ret["select"]]):ResponseModel::err(3004);
160
+        $ret=$problemModel->voteSolution($psoid, Auth::user()->id, $type);
161
+        return $ret["ret"] ?ResponseModel::success(200, null, ["votes"=>$ret["votes"], "select"=>$ret["select"]]) : ResponseModel::err(3004);
162 162
     }
163 163
     /**
164 164
      * The Ajax Problem Solution Submit.
@@ -252,8 +252,8 @@  discard block
 block discarded – undo
252 252
         if (empty($basic)) {
253 253
             return ResponseModel::err(3001);
254 254
         }
255
-        $ret=$problemModel->addDiscussion(Auth::user()->id,$pid,$title,$content);
256
-        return $ret?ResponseModel::success(200, null, $ret):ResponseModel::err(3003);
255
+        $ret=$problemModel->addDiscussion(Auth::user()->id, $pid, $title, $content);
256
+        return $ret ?ResponseModel::success(200, null, $ret) : ResponseModel::err(3003);
257 257
     }
258 258
 
259 259
     public function addComment(Request $request)
@@ -272,8 +272,8 @@  discard block
 block discarded – undo
272 272
         if (empty($basic)) {
273 273
             return ResponseModel::err(3001);
274 274
         }
275
-        $ret=$problemModel->addComment(Auth::user()->id,$pdid,$content,$reply_id);
276
-        return $ret?ResponseModel::success(200, null, $ret):ResponseModel::err(3003);
275
+        $ret=$problemModel->addComment(Auth::user()->id, $pdid, $content, $reply_id);
276
+        return $ret ?ResponseModel::success(200, null, $ret) : ResponseModel::err(3003);
277 277
     }
278 278
   
279 279
     /**
@@ -292,15 +292,15 @@  discard block
 block discarded – undo
292 292
 
293 293
         $submissionData=$submissionModel->basic($all_data["sid"]);
294 294
 
295
-        if($submissionData["uid"]!=Auth::user()->id){
295
+        if ($submissionData["uid"]!=Auth::user()->id) {
296 296
             return ResponseModel::err(2001);
297 297
         }
298 298
 
299
-        if($submissionData["verdict"]!="Submission Error"){
299
+        if ($submissionData["verdict"]!="Submission Error") {
300 300
             return ResponseModel::err(6003);
301 301
         }
302 302
 
303
-        $submissionModel->updateSubmission($all_data["sid"],[
303
+        $submissionModel->updateSubmission($all_data["sid"], [
304 304
             "verdict"=>"Pending",
305 305
             "time"=>0,
306 306
             "memory"=>0
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/GroupManageController.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
         $all_data=$request->all();
37 37
 
38
-        if(($all_data['public'] ?? 0) && ($all_data['practice'] ?? 0)){
38
+        if (($all_data['public'] ?? 0) && ($all_data['practice'] ?? 0)) {
39 39
             return ResponseModel::err(4007);
40 40
         }
41 41
 
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
             return ResponseModel::err(1003);
67 67
         }
68 68
 
69
-        $cid = $contestModel->arrangeContest($all_data["gid"], [
69
+        $cid=$contestModel->arrangeContest($all_data["gid"], [
70 70
             "assign_uid"=>Auth::user()->id,
71 71
             "name"=>$all_data["name"],
72 72
             "description"=>$all_data["description"],
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
             "public"=>$all_data["public"] ?? 0,
77 77
         ], $problemSet);
78 78
 
79
-        return ResponseModel::success(200,'Successful!',$cid);
79
+        return ResponseModel::success(200, 'Successful!', $cid);
80 80
     }
81 81
 
82 82
     public function changeGroupName(Request $request)
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
         $groupModel=new GroupModel();
92 92
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
93
-        if ($clearance < 2){
93
+        if ($clearance<2) {
94 94
             return ResponseModel::err(2001);
95 95
         }
96 96
 
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
109 109
 
110 110
         $groupModel=new GroupModel();
111 111
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
112
-        if ($clearance < 2){
112
+        if ($clearance<2) {
113 113
             return ResponseModel::err(2001);
114 114
         }
115 115
 
116
-        if ($all_data["join_policy"] < 1 || $all_data["join_policy"] > 3){
116
+        if ($all_data["join_policy"]<1 || $all_data["join_policy"]>3) {
117 117
             return ResponseModel::err(1007);
118 118
         }
119 119
 
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
             'gid' => 'required|integer',
128 128
         ]);
129 129
 
130
-        $all_data = $request->all();
130
+        $all_data=$request->all();
131 131
 
132 132
         if (!empty($request->file('img')) && $request->file('img')->isValid()) {
133 133
             $extension=$request->file('img')->extension();
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
         $groupModel=new GroupModel();
141 141
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
142
-        if ($clearance < 2){
142
+        if ($clearance<2) {
143 143
             return ResponseModel::err(2001);
144 144
         }
145 145
 
@@ -177,18 +177,18 @@  discard block
 block discarded – undo
177 177
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
178 178
         $target_clearance=$groupModel->judgeClearance($all_data["gid"], $all_data['uid']);
179 179
 
180
-        if($target_clearance == -3){
180
+        if ($target_clearance==-3) {
181 181
             return ResponseModel::err(7004);
182 182
         }
183 183
 
184
-        if($target_clearance >= $clearance || $clearance < 2 || $all_data['permission'] >= $clearance){
184
+        if ($target_clearance>=$clearance || $clearance<2 || $all_data['permission']>=$clearance) {
185 185
             return ResponseModel::err(2001);
186 186
         }
187 187
 
188 188
         $groupModel->changeClearance($all_data['uid'], $all_data["gid"], $all_data['permission']);
189 189
 
190
-        $result_info = $groupModel->userProfile($all_data['uid'],$all_data["gid"]);
191
-        return ResponseModel::success(200,null,$result_info);
190
+        $result_info=$groupModel->userProfile($all_data['uid'], $all_data["gid"]);
191
+        return ResponseModel::success(200, null, $result_info);
192 192
     }
193 193
 
194 194
     public function approveMember(Request $request)
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
205 205
         $targetClearance=$groupModel->judgeClearance($all_data["gid"], $all_data["uid"]);
206 206
         if ($clearance>1) {
207
-            if($targetClearance!=0) {
207
+            if ($targetClearance!=0) {
208 208
                 return ResponseModel::err(7003);
209 209
             }
210 210
             $groupModel->changeClearance($all_data["uid"], $all_data["gid"], 1);
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         $groupModel=new GroupModel();
226 226
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
227 227
         $targetClearance=$groupModel->judgeClearance($all_data["gid"], $all_data["uid"]);
228
-        if ($clearance <= 1 || $clearance <= $targetClearance){
228
+        if ($clearance<=1 || $clearance<=$targetClearance) {
229 229
             return ResponseModel::err(7002);
230 230
         }
231 231
 
@@ -245,16 +245,16 @@  discard block
 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) return ResponseModel::err(2006);
249 249
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
250
-        if($clearance<2) return ResponseModel::err(7002);
250
+        if ($clearance<2) return ResponseModel::err(7002);
251 251
         $targetClearance=$groupModel->judgeEmailClearance($all_data["gid"], $all_data["email"]);
252
-        if($targetClearance!=-3) return ResponseModel::err(7003);
252
+        if ($targetClearance!=-3) return ResponseModel::err(7003);
253 253
         $groupModel->inviteMember($all_data["gid"], $all_data["email"]);
254
-        $basic = $groupModel->basic($all_data['gid']);
255
-        $url = route('group.detail',['gcode' => $basic['gcode']]);
256
-        $receiverInfo = UserModel::where('email',$all_data['email'])->first();
257
-        $sender_name = Auth::user()->name;
254
+        $basic=$groupModel->basic($all_data['gid']);
255
+        $url=route('group.detail', ['gcode' => $basic['gcode']]);
256
+        $receiverInfo=UserModel::where('email', $all_data['email'])->first();
257
+        $sender_name=Auth::user()->name;
258 258
         sendMessage([
259 259
             'receiver' => $receiverInfo["id"],
260 260
             'sender' => Auth::user()->id,
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
 
297 297
         $groupModel=new GroupModel();
298 298
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
299
-        if ($clearance < 2){
299
+        if ($clearance<2) {
300 300
             return ResponseModel::err(2001);
301 301
         }
302 302
         $groupModel->createNotice($all_data["gid"], Auth::user()->id, $all_data["title"], $all_data["content"]);
Please login to merge, or discard this patch.
app/Admin/Controllers/BabelController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
     {
133 133
         $extensionList=ExtensionModel::list();
134 134
 
135
-        if(empty($extensionList)){
135
+        if (empty($extensionList)) {
136 136
             return view('admin::babel.empty');
137 137
         }
138 138
 
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
     {
146 146
         $details=ExtensionModel::remoteDetail($code);
147 147
 
148
-        if(empty($details)){
148
+        if (empty($details)) {
149 149
             return view('admin::babel.empty');
150 150
         }
151 151
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
     {
159 159
         $details=ExtensionModel::remoteDetail($extension);
160 160
 
161
-        if(empty($details)){
161
+        if (empty($details)) {
162 162
             return view('admin::babel.empty');
163 163
         }
164 164
 
@@ -169,15 +169,15 @@  discard block
 block discarded – undo
169 169
 
170 170
     private static function executeArtisan($command)
171 171
     {
172
-        $fp = popen('php "'.base_path('artisan').'" '.$command, "r");
173
-        while($b = fgets($fp, 2048)) {
172
+        $fp=popen('php "'.base_path('artisan').'" '.$command, "r");
173
+        while ($b=fgets($fp, 2048)) {
174 174
             echo str_pad(json_encode([
175 175
                 "ret"=>200,
176 176
                 "desc"=>"Succeed",
177 177
                 "data"=>[
178 178
                     "message"=>$b
179 179
                 ]
180
-            ])."\n",4096);
180
+            ])."\n", 4096);
181 181
             @ob_flush();
182 182
             flush();
183 183
         }
Please login to merge, or discard this patch.
app/Http/Controllers/OAuth/GithubController.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -12,20 +12,20 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function redirectTo()
14 14
     {
15
-        $accountModel = new AccountModel();
16
-        if(Auth::check()){
15
+        $accountModel=new AccountModel();
16
+        if (Auth::check()) {
17 17
             $info=$accountModel->detail(Auth::user()->id);
18
-            if(Auth::check() && $info['contest_account']){
18
+            if (Auth::check() && $info['contest_account']) {
19 19
                 return redirect('/account/settings');
20 20
             }
21 21
         }
22
-        if(Auth::check() && $accountModel->getExtra(Auth::user()->id ,'github_id')){
23
-            return view('oauth.index',[
22
+        if (Auth::check() && $accountModel->getExtra(Auth::user()->id, 'github_id')) {
23
+            return view('oauth.index', [
24 24
                 'page_title'=>"OAuth",
25 25
                 'site_title'=>config("app.name"),
26 26
                 'navigation'=>"OAuth",
27 27
                 'platform' => 'Github',
28
-                'display_html' => 'You\'re already tied to the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
28
+                'display_html' => 'You\'re already tied to the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
29 29
                 You can choose to unbind or go back to the homepage',
30 30
                 'buttons' => [
31 31
                     [
@@ -45,19 +45,19 @@  discard block
 block discarded – undo
45 45
 
46 46
     public function handleCallback()
47 47
     {
48
-        try{
49
-            $github_user = Socialite::driver('github')->user();
50
-        }catch(\Laravel\Socialite\Two\InvalidStateException $e){
48
+        try {
49
+            $github_user=Socialite::driver('github')->user();
50
+        } catch (\Laravel\Socialite\Two\InvalidStateException $e) {
51 51
             return redirect('/');
52 52
         }
53 53
 
54
-        $accountModel = new AccountModel();
55
-        if(Auth::check()){
56
-            $user_id = Auth::user()->id;
57
-            $ret = $accountModel->findExtra('github_id',$github_user->id);
58
-            if(!empty($ret) && $ret['uid'] != $user_id){
59
-                $user = UserModel::find($ret['uid']);
60
-                return view('oauth.index',[
54
+        $accountModel=new AccountModel();
55
+        if (Auth::check()) {
56
+            $user_id=Auth::user()->id;
57
+            $ret=$accountModel->findExtra('github_id', $github_user->id);
58
+            if (!empty($ret) && $ret['uid']!=$user_id) {
59
+                $user=UserModel::find($ret['uid']);
60
+                return view('oauth.index', [
61 61
                     'page_title'=>"OAuth",
62 62
                     'site_title'=>config("app.name"),
63 63
                     'navigation'=>"OAuth",
@@ -72,17 +72,17 @@  discard block
 block discarded – undo
72 72
                     ]
73 73
                 ]);
74 74
             }
75
-            $accountModel->setExtra($user_id,'github_id',$github_user->id);
76
-            $accountModel->setExtra($user_id,'github_email',$github_user->email);
77
-            $accountModel->setExtra($user_id,'github_nickname',$github_user->nickname);
78
-            $accountModel->setExtra($user_id,'github_homepage',($github_user->user)['html_url']);
79
-            $accountModel->setExtra($user_id,'github_token',$github_user->token,101);
80
-            return view('oauth.index',[
75
+            $accountModel->setExtra($user_id, 'github_id', $github_user->id);
76
+            $accountModel->setExtra($user_id, 'github_email', $github_user->email);
77
+            $accountModel->setExtra($user_id, 'github_nickname', $github_user->nickname);
78
+            $accountModel->setExtra($user_id, 'github_homepage', ($github_user->user)['html_url']);
79
+            $accountModel->setExtra($user_id, 'github_token', $github_user->token, 101);
80
+            return view('oauth.index', [
81 81
                 'page_title'=>"OAuth",
82 82
                 'site_title'=>config("app.name"),
83 83
                 'navigation'=>"OAuth",
84 84
                 'platform' => 'Github',
85
-                'display_html' => 'You have successfully tied up the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
85
+                'display_html' => 'You have successfully tied up the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
86 86
                 You can log in to '.config("app.name").' later using this account',
87 87
                 'buttons' => [
88 88
                     [
@@ -91,18 +91,18 @@  discard block
 block discarded – undo
91 91
                     ],
92 92
                 ]
93 93
             ]);
94
-        }else{
95
-            $ret = $accountModel->findExtra('github_id',$github_user->id);
96
-            if(!empty($ret)){
94
+        } else {
95
+            $ret=$accountModel->findExtra('github_id', $github_user->id);
96
+            if (!empty($ret)) {
97 97
                 Auth::loginUsingId($ret['uid']);
98
-                $user_id = Auth::user()->id;
99
-                $accountModel->setExtra($user_id,'github_email',$github_user->email);
100
-                $accountModel->setExtra($user_id,'github_nickname',$github_user->nickname);
101
-                $accountModel->setExtra($user_id,'github_homepage',($github_user->user)['html_url']);
102
-                $accountModel->setExtra($user_id,'github_token',$github_user->token,101);
98
+                $user_id=Auth::user()->id;
99
+                $accountModel->setExtra($user_id, 'github_email', $github_user->email);
100
+                $accountModel->setExtra($user_id, 'github_nickname', $github_user->nickname);
101
+                $accountModel->setExtra($user_id, 'github_homepage', ($github_user->user)['html_url']);
102
+                $accountModel->setExtra($user_id, 'github_token', $github_user->token, 101);
103 103
                 return redirect('/');
104
-            }else{
105
-                return view('oauth.index',[
104
+            } else {
105
+                return view('oauth.index', [
106 106
                     'page_title'=>"OAuth",
107 107
                     'site_title'=>config("app.name"),
108 108
                     'navigation'=>"OAuth",
@@ -125,19 +125,19 @@  discard block
 block discarded – undo
125 125
 
126 126
     public function unbind()
127 127
     {
128
-        if(!Auth::check()){
128
+        if (!Auth::check()) {
129 129
             return redirect('/');
130 130
         }
131
-        $accountModel = new AccountModel();
132
-        if($accountModel->getExtra(Auth::user()->id ,'github_id')){
133
-            return view('oauth.index',[
131
+        $accountModel=new AccountModel();
132
+        if ($accountModel->getExtra(Auth::user()->id, 'github_id')) {
133
+            return view('oauth.index', [
134 134
                 'page_title'=>"OAuth",
135 135
                 'site_title'=>config("app.name"),
136 136
                 'navigation'=>"OAuth",
137 137
                 'platform' => 'Github',
138 138
                 'display_html' => 'You are trying to unbind the following two : <br />
139 139
                 Your '.config("app.name").' account : <span class="text-info">'.Auth::user()->email.'</span><br />
140
-                This Github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
140
+                This Github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
141 141
                 Make your decision carefully, although you can later establish the binding again',
142 142
                 'buttons' => [
143 143
                     [
@@ -151,8 +151,8 @@  discard block
 block discarded – undo
151 151
                     ],
152 152
                 ]
153 153
             ]);
154
-        }else{
155
-            return view('oauth.index',[
154
+        } else {
155
+            return view('oauth.index', [
156 156
                 'page_title'=>"OAuth",
157 157
                 'site_title'=>config("app.name"),
158 158
                 'navigation'=>"OAuth",
@@ -170,18 +170,18 @@  discard block
 block discarded – undo
170 170
 
171 171
     public function confirmUnbind()
172 172
     {
173
-        if(!Auth::check()){
173
+        if (!Auth::check()) {
174 174
             return redirect('/');
175 175
         }
176
-        $accountModel = new AccountModel();
177
-        $user_id = Auth::user()->id;
178
-        if($accountModel->getExtra($user_id ,'github_id')){
179
-            $accountModel->setExtra($user_id,'github_id',null);
180
-            $accountModel->setExtra($user_id,'github_email',null);
181
-            $accountModel->setExtra($user_id,'github_nickname',null);
182
-            $accountModel->setExtra($user_id,'github_homepage',null);
183
-            $accountModel->setExtra($user_id,'github_token',null);
184
-            return view('oauth.index',[
176
+        $accountModel=new AccountModel();
177
+        $user_id=Auth::user()->id;
178
+        if ($accountModel->getExtra($user_id, 'github_id')) {
179
+            $accountModel->setExtra($user_id, 'github_id', null);
180
+            $accountModel->setExtra($user_id, 'github_email', null);
181
+            $accountModel->setExtra($user_id, 'github_nickname', null);
182
+            $accountModel->setExtra($user_id, 'github_homepage', null);
183
+            $accountModel->setExtra($user_id, 'github_token', null);
184
+            return view('oauth.index', [
185 185
                 'page_title'=>"OAuth",
186 186
                 'site_title'=>config("app.name"),
187 187
                 'navigation'=>"OAuth",
@@ -194,8 +194,8 @@  discard block
 block discarded – undo
194 194
                     ],
195 195
                 ]
196 196
             ]);
197
-        }else{
198
-            return view('oauth.index',[
197
+        } else {
198
+            return view('oauth.index', [
199 199
                 'page_title'=>"OAuth",
200 200
                 'site_title'=>config("app.name"),
201 201
                 'navigation'=>"OAuth",
Please login to merge, or discard this patch.
app/Http/Controllers/Contest/BoardController.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
         $contestModel=new ContestModel();
35 35
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
36 36
         $basicInfo=$contestModel->basic($cid);
37
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
38
-            if($clearance == 3){
37
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
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
         }
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
         if ($remainingTime<=0) {
51 51
             $remainingTime=0;
52 52
         }
53
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
53
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
54 54
             return Redirect::route('contest.detail', ['cid' => $cid]);
55 55
         }
56 56
         return view('contest.board.challenge', [
@@ -83,15 +83,15 @@  discard block
 block discarded – undo
83 83
         $accountModel=new AccountModel();
84 84
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
85 85
         $basicInfo=$contestModel->basic($cid);
86
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
87
-            if($clearance == 3){
86
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
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
         }
93 93
         $basicInfo=$contestModel->basic($cid);
94
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
94
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
95 95
             return Redirect::route('contest.detail', ['cid' => $cid]);
96 96
         }
97 97
         $contest_name=$contestModel->contestName($cid);
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
             ];
123 123
         }
124 124
 
125
-        $editor_left_width = $accountModel->getExtra(Auth::user()->id, 'editor_left_width');
126
-        if(empty($editor_left_width)) $editor_left_width='40';
125
+        $editor_left_width=$accountModel->getExtra(Auth::user()->id, 'editor_left_width');
126
+        if (empty($editor_left_width)) $editor_left_width='40';
127 127
 
128 128
         return view('contest.board.editor', [
129 129
             'page_title'=>"Problem Detail",
@@ -157,15 +157,15 @@  discard block
 block discarded – undo
157 157
         $contestModel=new ContestModel();
158 158
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
159 159
         $basicInfo=$contestModel->basic($cid);
160
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
161
-            if($clearance == 3){
160
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
161
+            if ($clearance==3) {
162 162
                 return Redirect::route('contest.admin', ['cid' => $cid]);
163
-            }else{
163
+            } else {
164 164
                 return Redirect::route('contest.detail', ['cid' => $cid]);
165 165
             }
166 166
         }
167 167
         $basicInfo=$contestModel->basic($cid);
168
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
168
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
169 169
             return Redirect::route('contest.detail', ['cid' => $cid]);
170 170
         }
171 171
         $contest_name=$contestModel->contestName($cid);
@@ -176,14 +176,14 @@  discard block
 block discarded – undo
176 176
 
177 177
         // To determine the ranking
178 178
         foreach ($contestRank as $i => &$r) {
179
-            if($i != 0) {
180
-                if($r['score'] == $contestRank[$i-1]['score'] && ($contest_rule == 1 ? ($r['penalty'] == $contestRank[$i-1]['penalty']) : 1) ){
181
-                    $r['rank'] = $contestRank[$i-1]['rank'];
182
-                }else{
183
-                    $r['rank'] = $i + 1;
179
+            if ($i!=0) {
180
+                if ($r['score']==$contestRank[$i-1]['score'] && ($contest_rule==1 ? ($r['penalty']==$contestRank[$i-1]['penalty']) : 1)) {
181
+                    $r['rank']=$contestRank[$i-1]['rank'];
182
+                } else {
183
+                    $r['rank']=$i+1;
184 184
                 }
185
-            }else{
186
-                $r['rank'] = 1;
185
+            } else {
186
+                $r['rank']=1;
187 187
             }
188 188
         }
189 189
         $rankFrozen=$contestModel->isFrozen($cid);
@@ -220,15 +220,15 @@  discard block
 block discarded – undo
220 220
         $contestModel=new ContestModel();
221 221
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
222 222
         $basicInfo=$contestModel->basic($cid);
223
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
224
-            if($clearance == 3){
223
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
224
+            if ($clearance==3) {
225 225
                 return Redirect::route('contest.admin', ['cid' => $cid]);
226
-            }else{
226
+            } else {
227 227
                 return Redirect::route('contest.detail', ['cid' => $cid]);
228 228
             }
229 229
         }
230 230
         $basicInfo=$contestModel->basic($cid);
231
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
231
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
232 232
             return Redirect::route('contest.detail', ['cid' => $cid]);
233 233
         }
234 234
         $contest_name=$contestModel->contestName($cid);
@@ -262,14 +262,14 @@  discard block
 block discarded – undo
262 262
         $contestModel=new ContestModel();
263 263
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
264 264
         $basicInfo=$contestModel->basic($cid);
265
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
266
-            if($clearance == 3){
265
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
266
+            if ($clearance==3) {
267 267
                 return Redirect::route('contest.admin', ['cid' => $cid]);
268
-            }else{
268
+            } else {
269 269
                 return Redirect::route('contest.detail', ['cid' => $cid]);
270 270
             }
271 271
         }
272
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
272
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
273 273
             return Redirect::route('contest.detail', ['cid' => $cid]);
274 274
         }
275 275
         $contest_name=$contestModel->contestName($cid);
@@ -300,14 +300,14 @@  discard block
 block discarded – undo
300 300
         $contestModel=new ContestModel();
301 301
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
302 302
         $basicInfo=$contestModel->basic($cid);
303
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
304
-            if($clearance == 3){
303
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
304
+            if ($clearance==3) {
305 305
                 return Redirect::route('contest.admin', ['cid' => $cid]);
306
-            }else{
306
+            } else {
307 307
                 return Redirect::route('contest.detail', ['cid' => $cid]);
308 308
             }
309 309
         }
310
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
310
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
311 311
             return Redirect::route('contest.detail', ['cid' => $cid]);
312 312
         }
313 313
         $contest_name=$contestModel->contestName($cid);
@@ -324,19 +324,19 @@  discard block
 block discarded – undo
324 324
         ]);
325 325
     }
326 326
 
327
-    public function analysis($cid){
327
+    public function analysis($cid) {
328 328
         $contestModel=new ContestModel();
329 329
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
330 330
         $basicInfo=$contestModel->basic($cid);
331
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
332
-            if($clearance == 3){
331
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
332
+            if ($clearance==3) {
333 333
                 return Redirect::route('contest.admin', ['cid' => $cid]);
334
-            }else{
334
+            } else {
335 335
                 return Redirect::route('contest.detail', ['cid' => $cid]);
336 336
             }
337 337
         }
338 338
         $basicInfo=$contestModel->basic($cid);
339
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
339
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
340 340
             return Redirect::route('contest.detail', ['cid' => $cid]);
341 341
         }
342 342
         $contest_name=$contestModel->contestName($cid);
Please login to merge, or discard this patch.