@@ -23,7 +23,7 @@ |
||
23 | 23 | } catch (ErrorException $e) { |
24 | 24 | } catch (Exception $e) { |
25 | 25 | } |
26 | - $className = "App\\Babel\\Extension\\$oj\\$synchronizerProvider"; |
|
26 | + $className="App\\Babel\\Extension\\$oj\\$synchronizerProvider"; |
|
27 | 27 | if (class_exists($className)) { |
28 | 28 | return new $className($all_data); |
29 | 29 | } else { |
@@ -18,11 +18,11 @@ 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"])) $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"; |
|
26 | 26 | |
27 | 27 | $datapost=curl_init(); |
28 | 28 | $headers=array("Expect:"); |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | |
55 | 55 | public function grab_page($all_data) |
56 | 56 | { |
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 $handle = false; |
|
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 $handle=false; |
|
62 | 62 | |
63 | 63 | $handle=urlencode($handle); |
64 | 64 | |
@@ -85,15 +85,15 @@ discard block |
||
85 | 85 | |
86 | 86 | public function post_data($all_data) |
87 | 87 | { |
88 | - if(isset($all_data["site"])) $site = $all_data["site"]; else throw new Exception("site is not exist in all_data"); |
|
89 | - if(isset($all_data["data"])) $data = $all_data["data"]; else throw new Exception("data is not exist in all_data"); |
|
90 | - if(isset($all_data["oj"])) $oj = $all_data["oj"]; else throw new Exception("oj is not exist in all_data"); |
|
91 | - if(isset($all_data["ret"])) $ret = $all_data["ret"]; else $ret = false; |
|
92 | - if(isset($all_data["follow"])) $follow = $all_data["follow"]; else $follow = true; |
|
93 | - if(isset($all_data["returnHeader"])) $returnHeader = $all_data["returnHeader"]; else $returnHeader = true; |
|
94 | - if(isset($all_data["postJson"])) $postJson = $all_data["postJson"]; else $postJson = false; |
|
95 | - if(isset($all_data["extraHeaders"])) $extraHeaders = $all_data["extraHeaders"]; else $extraHeaders = []; |
|
96 | - if(isset($all_data["handle"])) $handle = $all_data["handle"]; else $handle = "default"; |
|
88 | + if (isset($all_data["site"])) $site=$all_data["site"]; else throw new Exception("site is not exist in all_data"); |
|
89 | + if (isset($all_data["data"])) $data=$all_data["data"]; else throw new Exception("data is not exist in all_data"); |
|
90 | + if (isset($all_data["oj"])) $oj=$all_data["oj"]; else throw new Exception("oj is not exist in all_data"); |
|
91 | + if (isset($all_data["ret"])) $ret=$all_data["ret"]; else $ret=false; |
|
92 | + if (isset($all_data["follow"])) $follow=$all_data["follow"]; else $follow=true; |
|
93 | + if (isset($all_data["returnHeader"])) $returnHeader=$all_data["returnHeader"]; else $returnHeader=true; |
|
94 | + if (isset($all_data["postJson"])) $postJson=$all_data["postJson"]; else $postJson=false; |
|
95 | + if (isset($all_data["extraHeaders"])) $extraHeaders=$all_data["extraHeaders"]; else $extraHeaders=[]; |
|
96 | + if (isset($all_data["handle"])) $handle=$all_data["handle"]; else $handle="default"; |
|
97 | 97 | |
98 | 98 | $handle=urlencode($handle); |
99 | 99 |
@@ -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,11 +74,31 @@ 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 $handle = false; |
|
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 | + $handle = false; |
|
101 | + } |
|
62 | 102 | |
63 | 103 | $handle=urlencode($handle); |
64 | 104 | |
@@ -85,15 +125,51 @@ discard block |
||
85 | 125 | |
86 | 126 | public function post_data($all_data) |
87 | 127 | { |
88 | - if(isset($all_data["site"])) $site = $all_data["site"]; else throw new Exception("site is not exist in all_data"); |
|
89 | - if(isset($all_data["data"])) $data = $all_data["data"]; else throw new Exception("data is not exist in all_data"); |
|
90 | - if(isset($all_data["oj"])) $oj = $all_data["oj"]; else throw new Exception("oj is not exist in all_data"); |
|
91 | - if(isset($all_data["ret"])) $ret = $all_data["ret"]; else $ret = false; |
|
92 | - if(isset($all_data["follow"])) $follow = $all_data["follow"]; else $follow = true; |
|
93 | - if(isset($all_data["returnHeader"])) $returnHeader = $all_data["returnHeader"]; else $returnHeader = true; |
|
94 | - if(isset($all_data["postJson"])) $postJson = $all_data["postJson"]; else $postJson = false; |
|
95 | - if(isset($all_data["extraHeaders"])) $extraHeaders = $all_data["extraHeaders"]; else $extraHeaders = []; |
|
96 | - if(isset($all_data["handle"])) $handle = $all_data["handle"]; else $handle = "default"; |
|
128 | + if(isset($all_data["site"])) { |
|
129 | + $site = $all_data["site"]; |
|
130 | + } else { |
|
131 | + throw new Exception("site is not exist in all_data"); |
|
132 | + } |
|
133 | + if(isset($all_data["data"])) { |
|
134 | + $data = $all_data["data"]; |
|
135 | + } else { |
|
136 | + throw new Exception("data is not exist in all_data"); |
|
137 | + } |
|
138 | + if(isset($all_data["oj"])) { |
|
139 | + $oj = $all_data["oj"]; |
|
140 | + } else { |
|
141 | + throw new Exception("oj is not exist in all_data"); |
|
142 | + } |
|
143 | + if(isset($all_data["ret"])) { |
|
144 | + $ret = $all_data["ret"]; |
|
145 | + } else { |
|
146 | + $ret = false; |
|
147 | + } |
|
148 | + if(isset($all_data["follow"])) { |
|
149 | + $follow = $all_data["follow"]; |
|
150 | + } else { |
|
151 | + $follow = true; |
|
152 | + } |
|
153 | + if(isset($all_data["returnHeader"])) { |
|
154 | + $returnHeader = $all_data["returnHeader"]; |
|
155 | + } else { |
|
156 | + $returnHeader = true; |
|
157 | + } |
|
158 | + if(isset($all_data["postJson"])) { |
|
159 | + $postJson = $all_data["postJson"]; |
|
160 | + } else { |
|
161 | + $postJson = false; |
|
162 | + } |
|
163 | + if(isset($all_data["extraHeaders"])) { |
|
164 | + $extraHeaders = $all_data["extraHeaders"]; |
|
165 | + } else { |
|
166 | + $extraHeaders = []; |
|
167 | + } |
|
168 | + if(isset($all_data["handle"])) { |
|
169 | + $handle = $all_data["handle"]; |
|
170 | + } else { |
|
171 | + $handle = "default"; |
|
172 | + } |
|
97 | 173 | |
98 | 174 | $handle=urlencode($handle); |
99 | 175 |
@@ -51,7 +51,7 @@ |
||
51 | 51 | } catch (ErrorException $e) { |
52 | 52 | } catch (Exception $e) { |
53 | 53 | } |
54 | - $className = "App\\Babel\\Extension\\$oj\\$submitterProvider"; |
|
54 | + $className="App\\Babel\\Extension\\$oj\\$submitterProvider"; |
|
55 | 55 | if (class_exists($className)) { |
56 | 56 | return new $className($sub, $all_data); |
57 | 57 | } else { |
@@ -56,7 +56,7 @@ |
||
56 | 56 | } catch (ErrorException $e) { |
57 | 57 | } catch (Exception $e) { |
58 | 58 | } |
59 | - $className = "App\\Babel\\Extension\\$name\\$judgerProvider"; |
|
59 | + $className="App\\Babel\\Extension\\$name\\$judgerProvider"; |
|
60 | 60 | if (class_exists($className)) { |
61 | 61 | return new $className(); |
62 | 62 | } else { |
@@ -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"); |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | //writing database |
40 | 40 | $this->transactionDB(); |
41 | 41 | |
42 | - }catch(Throwable $e){ |
|
43 | - if ($e->getMessage()!==""){ |
|
42 | + } catch (Throwable $e) { |
|
43 | + if ($e->getMessage()!=="") { |
|
44 | 44 | $this->command->line("\n <bg=red;fg=white> {$e->getMessage()} </>\n"); |
45 | 45 | } |
46 | 46 | } |
@@ -59,12 +59,12 @@ discard block |
||
59 | 59 | public function __construct($class) |
60 | 60 | { |
61 | 61 | $this->command=$class; |
62 | - $this->versionParser = new VersionConstraintParser(); |
|
62 | + $this->versionParser=new VersionConstraintParser(); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | private function parseVersion() |
66 | 66 | { |
67 | - if(empty($this->babelConfig)){ |
|
67 | + if (empty($this->babelConfig)) { |
|
68 | 68 | throw new Exception('Missing babel.json Config file.'); |
69 | 69 | } |
70 | 70 | |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | |
135 | 135 | DB::commit(); |
136 | 136 | |
137 | - }catch(Throwable $e){ |
|
137 | + } catch (Throwable $e) { |
|
138 | 138 | DB::rollback(); |
139 | 139 | if ($e->getMessage()!=="") { |
140 | 140 | $this->command->line("\n <bg=red;fg=white> {$e->getMessage()} </>\n"); |
@@ -88,11 +88,11 @@ discard block |
||
88 | 88 | if (!isset($data["ori"]) || !isset($data["path"]) || !isset($data["baseurl"]) || !isset($data["space_deli"]) || !isset($data["cookie"])) { |
89 | 89 | throw new Exception("data is not completely exist in cacheImage"); |
90 | 90 | } |
91 | - $ori = $data["ori"]; |
|
92 | - $path = $data["path"]; |
|
93 | - $baseurl = $data["baseurl"]; |
|
94 | - $space_deli = $data["space_deli"]; |
|
95 | - $cookie = $data["cookie"]; |
|
91 | + $ori=$data["ori"]; |
|
92 | + $path=$data["path"]; |
|
93 | + $baseurl=$data["baseurl"]; |
|
94 | + $space_deli=$data["space_deli"]; |
|
95 | + $cookie=$data["cookie"]; |
|
96 | 96 | |
97 | 97 | $para["path"]=$path; |
98 | 98 | $para["base"]=$baseurl; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $reg="/< *im[a]?g[^>]*src *= *[\"\\']?([^\"\\'>]*)[^>]*>/si"; |
106 | 106 | } |
107 | 107 | |
108 | - return preg_replace_callback($reg, function ($matches) use ($para) { |
|
108 | + return preg_replace_callback($reg, function($matches) use ($para) { |
|
109 | 109 | global $config; |
110 | 110 | $url=trim($matches[1]); |
111 | 111 | if (stripos($url, "http://")===false && stripos($url, "https://")===false) { |
@@ -138,24 +138,24 @@ discard block |
||
138 | 138 | public function procInfo($data) |
139 | 139 | { |
140 | 140 | if (isset($data["path"])) { |
141 | - $path = $data["path"]; |
|
141 | + $path=$data["path"]; |
|
142 | 142 | } else { |
143 | 143 | throw new Exception("path is not exist in data"); |
144 | 144 | } |
145 | 145 | if (isset($data["baseurl"])) { |
146 | - $baseurl = $data["baseurl"]; |
|
146 | + $baseurl=$data["baseurl"]; |
|
147 | 147 | } else { |
148 | 148 | throw new Exception("baseurl is not exist in data"); |
149 | 149 | } |
150 | 150 | if (isset($data["space_deli"])) { |
151 | - $space_deli = $data["space_deli"]; |
|
151 | + $space_deli=$data["space_deli"]; |
|
152 | 152 | } else { |
153 | - $space_deli = true; |
|
153 | + $space_deli=true; |
|
154 | 154 | } |
155 | 155 | if (isset($data["cookie"])) { |
156 | - $cookie = $data["cookie"]; |
|
156 | + $cookie=$data["cookie"]; |
|
157 | 157 | } else { |
158 | - $cookie = ""; |
|
158 | + $cookie=""; |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | $this->pro["description"]=$this->_cacheImage($this->pro["description"], $path, $baseurl, $space_deli, $cookie); |
@@ -32,7 +32,7 @@ |
||
32 | 32 | } catch (ErrorException $e) { |
33 | 33 | } catch (Exception $e) { |
34 | 34 | } |
35 | - $className = "App\\Babel\\Extension\\$name\\$crawlerProvider"; |
|
35 | + $className="App\\Babel\\Extension\\$name\\$crawlerProvider"; |
|
36 | 36 | if (class_exists($className)) { |
37 | 37 | $temp=new $className(); |
38 | 38 | $temp->importCommandLine($commandLineObject); |
@@ -33,7 +33,7 @@ |
||
33 | 33 | } catch (ErrorException $e) { |
34 | 34 | } catch (Exception $e) { |
35 | 35 | } |
36 | - $className = "App\\Babel\\Extension\\$name\\$monitorProvider"; |
|
36 | + $className="App\\Babel\\Extension\\$name\\$monitorProvider"; |
|
37 | 37 | if (class_exists($className)) { |
38 | 38 | return new $className(); |
39 | 39 | } else { |
@@ -13,15 +13,15 @@ |
||
13 | 13 | { |
14 | 14 | $version=UpdateModel::checkUpdate(); |
15 | 15 | |
16 | - $status = [ |
|
17 | - ['name' => 'NOJ Version', 'value' => version()], |
|
18 | - ['name' => 'Lastest Version', 'value' => is_null($version)?'Failed to fetch latest version':$version["name"]], |
|
19 | - ['name' => 'Problems', 'value' => \App\Models\Eloquent\ProblemModel::count()], |
|
20 | - ['name' => 'Solutions', 'value' => \App\Models\Eloquent\ProblemSolutionModel::count()], |
|
21 | - ['name' => 'Submissions', 'value' => \App\Models\Eloquent\SubmissionModel::count()], |
|
22 | - ['name' => 'Contests', 'value' => \App\Models\Eloquent\ContestModel::count()], |
|
23 | - ['name' => 'Users', 'value' => \App\Models\Eloquent\UserModel::count()], |
|
24 | - ['name' => 'Groups', 'value' => \App\Models\Eloquent\GroupModel::count()], |
|
16 | + $status=[ |
|
17 | + ['name' => 'NOJ Version', 'value' => version()], |
|
18 | + ['name' => 'Lastest Version', 'value' => is_null($version) ? 'Failed to fetch latest version' : $version["name"]], |
|
19 | + ['name' => 'Problems', 'value' => \App\Models\Eloquent\ProblemModel::count()], |
|
20 | + ['name' => 'Solutions', 'value' => \App\Models\Eloquent\ProblemSolutionModel::count()], |
|
21 | + ['name' => 'Submissions', 'value' => \App\Models\Eloquent\SubmissionModel::count()], |
|
22 | + ['name' => 'Contests', 'value' => \App\Models\Eloquent\ContestModel::count()], |
|
23 | + ['name' => 'Users', 'value' => \App\Models\Eloquent\UserModel::count()], |
|
24 | + ['name' => 'Groups', 'value' => \App\Models\Eloquent\GroupModel::count()], |
|
25 | 25 | ]; |
26 | 26 | |
27 | 27 | return view('admin::dashboard.general', [ |