@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | //writing database |
39 | 39 | $this->transactionDB(); |
40 | 40 | |
41 | - }catch(Throwable $e){ |
|
41 | + } catch(Throwable $e){ |
|
42 | 42 | if ($e->getMessage()!==""){ |
43 | 43 | $this->command->line("\n <bg=red;fg=white> {$e->getMessage()} </>\n"); |
44 | 44 | } |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | |
221 | 221 | DB::commit(); |
222 | 222 | |
223 | - }catch(Throwable $e){ |
|
223 | + } catch(Throwable $e){ |
|
224 | 224 | DB::rollback(); |
225 | 225 | if ($e->getMessage()!=="") { |
226 | 226 | $this->command->line("\n <bg=red;fg=white> {$e->getMessage()} </>\n"); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | if($assign_uid != 0){ |
62 | 62 | $assignee = $groupModel->userProfile($assign_uid,$contest_detail['gid']); |
63 | - }else{ |
|
63 | + } else{ |
|
64 | 64 | $assignee = null; |
65 | 65 | } |
66 | 66 | $ret = [ |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | } |
221 | 221 | $contestModel->contestUpdate($cid,$all_data,$problemSet); |
222 | 222 | return ResponseModel::success(200); |
223 | - }else{ |
|
223 | + } else{ |
|
224 | 224 | $allow_update = ['name','description']; |
225 | 225 | |
226 | 226 | foreach($all_data as $key => $value){ |
@@ -58,7 +58,7 @@ |
||
58 | 58 | $account=$contestModel->getContestAccount($cid); |
59 | 59 | if($account==null){ |
60 | 60 | return ; |
61 | - }else{ |
|
61 | + } else{ |
|
62 | 62 | $AccountExport=new AccountExport($account); |
63 | 63 | $filename="ContestAccount$cid"; |
64 | 64 | return Excel::download($AccountExport, $filename.'.xlsx'); |
@@ -43,7 +43,9 @@ discard block |
||
43 | 43 | { |
44 | 44 | $groupModel=new GroupModel(); |
45 | 45 | $basic_info=$groupModel->details($gcode); |
46 | - if(empty($basic_info)) return Redirect::route('group.index'); |
|
46 | + if(empty($basic_info)) { |
|
47 | + return Redirect::route('group.index'); |
|
48 | + } |
|
47 | 49 | $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id); |
48 | 50 | $member_list=$groupModel->userList($basic_info["gid"]); |
49 | 51 | return view('group.settings.general', [ |
@@ -85,7 +87,9 @@ discard block |
||
85 | 87 | { |
86 | 88 | $groupModel=new GroupModel(); |
87 | 89 | $basic_info=$groupModel->details($gcode); |
88 | - if(empty($basic_info)) return Redirect::route('group.index'); |
|
90 | + if(empty($basic_info)) { |
|
91 | + return Redirect::route('group.index'); |
|
92 | + } |
|
89 | 93 | return view('group.settings.danger', [ |
90 | 94 | 'page_title'=>"Group Setting danger", |
91 | 95 | 'site_title'=>config("app.name"), |
@@ -104,7 +108,9 @@ discard block |
||
104 | 108 | $groupModel=new GroupModel(); |
105 | 109 | $contestModel=new ContestModel(); |
106 | 110 | $basic_info=$groupModel->details($gcode); |
107 | - if(empty($basic_info)) return Redirect::route('group.index'); |
|
111 | + if(empty($basic_info)) { |
|
112 | + return Redirect::route('group.index'); |
|
113 | + } |
|
108 | 114 | $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id); |
109 | 115 | $member_list=$groupModel->userList($basic_info["gid"]); |
110 | 116 | $group_notice=$groupModel->detailNotice($gcode); |
@@ -124,7 +130,9 @@ discard block |
||
124 | 130 | $groupModel=new GroupModel(); |
125 | 131 | $contestModel=new ContestModel(); |
126 | 132 | $basic_info=$groupModel->details($gcode); |
127 | - if(empty($basic_info)) return Redirect::route('group.index'); |
|
133 | + if(empty($basic_info)) { |
|
134 | + return Redirect::route('group.index'); |
|
135 | + } |
|
128 | 136 | $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id); |
129 | 137 | $contest_list=$contestModel->listForSetting($basic_info["gid"]); |
130 | 138 | $member_list=$groupModel->userList($basic_info["gid"]); |
@@ -69,9 +69,13 @@ |
||
69 | 69 | $all_data=$request->all(); |
70 | 70 | |
71 | 71 | $groupModel=new GroupModel(); |
72 | - if($all_data["gcode"]=="create") return ResponseModel::err(7005); |
|
72 | + if($all_data["gcode"]=="create") { |
|
73 | + return ResponseModel::err(7005); |
|
74 | + } |
|
73 | 75 | $is_group=$groupModel->isGroup($all_data["gcode"]); |
74 | - if($is_group) return ResponseModel::err(7006); |
|
76 | + if($is_group) { |
|
77 | + return ResponseModel::err(7006); |
|
78 | + } |
|
75 | 79 | |
76 | 80 | $allow_extension=['jpg', 'png', 'jpeg', 'gif', 'bmp']; |
77 | 81 | if (!empty($request->file('img')) && $request->file('img')->isValid()) { |
@@ -115,7 +115,9 @@ discard block |
||
115 | 115 | public function details($gcode) |
116 | 116 | { |
117 | 117 | $basic_info=DB::table($this->tableName)->where(["gcode"=>$gcode])->first(); |
118 | - if(empty($basic_info)) return []; |
|
118 | + if(empty($basic_info)) { |
|
119 | + return []; |
|
120 | + } |
|
119 | 121 | $basic_info["members"]=$this->countGroupMembers($basic_info["gid"]); |
120 | 122 | $basic_info["tags"]=$this->getGroupTags($basic_info["gid"]); |
121 | 123 | $basic_info["create_time_foramt"]=date_format(date_create($basic_info["create_time"]), 'M jS, Y'); |
@@ -163,7 +165,9 @@ discard block |
||
163 | 165 | foreach ($user_list as &$u) { |
164 | 166 | $u["role_parsed"]=$this->role[$u["role"]]; |
165 | 167 | $u["role_color"]=$this->role_color[$u["role"]]; |
166 | - if(is_null($u["sub_group"])) $u["sub_group"]="None"; |
|
168 | + if(is_null($u["sub_group"])) { |
|
169 | + $u["sub_group"]="None"; |
|
170 | + } |
|
167 | 171 | } |
168 | 172 | return $user_list; |
169 | 173 | } |
@@ -232,7 +236,7 @@ discard block |
||
232 | 236 | ->where('gid',$gid) |
233 | 237 | ->distinct() |
234 | 238 | ->get()->all(); |
235 | - }else{ |
|
239 | + } else{ |
|
236 | 240 | $tags = DB::table('group_problem_tag') |
237 | 241 | ->select('tag') |
238 | 242 | ->where('gid', $gid) |
@@ -266,7 +270,7 @@ discard block |
||
266 | 270 | foreach($problems as $key => $value){ |
267 | 271 | if($contestModel->judgeClearance($value['cid'],$user_id) != 3){ |
268 | 272 | unset($problems[$key]); |
269 | - }else{ |
|
273 | + } else{ |
|
270 | 274 | $problems[$key]['tags'] = $this->problemTags($gid,$value['pid']); |
271 | 275 | } |
272 | 276 | } |
@@ -327,7 +331,9 @@ discard block |
||
327 | 331 | public function judgeEmailClearance($gid, $email) |
328 | 332 | { |
329 | 333 | $user=DB::table("users")->where(["email"=>$email])->first(); |
330 | - if(empty($user)) return -4; |
|
334 | + if(empty($user)) { |
|
335 | + return -4; |
|
336 | + } |
|
331 | 337 | $ret=DB::table("group_member")->where([ |
332 | 338 | "gid"=>$gid, |
333 | 339 | "uid"=>$user["id"], |
@@ -461,7 +467,7 @@ discard block |
||
461 | 467 | if(!empty($last_cr)){ |
462 | 468 | if($cr['solved'] == $last_cr['solved'] && $cr['penalty'] == $last_cr['penalty'] ){ |
463 | 469 | $rank = $last_rank; |
464 | - }else{ |
|
470 | + } else{ |
|
465 | 471 | $rank = $index; |
466 | 472 | $last_rank = $rank; |
467 | 473 | } |
@@ -613,7 +619,7 @@ discard block |
||
613 | 619 | 'cid' => $contest['cid'], |
614 | 620 | 'name' => $contest['name'] |
615 | 621 | ]; |
616 | - }else{ |
|
622 | + } else{ |
|
617 | 623 | $result[] = [ |
618 | 624 | 'ret' => 'judging', |
619 | 625 | 'cid' => $contest['cid'], |
@@ -43,7 +43,9 @@ discard block |
||
43 | 43 | $groupModel=new GroupModel(); |
44 | 44 | $contestModel=new ContestModel(); |
45 | 45 | $basic_info=$groupModel->details($gcode); |
46 | - if(empty($basic_info)) return Redirect::route('group.index'); |
|
46 | + if(empty($basic_info)) { |
|
47 | + return Redirect::route('group.index'); |
|
48 | + } |
|
47 | 49 | $my_profile=$groupModel->userProfile(Auth::user()->id, $basic_info["gid"]); |
48 | 50 | $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id); |
49 | 51 | $member_list=$groupModel->userList($basic_info["gid"]); |
@@ -89,9 +91,13 @@ discard block |
||
89 | 91 | public function analysis($gcode){ |
90 | 92 | $groupModel = new GroupModel(); |
91 | 93 | $basic_info=$groupModel->details($gcode); |
92 | - if(empty($basic_info)) return Redirect::route('group.index'); |
|
94 | + if(empty($basic_info)) { |
|
95 | + return Redirect::route('group.index'); |
|
96 | + } |
|
93 | 97 | $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id); |
94 | - if($clearance < 1) return Redirect::route('group.detail',['gcode' => $gcode]); |
|
98 | + if($clearance < 1) { |
|
99 | + return Redirect::route('group.detail',['gcode' => $gcode]); |
|
100 | + } |
|
95 | 101 | $group_info = $groupModel->details($gcode); |
96 | 102 | return view('group.settings.analysis', [ |
97 | 103 | 'page_title'=>"Group Analysis", |
@@ -123,7 +129,7 @@ discard block |
||
123 | 129 | ), |
124 | 130 | $gcode . '_Group_Contest_Analysis.xlsx' |
125 | 131 | ); |
126 | - }else{ |
|
132 | + } else{ |
|
127 | 133 | $data = $groupModel->groupMemberPracticeTagStat($group_info['gid']); |
128 | 134 | return Excel::download( |
129 | 135 | new GroupAnalysisExport( |
@@ -65,12 +65,12 @@ |
||
65 | 65 | foreach ($ret as $gid => $group) { |
66 | 66 | if(empty($group['result'])){ |
67 | 67 | Log::channel('group_elo')->info('Refreshed Group Elo (Empty) : ('.$gid.')'.$group['name']); |
68 | - }else{ |
|
68 | + } else{ |
|
69 | 69 | Log::channel('group_elo')->info('Refreshing Group Elo: ('.$gid.')'.$group['name']); |
70 | 70 | foreach ($group['result'] as $contest) { |
71 | 71 | if($contest['ret'] == 'success'){ |
72 | 72 | Log::channel('group_elo')->info(' Elo Clac Successfully : ('.$contest['cid'].')'.$contest['name']); |
73 | - }else{ |
|
73 | + } else{ |
|
74 | 74 | Log::channel('group_elo')->info(' Elo Clac Faild (Judge Not Over) : ('.$contest['cid'].')'.$contest['name'].' sids:'); |
75 | 75 | foreach ($contest['submissions'] as $sid) { |
76 | 76 | Log::channel('group_elo')->info(' '.$sid['sid']); |
@@ -18,11 +18,31 @@ discard block |
||
18 | 18 | |
19 | 19 | public function login($all_data) |
20 | 20 | { |
21 | - if(isset($all_data["url"])) $url = $all_data["url"]; else throw new Exception("url is not exist in all_data"); |
|
22 | - if(isset($all_data["data"])) $data = $all_data["data"]; else throw new Exception("data is not exist in all_data"); |
|
23 | - if(isset($all_data["oj"])) $oj = $all_data["oj"]; else throw new Exception("oj is not exist in all_data"); |
|
24 | - if(isset($all_data["ret"])) $ret = $all_data["ret"]; else $ret = 'false'; |
|
25 | - if(isset($all_data["handle"])) $handle = $all_data["handle"]; else $handle = "default"; |
|
21 | + if(isset($all_data["url"])) { |
|
22 | + $url = $all_data["url"]; |
|
23 | + } else { |
|
24 | + throw new Exception("url is not exist in all_data"); |
|
25 | + } |
|
26 | + if(isset($all_data["data"])) { |
|
27 | + $data = $all_data["data"]; |
|
28 | + } else { |
|
29 | + throw new Exception("data is not exist in all_data"); |
|
30 | + } |
|
31 | + if(isset($all_data["oj"])) { |
|
32 | + $oj = $all_data["oj"]; |
|
33 | + } else { |
|
34 | + throw new Exception("oj is not exist in all_data"); |
|
35 | + } |
|
36 | + if(isset($all_data["ret"])) { |
|
37 | + $ret = $all_data["ret"]; |
|
38 | + } else { |
|
39 | + $ret = 'false'; |
|
40 | + } |
|
41 | + if(isset($all_data["handle"])) { |
|
42 | + $handle = $all_data["handle"]; |
|
43 | + } else { |
|
44 | + $handle = "default"; |
|
45 | + } |
|
26 | 46 | |
27 | 47 | $datapost=curl_init(); |
28 | 48 | $headers=array("Expect:"); |
@@ -54,12 +74,36 @@ discard block |
||
54 | 74 | |
55 | 75 | public function grab_page($all_data) |
56 | 76 | { |
57 | - if(isset($all_data["site"])) $site = $all_data["site"]; else throw new Exception("site is not exist in all_data"); |
|
58 | - if(isset($all_data["oj"])) $oj = $all_data["oj"]; else throw new Exception("oj is not exist in all_data"); |
|
59 | - if(isset($all_data["headers"])) $headers = $all_data["headers"]; else $headers = []; |
|
60 | - if(isset($all_data["handle"])) $handle = $all_data["handle"]; else $handle = "default"; |
|
61 | - if(isset($all_data["follow"])) $follow = $all_data["follow"]; else $follow = false; |
|
62 | - if(isset($all_data["vcid"])) $vcid = $all_data["vcid"]."_"; else $vcid = ""; |
|
77 | + if(isset($all_data["site"])) { |
|
78 | + $site = $all_data["site"]; |
|
79 | + } else { |
|
80 | + throw new Exception("site is not exist in all_data"); |
|
81 | + } |
|
82 | + if(isset($all_data["oj"])) { |
|
83 | + $oj = $all_data["oj"]; |
|
84 | + } else { |
|
85 | + throw new Exception("oj is not exist in all_data"); |
|
86 | + } |
|
87 | + if(isset($all_data["headers"])) { |
|
88 | + $headers = $all_data["headers"]; |
|
89 | + } else { |
|
90 | + $headers = []; |
|
91 | + } |
|
92 | + if(isset($all_data["handle"])) { |
|
93 | + $handle = $all_data["handle"]; |
|
94 | + } else { |
|
95 | + $handle = "default"; |
|
96 | + } |
|
97 | + if(isset($all_data["follow"])) { |
|
98 | + $follow = $all_data["follow"]; |
|
99 | + } else { |
|
100 | + $follow = false; |
|
101 | + } |
|
102 | + if(isset($all_data["vcid"])) { |
|
103 | + $vcid = $all_data["vcid"]."_"; |
|
104 | + } else { |
|
105 | + $vcid = ""; |
|
106 | + } |
|
63 | 107 | |
64 | 108 | $handle=urlencode($handle); |
65 | 109 | |
@@ -86,16 +130,56 @@ discard block |
||
86 | 130 | |
87 | 131 | public function post_data($all_data) |
88 | 132 | { |
89 | - if(isset($all_data["site"])) $site = $all_data["site"]; else throw new Exception("site is not exist in all_data"); |
|
90 | - if(isset($all_data["data"])) $data = $all_data["data"]; else throw new Exception("data is not exist in all_data"); |
|
91 | - if(isset($all_data["oj"])) $oj = $all_data["oj"]; else throw new Exception("oj is not exist in all_data"); |
|
92 | - if(isset($all_data["ret"])) $ret = $all_data["ret"]; else $ret = false; |
|
93 | - if(isset($all_data["follow"])) $follow = $all_data["follow"]; else $follow = true; |
|
94 | - if(isset($all_data["returnHeader"])) $returnHeader = $all_data["returnHeader"]; else $returnHeader = true; |
|
95 | - if(isset($all_data["postJson"])) $postJson = $all_data["postJson"]; else $postJson = false; |
|
96 | - if(isset($all_data["extraHeaders"])) $extraHeaders = $all_data["extraHeaders"]; else $extraHeaders = []; |
|
97 | - if(isset($all_data["handle"])) $handle = $all_data["handle"]; else $handle = "default"; |
|
98 | - if(isset($all_data["vcid"])) $vcid = $all_data["vcid"]."_"; else $vcid = ""; |
|
133 | + if(isset($all_data["site"])) { |
|
134 | + $site = $all_data["site"]; |
|
135 | + } else { |
|
136 | + throw new Exception("site is not exist in all_data"); |
|
137 | + } |
|
138 | + if(isset($all_data["data"])) { |
|
139 | + $data = $all_data["data"]; |
|
140 | + } else { |
|
141 | + throw new Exception("data is not exist in all_data"); |
|
142 | + } |
|
143 | + if(isset($all_data["oj"])) { |
|
144 | + $oj = $all_data["oj"]; |
|
145 | + } else { |
|
146 | + throw new Exception("oj is not exist in all_data"); |
|
147 | + } |
|
148 | + if(isset($all_data["ret"])) { |
|
149 | + $ret = $all_data["ret"]; |
|
150 | + } else { |
|
151 | + $ret = false; |
|
152 | + } |
|
153 | + if(isset($all_data["follow"])) { |
|
154 | + $follow = $all_data["follow"]; |
|
155 | + } else { |
|
156 | + $follow = true; |
|
157 | + } |
|
158 | + if(isset($all_data["returnHeader"])) { |
|
159 | + $returnHeader = $all_data["returnHeader"]; |
|
160 | + } else { |
|
161 | + $returnHeader = true; |
|
162 | + } |
|
163 | + if(isset($all_data["postJson"])) { |
|
164 | + $postJson = $all_data["postJson"]; |
|
165 | + } else { |
|
166 | + $postJson = false; |
|
167 | + } |
|
168 | + if(isset($all_data["extraHeaders"])) { |
|
169 | + $extraHeaders = $all_data["extraHeaders"]; |
|
170 | + } else { |
|
171 | + $extraHeaders = []; |
|
172 | + } |
|
173 | + if(isset($all_data["handle"])) { |
|
174 | + $handle = $all_data["handle"]; |
|
175 | + } else { |
|
176 | + $handle = "default"; |
|
177 | + } |
|
178 | + if(isset($all_data["vcid"])) { |
|
179 | + $vcid = $all_data["vcid"]."_"; |
|
180 | + } else { |
|
181 | + $vcid = ""; |
|
182 | + } |
|
99 | 183 | |
100 | 184 | $handle=urlencode($handle); |
101 | 185 |