@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | $statusCode=200; |
15 | 15 | } |
16 | 16 | $output=[ |
17 | - 'ret' => $statusCode, |
|
17 | + 'ret' => $statusCode, |
|
18 | 18 | 'desc' => is_null($desc) ? self::desc($statusCode) : $desc, |
19 | 19 | 'data' => $data |
20 | 20 | ]; |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $statusCode=1000; |
28 | 28 | } |
29 | 29 | $output=[ |
30 | - 'ret' => $statusCode, |
|
30 | + 'ret' => $statusCode, |
|
31 | 31 | 'desc' => is_null($desc) ? self::desc($statusCode) : $desc, |
32 | 32 | 'data' => $data |
33 | 33 | ]; |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | '451' => "Unavailable For Legal Reasons", |
45 | 45 | |
46 | 46 | '1000' => "Unspecified Response", /** Under normal condictions those errors shouldn't been displayed to end users |
47 | - * unless they attempt to do so, some submissions should be intercepted |
|
48 | - * by the frontend before the request sended |
|
49 | - */ |
|
47 | + * unless they attempt to do so, some submissions should be intercepted |
|
48 | + * by the frontend before the request sended |
|
49 | + */ |
|
50 | 50 | '1001' => "Internal Sever Error", |
51 | 51 | '1002' => "Service Currently Unavailable", |
52 | 52 | '1003' => "Missing Params", |
@@ -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 |
@@ -10,21 +10,21 @@ discard block |
||
10 | 10 | |
11 | 11 | class ApiController extends AdminController |
12 | 12 | { |
13 | - protected function paginate($items, $perPage = 15, $pageStart = 1) |
|
13 | + protected function paginate($items, $perPage=15, $pageStart=1) |
|
14 | 14 | { |
15 | - $offSet = ($pageStart * $perPage) - $perPage; |
|
16 | - $itemsForCurrentPage = array_slice($items, $offSet, $perPage, true); |
|
17 | - $paginator = new LengthAwarePaginator($itemsForCurrentPage, count($items), $perPage, Paginator::resolveCurrentPage(), ['path' => Paginator::resolveCurrentPath()]); |
|
15 | + $offSet=($pageStart * $perPage)-$perPage; |
|
16 | + $itemsForCurrentPage=array_slice($items, $offSet, $perPage, true); |
|
17 | + $paginator=new LengthAwarePaginator($itemsForCurrentPage, count($items), $perPage, Paginator::resolveCurrentPage(), ['path' => Paginator::resolveCurrentPath()]); |
|
18 | 18 | return $paginator; |
19 | 19 | } |
20 | 20 | |
21 | 21 | public function problems() |
22 | 22 | { |
23 | - $q = request()->q; |
|
23 | + $q=request()->q; |
|
24 | 24 | |
25 | - return $this->paginate(Problem::orderBy('pcode', 'asc')->get()->filter(function ($problem) use ($q) { |
|
26 | - return stripos($problem->readable_name, $q) !== false; |
|
27 | - })->values()->transform(function ($problem) { |
|
25 | + return $this->paginate(Problem::orderBy('pcode', 'asc')->get()->filter(function($problem) use ($q) { |
|
26 | + return stripos($problem->readable_name, $q)!==false; |
|
27 | + })->values()->transform(function($problem) { |
|
28 | 28 | return [ |
29 | 29 | 'id' => $problem->pid, |
30 | 30 | 'text' => $problem->readable_name, |
@@ -34,11 +34,11 @@ discard block |
||
34 | 34 | |
35 | 35 | public function users() |
36 | 36 | { |
37 | - $q = request()->q; |
|
37 | + $q=request()->q; |
|
38 | 38 | |
39 | - return $this->paginate(User::get()->filter(function ($user) use ($q) { |
|
40 | - return stripos($user->readable_name, $q) !== false; |
|
41 | - })->values()->transform(function ($user) { |
|
39 | + return $this->paginate(User::get()->filter(function($user) use ($q) { |
|
40 | + return stripos($user->readable_name, $q)!==false; |
|
41 | + })->values()->transform(function($user) { |
|
42 | 42 | return [ |
43 | 43 | 'id' => $user->id, |
44 | 44 | 'text' => $user->readable_name, |
@@ -48,16 +48,16 @@ |
||
48 | 48 | */ |
49 | 49 | protected function validator(array $data) |
50 | 50 | { |
51 | - $validator = [ |
|
51 | + $validator=[ |
|
52 | 52 | 'name' => ['required', 'string', 'max:16', 'unique:users'], |
53 | 53 | 'email' => ['required', 'string', 'email', 'max:255', 'unique:users', 'allowed_email_domain'], |
54 | 54 | 'password' => ['required', 'string', 'min:8', 'confirmed'], |
55 | 55 | 'agreement' => ['required'], |
56 | 56 | ]; |
57 | - $messages = []; |
|
58 | - if(config('function.password.strong')) { |
|
59 | - $validator['password'][] = 'regex:/^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$/'; |
|
60 | - $messages['password.regex'] = __('validation.password.strong'); |
|
57 | + $messages=[]; |
|
58 | + if (config('function.password.strong')) { |
|
59 | + $validator['password'][]='regex:/^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$/'; |
|
60 | + $messages['password.regex']=__('validation.password.strong'); |
|
61 | 61 | } |
62 | 62 | return Validator::make($data, $validator, $messages); |
63 | 63 | } |