@@ -24,19 +24,19 @@ |
||
24 | 24 | |
25 | 25 | public function getIndex() { |
26 | 26 | $data = []; |
27 | - return view($this->view.".index",$data); |
|
27 | + return view($this->view.".index", $data); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function postSave() |
31 | 31 | { |
32 | - foreach(request()->except("_token") as $key=>$val) { |
|
33 | - putSetting( $key, $val); |
|
32 | + foreach (request()->except("_token") as $key=>$val) { |
|
33 | + putSetting($key, $val); |
|
34 | 34 | } |
35 | 35 | |
36 | - putSetting("enable_register",request("enable_register")); |
|
36 | + putSetting("enable_register", request("enable_register")); |
|
37 | 37 | putSetting("enable_forget", request("enable_forget")); |
38 | 38 | putSetting("register_mail_verification", request("register_mail_verification")); |
39 | 39 | |
40 | - return cb()->redirectBack("Setting has been updated!","success"); |
|
40 | + return cb()->redirectBack("Setting has been updated!", "success"); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | \ No newline at end of file |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | try { |
25 | 25 | cb()->validation(['email'=>'required|email']); |
26 | 26 | |
27 | - if($user = cb()->find("users",["email"=>request("email")])) { |
|
27 | + if ($user = cb()->find("users", ["email"=>request("email")])) { |
|
28 | 28 | $token = Str::random(6); |
29 | 29 | $linkToken = cb()->getAdminUrl("continue-reset/".$token); |
30 | 30 | Cache::put("forget_".$token, $user->id, now()->addHours(12)); |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | |
38 | 38 | $mail = new MailHelper(); |
39 | 39 | $mail->to($user->email); |
40 | - $mail->sender(getSetting("forget_email_sender","noreply@".$_SERVER['SERVER_NAME']),cb()->getAppName()); |
|
41 | - $mail->content("Please Confirm Your Forgot Password"," |
|
40 | + $mail->sender(getSetting("forget_email_sender", "noreply@".$_SERVER['SERVER_NAME']), cb()->getAppName()); |
|
41 | + $mail->content("Please Confirm Your Forgot Password", " |
|
42 | 42 | Hi $user->name,<br/><br> |
43 | 43 | Someone with the detail bellow: <br/> |
44 | 44 | Time = ".now()->format("Y-m-d H:i:s")."<br/> |
@@ -58,28 +58,28 @@ discard block |
||
58 | 58 | return cb()->redirectBack("Your email is not registered"); |
59 | 59 | } |
60 | 60 | |
61 | - }catch (CBValidationException $e) { |
|
61 | + } catch (CBValidationException $e) { |
|
62 | 62 | return cb()->redirectBack($e->getMessage()); |
63 | 63 | } catch (\Exception $e) { |
64 | 64 | Log::error($e); |
65 | 65 | return cb()->redirectBack(cbLang("something_went_wrong")); |
66 | 66 | } |
67 | 67 | |
68 | - return cb()->redirectBack("We've sent you an email instruction. Please follow the instruction inside the email","success"); |
|
68 | + return cb()->redirectBack("We've sent you an email instruction. Please follow the instruction inside the email", "success"); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | public function getContinueReset($token) { |
72 | - if(Cache::has("forget_".$token)) { |
|
72 | + if (Cache::has("forget_".$token)) { |
|
73 | 73 | $id = Cache::get("forget_".$token); |
74 | 74 | $newPassword = Str::random(6); |
75 | 75 | cb()->update("users", $id, ["password"=>Hash::make($newPassword)]); |
76 | 76 | |
77 | - $user = cb()->find("users",$id); |
|
77 | + $user = cb()->find("users", $id); |
|
78 | 78 | |
79 | 79 | $mail = new MailHelper(); |
80 | 80 | $mail->to($user->email); |
81 | - $mail->sender(getSetting("forget_email_sender","noreply@".$_SERVER['SERVER_NAME']),cb()->getAppName()); |
|
82 | - $mail->content("This Is Your New Password"," |
|
81 | + $mail->sender(getSetting("forget_email_sender", "noreply@".$_SERVER['SERVER_NAME']), cb()->getAppName()); |
|
82 | + $mail->content("This Is Your New Password", " |
|
83 | 83 | Hi $user->name,<br/><br> |
84 | 84 | Thank you for confirming the request new password. Here is your new password: <br> |
85 | 85 | <h2>$newPassword</h2> |
@@ -90,9 +90,9 @@ discard block |
||
90 | 90 | "); |
91 | 91 | $mail->send(); |
92 | 92 | |
93 | - return cb()->redirect(cb()->getAdminUrl("login"),"We've sent you new password email. Please check at your mail inbox or spambox","success"); |
|
93 | + return cb()->redirect(cb()->getAdminUrl("login"), "We've sent you new password email. Please check at your mail inbox or spambox", "success"); |
|
94 | 94 | } else { |
95 | - return cb()->redirect(cb()->getAdminUrl("login"),"It looks like the url has been expired!"); |
|
95 | + return cb()->redirect(cb()->getAdminUrl("login"), "It looks like the url has been expired!"); |
|
96 | 96 | } |
97 | 97 | } |
98 | 98 |
@@ -58,7 +58,7 @@ |
||
58 | 58 | return cb()->redirectBack("Your email is not registered"); |
59 | 59 | } |
60 | 60 | |
61 | - }catch (CBValidationException $e) { |
|
61 | + } catch (CBValidationException $e) { |
|
62 | 62 | return cb()->redirectBack($e->getMessage()); |
63 | 63 | } catch (\Exception $e) { |
64 | 64 | Log::error($e); |
@@ -14,8 +14,12 @@ |
||
14 | 14 | { |
15 | 15 | |
16 | 16 | public function getSubModule($subModuleKey) { |
17 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
18 | - if(!verifyReferalUrl()) return cb()->redirect(module()->url(),"It looks like your url is incorrect"); |
|
17 | + if(!module()->canBrowse()) { |
|
18 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
19 | + } |
|
20 | + if(!verifyReferalUrl()) { |
|
21 | + return cb()->redirect(module()->url(),"It looks like your url is incorrect"); |
|
22 | + } |
|
19 | 23 | |
20 | 24 | if($subModule = Cache::get("subModule".$subModuleKey)) { |
21 | 25 | $foreignKey = $subModule['foreignKey']; |
@@ -14,16 +14,16 @@ discard block |
||
14 | 14 | { |
15 | 15 | |
16 | 16 | public function getSubModule($subModuleKey) { |
17 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
18 | - if(!verifyReferalUrl()) return cb()->redirect(module()->url(),"It looks like your url is incorrect"); |
|
17 | + if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
18 | + if (!verifyReferalUrl()) return cb()->redirect(module()->url(), "It looks like your url is incorrect"); |
|
19 | 19 | |
20 | - if($subModule = Cache::get("subModule".$subModuleKey)) { |
|
20 | + if ($subModule = Cache::get("subModule".$subModuleKey)) { |
|
21 | 21 | $foreignKey = $subModule['foreignKey']; |
22 | 22 | $foreignValue = $subModule['foreignValue']; |
23 | 23 | |
24 | 24 | $query = $this->repository(); |
25 | 25 | $query->where($foreignKey, $foreignValue); |
26 | - $result = $query->paginate( request("limit")?:$this->data["limit"] ); |
|
26 | + $result = $query->paginate(request("limit") ?: $this->data["limit"]); |
|
27 | 27 | $data['result'] = $result; |
28 | 28 | |
29 | 29 | $data['additionalHeaderTitle'] = $subModule['parentTitle']; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | return view("crudbooster::module.index.index", array_merge($data, $this->data)); |
34 | 34 | } |
35 | 35 | |
36 | - return cb()->redirect(module()->url(),"It looks like your url is incorrect"); |
|
36 | + return cb()->redirect(module()->url(), "It looks like your url is incorrect"); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | } |
40 | 40 | \ No newline at end of file |
@@ -18,14 +18,14 @@ |
||
18 | 18 | */ |
19 | 19 | public function columnIntervention() |
20 | 20 | { |
21 | - if(request("sub_module") && Cache::has("subModule".request("sub_module")) && cb()->getCurrentMethod() != "getDetail") { |
|
21 | + if (request("sub_module") && Cache::has("subModule".request("sub_module")) && cb()->getCurrentMethod() != "getDetail") { |
|
22 | 22 | /* |
23 | 23 | * If there is sub module, the column that has same name with foreign key should be remove |
24 | 24 | * And change to hidden. So we can save the foreign Key id from the parent module. |
25 | 25 | */ |
26 | 26 | $subModule = Cache::get("subModule".request("sub_module")); |
27 | 27 | $this->removeColumn($subModule["foreignKey"]) |
28 | - ->addHidden($subModule["foreignKey"],$subModule['foreignKey']) |
|
28 | + ->addHidden($subModule["foreignKey"], $subModule['foreignKey']) |
|
29 | 29 | ->defaultValue($subModule['foreignValue']); |
30 | 30 | } |
31 | 31 | } |
@@ -202,13 +202,13 @@ discard block |
||
202 | 202 | $parentPath = $this->getData("permalink"); |
203 | 203 | $parentTitle = $this->getData("page_title"); |
204 | 204 | $this->addActionButton($label,function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) { |
205 | - $actionParameters = [ |
|
206 | - "label"=>$label, |
|
207 | - "foreignKey"=>$foreignKey, |
|
208 | - "foreignValue"=>$row->primary_key, |
|
209 | - "parentPath"=>$parentPath, |
|
210 | - "parentTitle"=>$parentTitle |
|
211 | - ]; |
|
205 | + $actionParameters = [ |
|
206 | + "label"=>$label, |
|
207 | + "foreignKey"=>$foreignKey, |
|
208 | + "foreignValue"=>$row->primary_key, |
|
209 | + "parentPath"=>$parentPath, |
|
210 | + "parentTitle"=>$parentTitle |
|
211 | + ]; |
|
212 | 212 | |
213 | 213 | if(isset($additionalInfo) && is_callable($additionalInfo)) { |
214 | 214 | $additionalInfo = call_user_func($additionalInfo, $row); |
@@ -217,15 +217,15 @@ discard block |
||
217 | 217 | } |
218 | 218 | } |
219 | 219 | |
220 | - $actionHash = md5(serialize($actionParameters)); |
|
221 | - $actionHashToken = Cache::get("subModule".$actionHash); |
|
222 | - if(!$actionHashToken) { |
|
223 | - $actionHashToken = Str::random(5); |
|
224 | - Cache::forever("subModule".$actionHash, $actionHashToken); |
|
225 | - Cache::forever("subModule".$actionHashToken, $actionParameters); |
|
226 | - } |
|
220 | + $actionHash = md5(serialize($actionParameters)); |
|
221 | + $actionHashToken = Cache::get("subModule".$actionHash); |
|
222 | + if(!$actionHashToken) { |
|
223 | + $actionHashToken = Str::random(5); |
|
224 | + Cache::forever("subModule".$actionHash, $actionHashToken); |
|
225 | + Cache::forever("subModule".$actionHashToken, $actionParameters); |
|
226 | + } |
|
227 | 227 | |
228 | - return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle); |
|
228 | + return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle); |
|
229 | 229 | }, $condition, $font, $color); |
230 | 230 | |
231 | 231 | } |
@@ -33,11 +33,11 @@ discard block |
||
33 | 33 | $this->setButtonDetail(true); |
34 | 34 | $this->setButtonSave(true); |
35 | 35 | $this->setButtonLimitPage(true); |
36 | - $this->hideButtonDeleteWhen(function ($row) { return false; }); |
|
37 | - $this->hideButtonDetailWhen(function ($row) { return false; }); |
|
38 | - $this->hideButtonEditWhen(function ($row) { return false; }); |
|
39 | - $this->style(function () { return null; }); |
|
40 | - $this->javascript(function () { return null; }); |
|
36 | + $this->hideButtonDeleteWhen(function($row) { return false; }); |
|
37 | + $this->hideButtonDetailWhen(function($row) { return false; }); |
|
38 | + $this->hideButtonEditWhen(function($row) { return false; }); |
|
39 | + $this->style(function() { return null; }); |
|
40 | + $this->javascript(function() { return null; }); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | public function appendAddForm(callable $html) { |
@@ -157,9 +157,9 @@ discard block |
||
157 | 157 | * @param ButtonColor $color |
158 | 158 | * @param string $attributes |
159 | 159 | */ |
160 | - public function addIndexActionButton($label, $actionURL, $fontAwesome_icon=null, $color=null, $attributes = null) |
|
160 | + public function addIndexActionButton($label, $actionURL, $fontAwesome_icon = null, $color = null, $attributes = null) |
|
161 | 161 | { |
162 | - $color = ($color)?:ButtonColor::DARK_BLUE; |
|
162 | + $color = ($color) ?: ButtonColor::DARK_BLUE; |
|
163 | 163 | |
164 | 164 | $model = new IndexActionButtonModel(); |
165 | 165 | $model->setLabel($label); |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | public function addSubModule($label, $controllerName, $foreignKey, callable $additionalInfo = null, callable $condition = null, $font = null, $color = null) { |
219 | 219 | $parentPath = $this->getData("permalink"); |
220 | 220 | $parentTitle = $this->getData("page_title"); |
221 | - $this->addActionButton($label,function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) { |
|
221 | + $this->addActionButton($label, function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) { |
|
222 | 222 | $actionParameters = [ |
223 | 223 | "label"=>$label, |
224 | 224 | "foreignKey"=>$foreignKey, |
@@ -227,22 +227,22 @@ discard block |
||
227 | 227 | "parentTitle"=>$parentTitle |
228 | 228 | ]; |
229 | 229 | |
230 | - if(isset($additionalInfo) && is_callable($additionalInfo)) { |
|
230 | + if (isset($additionalInfo) && is_callable($additionalInfo)) { |
|
231 | 231 | $additionalInfo = call_user_func($additionalInfo, $row); |
232 | - if(is_array($additionalInfo)) { |
|
232 | + if (is_array($additionalInfo)) { |
|
233 | 233 | $actionParameters['info'] = $additionalInfo; |
234 | 234 | } |
235 | 235 | } |
236 | 236 | |
237 | 237 | $actionHash = md5(serialize($actionParameters)); |
238 | 238 | $actionHashToken = Cache::get("subModule".$actionHash); |
239 | - if(!$actionHashToken) { |
|
239 | + if (!$actionHashToken) { |
|
240 | 240 | $actionHashToken = Str::random(5); |
241 | 241 | Cache::forever("subModule".$actionHash, $actionHashToken); |
242 | 242 | Cache::forever("subModule".$actionHashToken, $actionParameters); |
243 | 243 | } |
244 | 244 | |
245 | - return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle); |
|
245 | + return action(class_basename($controllerName)."@getSubModule", ['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle); |
|
246 | 246 | }, $condition, $font, $color); |
247 | 247 | |
248 | 248 | } |
@@ -255,12 +255,12 @@ discard block |
||
255 | 255 | * @param $fontAwesome_icon |
256 | 256 | * @param ButtonColor|string $color |
257 | 257 | */ |
258 | - public function addActionButton($label, $url_target, $condition_callback=null, $fontAwesome_icon=null, $color=null, $confirmation = false) |
|
258 | + public function addActionButton($label, $url_target, $condition_callback = null, $fontAwesome_icon = null, $color = null, $confirmation = false) |
|
259 | 259 | { |
260 | 260 | $new = new AddActionButtonModel(); |
261 | 261 | $new->setLabel($label); |
262 | - $new->setIcon($fontAwesome_icon?:"fa fa-bars"); |
|
263 | - $new->setColor($color?:"primary"); |
|
262 | + $new->setIcon($fontAwesome_icon ?: "fa fa-bars"); |
|
263 | + $new->setColor($color ?: "primary"); |
|
264 | 264 | $new->setUrl($url_target); |
265 | 265 | $new->setCondition($condition_callback); |
266 | 266 | $new->setConfirmation($confirmation); |
@@ -19,12 +19,12 @@ |
||
19 | 19 | */ |
20 | 20 | private function validation() |
21 | 21 | { |
22 | - if(isset($this->data['validation'])) { |
|
22 | + if (isset($this->data['validation'])) { |
|
23 | 23 | $validator = Validator::make(request()->all(), @$this->data['validation'], @$this->data['validation_messages']); |
24 | 24 | if ($validator->fails()) { |
25 | 25 | $message = $validator->messages(); |
26 | 26 | $message_all = $message->all(); |
27 | - throw new CBValidationException(implode(', ',$message_all)); |
|
27 | + throw new CBValidationException(implode(', ', $message_all)); |
|
28 | 28 | } |
29 | 29 | } |
30 | 30 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | |
24 | 24 | public function hasData($key) { |
25 | 25 | $data = $this->data; |
26 | - if(isset($data[$key])) return true; |
|
26 | + if (isset($data[$key])) return true; |
|
27 | 27 | else return false; |
28 | 28 | } |
29 | 29 |
@@ -23,8 +23,11 @@ |
||
23 | 23 | |
24 | 24 | public function hasData($key) { |
25 | 25 | $data = $this->data; |
26 | - if(isset($data[$key])) return true; |
|
27 | - else return false; |
|
26 | + if(isset($data[$key])) { |
|
27 | + return true; |
|
28 | + } else { |
|
29 | + return false; |
|
30 | + } |
|
28 | 31 | } |
29 | 32 | |
30 | 33 | public function setData($key, $value): void |
@@ -16,6 +16,6 @@ |
||
16 | 16 | public static function hasColumn($table, $column) |
17 | 17 | { |
18 | 18 | $columns = cb()->listAllColumns($table); |
19 | - return in_array($column,$columns); |
|
19 | + return in_array($column, $columns); |
|
20 | 20 | } |
21 | 21 | } |
22 | 22 | \ No newline at end of file |
@@ -100,14 +100,14 @@ discard block |
||
100 | 100 | if($resize_width || $resize_height) { |
101 | 101 | $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height); |
102 | 102 | return $file_path.'/'.$filename; |
103 | - }else{ |
|
103 | + } else{ |
|
104 | 104 | if (Storage::putFileAs($file_path, $file, $filename, 'public')) { |
105 | 105 | return $file_path.'/'.$filename; |
106 | 106 | } else { |
107 | 107 | throw new \Exception("Something went wrong, file can't upload!"); |
108 | 108 | } |
109 | 109 | } |
110 | - }else{ |
|
110 | + } else{ |
|
111 | 111 | throw new \Exception("The file format is not allowed!"); |
112 | 112 | } |
113 | 113 | } |
@@ -129,10 +129,10 @@ discard block |
||
129 | 129 | if($filename && $ext) { |
130 | 130 | return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height); |
131 | 131 | } |
132 | - }else { |
|
132 | + } else { |
|
133 | 133 | throw new \Exception("Mime type not found"); |
134 | 134 | } |
135 | - }else{ |
|
135 | + } else{ |
|
136 | 136 | throw new \Exception("Mime type not found"); |
137 | 137 | } |
138 | 138 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | } |
210 | 210 | |
211 | 211 | Storage::put($fullFilePath, $img, 'public'); |
212 | - }else{ |
|
212 | + } else{ |
|
213 | 213 | throw new \Exception("The file format is not allowed!"); |
214 | 214 | } |
215 | 215 | } |
@@ -233,7 +233,9 @@ discard block |
||
233 | 233 | { |
234 | 234 | if (is_array($id)) { |
235 | 235 | $idHash = md5("find".$table.serialize($id)); |
236 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
236 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
237 | + return miscellanousSingleton()->getData($idHash); |
|
238 | + } |
|
237 | 239 | |
238 | 240 | $first = DB::table($table); |
239 | 241 | foreach ($id as $k => $v) { |
@@ -245,7 +247,9 @@ discard block |
||
245 | 247 | return $data; |
246 | 248 | } else { |
247 | 249 | $idHash = md5("find".$table.$id); |
248 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
250 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
251 | + return miscellanousSingleton()->getData($idHash); |
|
252 | + } |
|
249 | 253 | |
250 | 254 | $pk = $this->pk($table); |
251 | 255 | $data = DB::table($table)->where($pk, $id)->first(); |
@@ -266,19 +270,25 @@ discard block |
||
266 | 270 | |
267 | 271 | if(is_array($conditionOrCallback)) { |
268 | 272 | $idHash = md5("findAll".$table.serialize($conditionOrCallback)); |
269 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
273 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
274 | + return miscellanousSingleton()->getData($idHash); |
|
275 | + } |
|
270 | 276 | |
271 | 277 | $data = DB::table($table)->where($conditionOrCallback)->get(); |
272 | 278 | } elseif (is_callable($conditionOrCallback)) { |
273 | 279 | $idHash = "findAll".$table.spl_object_hash($conditionOrCallback); |
274 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
280 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
281 | + return miscellanousSingleton()->getData($idHash); |
|
282 | + } |
|
275 | 283 | |
276 | 284 | $data = DB::table($table); |
277 | 285 | $data = call_user_func($conditionOrCallback, $data); |
278 | 286 | $data = $data->get(); |
279 | 287 | } else { |
280 | 288 | $idHash = md5("findAll".$table.$conditionOrCallback); |
281 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
289 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
290 | + return miscellanousSingleton()->getData($idHash); |
|
291 | + } |
|
282 | 292 | |
283 | 293 | $data = DB::table($table); |
284 | 294 | if($conditionOrCallback) { |
@@ -297,7 +307,9 @@ discard block |
||
297 | 307 | public function listAllTable() |
298 | 308 | { |
299 | 309 | $idHash = md5("listAllTable"); |
300 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
310 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
311 | + return miscellanousSingleton()->getData($idHash); |
|
312 | + } |
|
301 | 313 | $data = DB::connection()->getDoctrineSchemaManager()->listTableNames(); |
302 | 314 | miscellanousSingleton()->setData($idHash, $data); |
303 | 315 | return $data; |
@@ -306,7 +318,9 @@ discard block |
||
306 | 318 | public function listAllColumns($table) |
307 | 319 | { |
308 | 320 | $idHash = md5("listAllColumns".$table); |
309 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
321 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
322 | + return miscellanousSingleton()->getData($idHash); |
|
323 | + } |
|
310 | 324 | $data = Schema::getColumnListing($table); |
311 | 325 | miscellanousSingleton()->setData($idHash, $data); |
312 | 326 | return $data; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | public function getRoleByName($roleName) { |
27 | - return $this->find("cb_roles",['name'=>$roleName]); |
|
27 | + return $this->find("cb_roles", ['name'=>$roleName]); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function fcm() { |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | public function getDeveloperPath($path = null) { |
43 | - $path = ($path)?"/".trim($path,"/"):null; |
|
43 | + $path = ($path) ? "/".trim($path, "/") : null; |
|
44 | 44 | return "developer/".getSetting("developer_path").$path; |
45 | 45 | } |
46 | 46 | |
@@ -61,16 +61,16 @@ discard block |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | public function getAdminPath() { |
64 | - return getSetting("ADMIN_PATH","admin"); |
|
64 | + return getSetting("ADMIN_PATH", "admin"); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | public function getAdminUrl($path = null) { |
68 | - $path = ($path)?"/".trim($path,"/"):null; |
|
68 | + $path = ($path) ? "/".trim($path, "/") : null; |
|
69 | 69 | return url($this->getAdminPath()).$path; |
70 | 70 | } |
71 | 71 | |
72 | 72 | public function getAppName() { |
73 | - return getSetting("APP_NAME", env("APP_NAME","CRUDBOOSTER")); |
|
73 | + return getSetting("APP_NAME", env("APP_NAME", "CRUDBOOSTER")); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -84,16 +84,16 @@ discard block |
||
84 | 84 | */ |
85 | 85 | private function uploadFileProcess($filename, $extension, $file, $encrypt = true, $resize_width = null, $resize_height = null) |
86 | 86 | { |
87 | - if(in_array($extension,cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) { |
|
87 | + if (in_array($extension, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) { |
|
88 | 88 | $file_path = cbConfig("UPLOAD_PATH_FORMAT"); |
89 | - $file_path = str_replace("{Y}",date('Y'), $file_path); |
|
89 | + $file_path = str_replace("{Y}", date('Y'), $file_path); |
|
90 | 90 | $file_path = str_replace("{m}", date('m'), $file_path); |
91 | 91 | $file_path = str_replace("{d}", date("d"), $file_path); |
92 | 92 | |
93 | 93 | //Create Directory Base On Template |
94 | 94 | Storage::makeDirectory($file_path); |
95 | - Storage::put($file_path."/index.html"," ","public"); |
|
96 | - Storage::put($file_path."/.gitignore","!.gitignore","public"); |
|
95 | + Storage::put($file_path."/index.html", " ", "public"); |
|
96 | + Storage::put($file_path."/.gitignore", "!.gitignore", "public"); |
|
97 | 97 | |
98 | 98 | if ($encrypt == true) { |
99 | 99 | $filename = md5(strRandom(5)).'.'.$extension; |
@@ -101,17 +101,17 @@ discard block |
||
101 | 101 | $filename = slug($filename, '_').'.'.$extension; |
102 | 102 | } |
103 | 103 | |
104 | - if($resize_width || $resize_height) { |
|
104 | + if ($resize_width || $resize_height) { |
|
105 | 105 | $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height); |
106 | 106 | return $file_path.'/'.$filename; |
107 | - }else{ |
|
107 | + } else { |
|
108 | 108 | if (Storage::putFileAs($file_path, $file, $filename, 'public')) { |
109 | 109 | return $file_path.'/'.$filename; |
110 | 110 | } else { |
111 | 111 | throw new \Exception("Something went wrong, file can't upload!"); |
112 | 112 | } |
113 | 113 | } |
114 | - }else{ |
|
114 | + } else { |
|
115 | 115 | throw new \Exception("The file format is not allowed!"); |
116 | 116 | } |
117 | 117 | } |
@@ -127,16 +127,16 @@ discard block |
||
127 | 127 | { |
128 | 128 | $fileData = base64_decode($base64_value); |
129 | 129 | $mime_type = finfo_buffer(finfo_open(), $fileData, FILEINFO_MIME_TYPE); |
130 | - if($mime_type) { |
|
131 | - if($mime_type = explode('/', $mime_type)) { |
|
130 | + if ($mime_type) { |
|
131 | + if ($mime_type = explode('/', $mime_type)) { |
|
132 | 132 | $ext = $mime_type[1]; |
133 | - if($filename && $ext) { |
|
133 | + if ($filename && $ext) { |
|
134 | 134 | return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height); |
135 | 135 | } |
136 | - }else { |
|
136 | + } else { |
|
137 | 137 | throw new \Exception("Mime type not found"); |
138 | 138 | } |
139 | - }else{ |
|
139 | + } else { |
|
140 | 140 | throw new \Exception("Mime type not found"); |
141 | 141 | } |
142 | 142 | } |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $filename = $file->getClientOriginalName(); |
157 | 157 | $ext = strtolower($file->getClientOriginalExtension()); |
158 | 158 | |
159 | - if($filename && $ext) { |
|
159 | + if ($filename && $ext) { |
|
160 | 160 | return $this->uploadFileProcess($filename, $ext, $file, $encrypt, $resize_width, $resize_height); |
161 | 161 | } |
162 | 162 | |
@@ -191,29 +191,29 @@ discard block |
||
191 | 191 | if ($resize_width && $resize_height) { |
192 | 192 | $img->fit($resize_width, $resize_height); |
193 | 193 | |
194 | - } elseif ($resize_width && ! $resize_height) { |
|
194 | + } elseif ($resize_width && !$resize_height) { |
|
195 | 195 | |
196 | - $img->resize($resize_width, null, function ($constraint) { |
|
196 | + $img->resize($resize_width, null, function($constraint) { |
|
197 | 197 | $constraint->aspectRatio(); |
198 | 198 | }); |
199 | 199 | |
200 | - } elseif (! $resize_width && $resize_height) { |
|
200 | + } elseif (!$resize_width && $resize_height) { |
|
201 | 201 | |
202 | - $img->resize(null, $resize_height, function ($constraint) { |
|
202 | + $img->resize(null, $resize_height, function($constraint) { |
|
203 | 203 | $constraint->aspectRatio(); |
204 | 204 | }); |
205 | 205 | |
206 | 206 | } else { |
207 | 207 | |
208 | 208 | if ($img->width() > cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES")) { |
209 | - $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function ($constraint) { |
|
209 | + $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function($constraint) { |
|
210 | 210 | $constraint->aspectRatio(); |
211 | 211 | }); |
212 | 212 | } |
213 | 213 | } |
214 | 214 | |
215 | 215 | Storage::put($fullFilePath, $img, 'public'); |
216 | - }else{ |
|
216 | + } else { |
|
217 | 217 | throw new \Exception("The file format is not allowed!"); |
218 | 218 | } |
219 | 219 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | { |
238 | 238 | if (is_array($id)) { |
239 | 239 | $idHash = md5("find".$table.serialize($id)); |
240 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
240 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
241 | 241 | |
242 | 242 | $first = DB::table($table); |
243 | 243 | foreach ($id as $k => $v) { |
@@ -245,15 +245,15 @@ discard block |
||
245 | 245 | } |
246 | 246 | |
247 | 247 | $data = $first->first(); |
248 | - miscellanousSingleton()->setData($idHash,$data); |
|
248 | + miscellanousSingleton()->setData($idHash, $data); |
|
249 | 249 | return $data; |
250 | 250 | } else { |
251 | 251 | $idHash = md5("find".$table.$id); |
252 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
252 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
253 | 253 | |
254 | 254 | $pk = $this->pk($table); |
255 | 255 | $data = DB::table($table)->where($pk, $id)->first(); |
256 | - miscellanousSingleton()->setData($idHash,$data); |
|
256 | + miscellanousSingleton()->setData($idHash, $data); |
|
257 | 257 | return $data; |
258 | 258 | } |
259 | 259 | } |
@@ -268,30 +268,30 @@ discard block |
||
268 | 268 | $data = []; |
269 | 269 | $idHash = null; |
270 | 270 | |
271 | - if(is_array($conditionOrCallback)) { |
|
271 | + if (is_array($conditionOrCallback)) { |
|
272 | 272 | $idHash = md5("findAll".$table.serialize($conditionOrCallback)); |
273 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
273 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
274 | 274 | |
275 | 275 | $data = DB::table($table)->where($conditionOrCallback)->get(); |
276 | 276 | } elseif (is_callable($conditionOrCallback)) { |
277 | 277 | $idHash = "findAll".$table.spl_object_hash($conditionOrCallback); |
278 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
278 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
279 | 279 | |
280 | 280 | $data = DB::table($table); |
281 | 281 | $data = call_user_func($conditionOrCallback, $data); |
282 | 282 | $data = $data->get(); |
283 | 283 | } else { |
284 | 284 | $idHash = md5("findAll".$table.$conditionOrCallback); |
285 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
285 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
286 | 286 | |
287 | 287 | $data = DB::table($table); |
288 | - if($conditionOrCallback) { |
|
288 | + if ($conditionOrCallback) { |
|
289 | 289 | $data = $data->whereRaw($conditionOrCallback); |
290 | 290 | } |
291 | 291 | $data = $data->get(); |
292 | 292 | } |
293 | 293 | |
294 | - if($idHash && $data) { |
|
294 | + if ($idHash && $data) { |
|
295 | 295 | miscellanousSingleton()->setData($idHash, $data); |
296 | 296 | } |
297 | 297 | |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | public function listAllTable() |
302 | 302 | { |
303 | 303 | $idHash = md5("listAllTable"); |
304 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
304 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
305 | 305 | $data = DB::connection()->getDoctrineSchemaManager()->listTableNames(); |
306 | 306 | miscellanousSingleton()->setData($idHash, $data); |
307 | 307 | return $data; |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | public function listAllColumns($table) |
311 | 311 | { |
312 | 312 | $idHash = md5("listAllColumns".$table); |
313 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
313 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
314 | 314 | $data = Schema::getColumnListing($table); |
315 | 315 | miscellanousSingleton()->setData($idHash, $data); |
316 | 316 | return $data; |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | $validator = Validator::make($input_arr, $rules, $messages); |
379 | 379 | if ($validator->fails()) { |
380 | 380 | $message = $validator->errors()->all(); |
381 | - throw new CBValidationException(implode("; ",$message)); |
|
381 | + throw new CBValidationException(implode("; ", $message)); |
|
382 | 382 | } |
383 | 383 | } |
384 | 384 | |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | public function findPrimaryKey($table) |
391 | 391 | { |
392 | 392 | $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey(); |
393 | - if(!$pk) { |
|
393 | + if (!$pk) { |
|
394 | 394 | return null; |
395 | 395 | } |
396 | 396 | return $pk->getColumns()[0]; |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | $string_parameters_array = explode('&', $string_parameters); |
440 | 440 | foreach ($string_parameters_array as $s) { |
441 | 441 | $part = explode('=', $s); |
442 | - if(isset($part[0]) && isset($part[1])) { |
|
442 | + if (isset($part[0]) && isset($part[1])) { |
|
443 | 443 | $name = htmlspecialchars(urldecode($part[0])); |
444 | 444 | $name = strip_tags($name); |
445 | 445 | $value = htmlspecialchars(urldecode($part[1])); |
@@ -456,16 +456,16 @@ discard block |
||
456 | 456 | |
457 | 457 | |
458 | 458 | public function routeGet($prefix, $controller) { |
459 | - $alias = str_replace("@"," ", $controller); |
|
459 | + $alias = str_replace("@", " ", $controller); |
|
460 | 460 | $alias = ucwords($alias); |
461 | - $alias = str_replace(" ","",$alias); |
|
461 | + $alias = str_replace(" ", "", $alias); |
|
462 | 462 | Route::get($prefix, ['uses' => $controller, 'as' => $alias]); |
463 | 463 | } |
464 | 464 | |
465 | 465 | public function routePost($prefix, $controller) { |
466 | - $alias = str_replace("@"," ", $controller); |
|
466 | + $alias = str_replace("@", " ", $controller); |
|
467 | 467 | $alias = ucwords($alias); |
468 | - $alias = str_replace(" ","",$alias); |
|
468 | + $alias = str_replace(" ", "", $alias); |
|
469 | 469 | Route::post($prefix, ['uses' => $controller, 'as' => $alias]); |
470 | 470 | } |
471 | 471 | |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | |
499 | 499 | $prefix = trim($prefix, '/').'/'; |
500 | 500 | |
501 | - if(substr($controller,0,1) != "\\") { |
|
501 | + if (substr($controller, 0, 1) != "\\") { |
|
502 | 502 | $controller = "\App\Http\Controllers\\".$controller; |
503 | 503 | } |
504 | 504 |