@@ -69,7 +69,7 @@ |
||
| 69 | 69 | return cb()->redirect(cb()->getAdminUrl("login"),"Thank you for register. Now you can login to start your session :)","success"); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - }catch (CBValidationException $e) { |
|
| 72 | + } catch (CBValidationException $e) { |
|
| 73 | 73 | return cb()->redirectBack($e->getMessage()); |
| 74 | 74 | } |
| 75 | 75 | |
@@ -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']; |
@@ -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 |
@@ -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; |
@@ -2,8 +2,11 @@ discard block |
||
| 2 | 2 | if(!function_exists("isConfigCached")) { |
| 3 | 3 | function isConfigCached() |
| 4 | 4 | { |
| 5 | - if(env("APP_NAME")=="" || env("APP_NAME")==null) return true; |
|
| 6 | - else return false; |
|
| 5 | + if(env("APP_NAME")=="" || env("APP_NAME")==null) { |
|
| 6 | + return true; |
|
| 7 | + } else { |
|
| 8 | + return false; |
|
| 9 | + } |
|
| 7 | 10 | } |
| 8 | 11 | } |
| 9 | 12 | |
@@ -113,7 +116,9 @@ discard block |
||
| 113 | 116 | } |
| 114 | 117 | |
| 115 | 118 | $str = substr($str, 0, -1); |
| 116 | - if (!file_put_contents($envFile, $str)) return false; |
|
| 119 | + if (!file_put_contents($envFile, $str)) { |
|
| 120 | + return false; |
|
| 121 | + } |
|
| 117 | 122 | return true; |
| 118 | 123 | } |
| 119 | 124 | } |
@@ -316,7 +321,7 @@ discard block |
||
| 316 | 321 | $settings = file_get_contents(storage_path('.cbconfig')); |
| 317 | 322 | $settings = decrypt($settings); |
| 318 | 323 | $settings = unserialize($settings); |
| 319 | - }else{ |
|
| 324 | + } else{ |
|
| 320 | 325 | $settings = []; |
| 321 | 326 | } |
| 322 | 327 | |
@@ -341,14 +346,14 @@ discard block |
||
| 341 | 346 | $settings = file_get_contents(storage_path('.cbconfig')); |
| 342 | 347 | $settings = decrypt($settings); |
| 343 | 348 | $settings = unserialize($settings); |
| 344 | - }else{ |
|
| 349 | + } else{ |
|
| 345 | 350 | $settings = []; |
| 346 | 351 | } |
| 347 | 352 | |
| 348 | 353 | if(isset($settings[$key])) { |
| 349 | 354 | \Illuminate\Support\Facades\Cache::forever("setting_".$key, $settings[$key]); |
| 350 | 355 | return $settings[$key]?:$default; |
| 351 | - }else{ |
|
| 356 | + } else{ |
|
| 352 | 357 | return $default; |
| 353 | 358 | } |
| 354 | 359 | } |
@@ -434,7 +439,7 @@ discard block |
||
| 434 | 439 | $url = request($name); |
| 435 | 440 | if(filter_var($url, FILTER_VALIDATE_URL)) { |
| 436 | 441 | return $url; |
| 437 | - }else{ |
|
| 442 | + } else{ |
|
| 438 | 443 | return request()->url(); |
| 439 | 444 | } |
| 440 | 445 | } |
@@ -446,14 +451,14 @@ discard block |
||
| 446 | 451 | $response = request($name); |
| 447 | 452 | if(is_string($response)) { |
| 448 | 453 | $response = sanitizeXSS($response); |
| 449 | - }elseif (is_array($response)) { |
|
| 454 | + } elseif (is_array($response)) { |
|
| 450 | 455 | array_walk_recursive($response, function(&$response) { |
| 451 | 456 | $response = sanitizeXSS($response); |
| 452 | 457 | }); |
| 453 | 458 | } |
| 454 | 459 | |
| 455 | 460 | return $response; |
| 456 | - }else{ |
|
| 461 | + } else{ |
|
| 457 | 462 | return Request::get($name); |
| 458 | 463 | } |
| 459 | 464 | } |
@@ -463,11 +468,13 @@ discard block |
||
| 463 | 468 | function min_var_export($input) { |
| 464 | 469 | if(is_array($input)) { |
| 465 | 470 | $buffer = []; |
| 466 | - foreach($input as $key => $value) |
|
| 467 | - $buffer[] = var_export($key, true)."=>".min_var_export($value); |
|
| 471 | + foreach($input as $key => $value) { |
|
| 472 | + $buffer[] = var_export($key, true)."=>".min_var_export($value); |
|
| 473 | + } |
|
| 468 | 474 | return "[".implode(",",$buffer)."]"; |
| 469 | - } else |
|
| 470 | - return var_export($input, true); |
|
| 475 | + } else { |
|
| 476 | + return var_export($input, true); |
|
| 477 | + } |
|
| 471 | 478 | } |
| 472 | 479 | } |
| 473 | 480 | |
@@ -480,10 +487,11 @@ discard block |
||
| 480 | 487 | $objects = scandir($dir); |
| 481 | 488 | foreach ($objects as $object) { |
| 482 | 489 | if ($object != "." && $object != "..") { |
| 483 | - if (is_dir($dir."/".$object)) |
|
| 484 | - rrmdir($dir."/".$object); |
|
| 485 | - else |
|
| 486 | - unlink($dir."/".$object); |
|
| 490 | + if (is_dir($dir."/".$object)) { |
|
| 491 | + rrmdir($dir."/".$object); |
|
| 492 | + } else { |
|
| 493 | + unlink($dir."/".$object); |
|
| 494 | + } |
|
| 487 | 495 | } |
| 488 | 496 | } |
| 489 | 497 | rmdir($dir); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $model->setIcon($menu->icon); |
| 29 | 29 | $model->setName($menu->name); |
| 30 | 30 | $model->setBasepath(basename($model->getUrl())); |
| 31 | - }elseif ($menu->type == "module") { |
|
| 31 | + } elseif ($menu->type == "module") { |
|
| 32 | 32 | $module = cb()->find("cb_modules", $menu->cb_modules_id); |
| 33 | 33 | $className = '\App\Http\Controllers\\'.$module->controller; |
| 34 | 34 | $controllerClass = new $className(); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $model->setIcon($module->icon); |
| 39 | 39 | $model->setName($module->name); |
| 40 | 40 | $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl())); |
| 41 | - }elseif ($menu->type == "path") { |
|
| 41 | + } elseif ($menu->type == "path") { |
|
| 42 | 42 | $model->setUrl(cb()->getAdminUrl($menu->path)); |
| 43 | 43 | $model->setPermalink($menu->path); |
| 44 | 44 | $model->setIcon($menu->icon); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | if(request()->is($model->getBasepath()."*")) { |
| 50 | 50 | $model->setIsActive(true); |
| 51 | - }else{ |
|
| 51 | + } else{ |
|
| 52 | 52 | $model->setIsActive(false); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $menus = DB::table("cb_menus"); |
| 60 | 60 | if($parent_id) { |
| 61 | 61 | $menus->where("parent_cb_menus_id",$parent_id); |
| 62 | - }else{ |
|
| 62 | + } else{ |
|
| 63 | 63 | $menus->whereNull("parent_cb_menus_id"); |
| 64 | 64 | } |
| 65 | 65 | return $menus->orderBy("sort_number","asc")->get(); |
@@ -83,20 +83,26 @@ discard block |
||
| 83 | 83 | public function all($withPrivilege = true) { |
| 84 | 84 | $roles_id = ($withPrivilege)?cb()->session()->roleId():null; |
| 85 | 85 | $idHash = "menuUser".$roles_id.auth()->id(); |
| 86 | - if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu; |
|
| 86 | + if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) { |
|
| 87 | + return $menu; |
|
| 88 | + } |
|
| 87 | 89 | |
| 88 | 90 | $menus = $this->loadData(); |
| 89 | 91 | $result = []; |
| 90 | 92 | foreach($menus as $menu) { |
| 91 | 93 | |
| 92 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
| 94 | + if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) { |
|
| 95 | + continue; |
|
| 96 | + } |
|
| 93 | 97 | |
| 94 | 98 | $sidebarModel = $this->assignToModel($menu); |
| 95 | 99 | if($menus2 = $this->loadData($menu->id)) { |
| 96 | 100 | $sub1 = []; |
| 97 | 101 | foreach ($menus2 as $menu2) { |
| 98 | 102 | |
| 99 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
| 103 | + if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) { |
|
| 104 | + continue; |
|
| 105 | + } |
|
| 100 | 106 | |
| 101 | 107 | $sidebarModel2 = $this->assignToModel($menu2); |
| 102 | 108 | |
@@ -104,7 +110,9 @@ discard block |
||
| 104 | 110 | $sub2 = []; |
| 105 | 111 | foreach ($menus3 as $menu3) { |
| 106 | 112 | |
| 107 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
| 113 | + if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) { |
|
| 114 | + continue; |
|
| 115 | + } |
|
| 108 | 116 | |
| 109 | 117 | $sidebarModel3 = $this->assignToModel($menu3); |
| 110 | 118 | |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | { |
| 23 | 23 | if($column->getFormat()) { |
| 24 | 24 | return date($column->getFormat(), strtotime($row->{$column->getField()})); |
| 25 | - }else{ |
|
| 25 | + } else{ |
|
| 26 | 26 | return $row->{$column->getField()}; |
| 27 | 27 | } |
| 28 | 28 | } |
@@ -32,7 +32,9 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | public function getIndex() |
| 34 | 34 | { |
| 35 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 35 | + if(!module()->canBrowse()) { |
|
| 36 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 37 | + } |
|
| 36 | 38 | |
| 37 | 39 | $query = $this->repository(); |
| 38 | 40 | $result = $query->paginate( request("limit")?:$this->data['limit'] ); |
@@ -43,7 +45,9 @@ discard block |
||
| 43 | 45 | |
| 44 | 46 | public function getAdd() |
| 45 | 47 | { |
| 46 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 48 | + if(!module()->canCreate()) { |
|
| 49 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 50 | + } |
|
| 47 | 51 | |
| 48 | 52 | $data = []; |
| 49 | 53 | $data['page_title'] = $this->data['page_title'].' : '.cbLang('add'); |
@@ -53,7 +57,9 @@ discard block |
||
| 53 | 57 | |
| 54 | 58 | public function postAddSave() |
| 55 | 59 | { |
| 56 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 60 | + if(!module()->canCreate()) { |
|
| 61 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 62 | + } |
|
| 57 | 63 | |
| 58 | 64 | try { |
| 59 | 65 | $this->validation(); |
@@ -102,7 +108,9 @@ discard block |
||
| 102 | 108 | |
| 103 | 109 | public function getEdit($id) |
| 104 | 110 | { |
| 105 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 111 | + if(!module()->canUpdate()) { |
|
| 112 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 113 | + } |
|
| 106 | 114 | |
| 107 | 115 | $data = []; |
| 108 | 116 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |
@@ -113,7 +121,9 @@ discard block |
||
| 113 | 121 | |
| 114 | 122 | public function postEditSave($id) |
| 115 | 123 | { |
| 116 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 124 | + if(!module()->canUpdate()) { |
|
| 125 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 126 | + } |
|
| 117 | 127 | |
| 118 | 128 | try { |
| 119 | 129 | $this->validation(); |
@@ -162,7 +172,9 @@ discard block |
||
| 162 | 172 | |
| 163 | 173 | public function getDelete($id) |
| 164 | 174 | { |
| 165 | - if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 175 | + if(!module()->canDelete()) { |
|
| 176 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 177 | + } |
|
| 166 | 178 | |
| 167 | 179 | if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
| 168 | 180 | call_user_func($this->data['hook_before_delete'], $id); |
@@ -189,7 +201,9 @@ discard block |
||
| 189 | 201 | |
| 190 | 202 | public function getDetail($id) |
| 191 | 203 | { |
| 192 | - if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 204 | + if(!module()->canRead()) { |
|
| 205 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 206 | + } |
|
| 193 | 207 | |
| 194 | 208 | $data = []; |
| 195 | 209 | $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first(); |
@@ -212,10 +226,10 @@ discard block |
||
| 212 | 226 | $key = $parameters[0]; |
| 213 | 227 | if(isset($this->data[$key])) { |
| 214 | 228 | return $this->data[$key]; |
| 215 | - }else{ |
|
| 229 | + } else{ |
|
| 216 | 230 | return null; |
| 217 | 231 | } |
| 218 | - }else{ |
|
| 232 | + } else{ |
|
| 219 | 233 | return null; |
| 220 | 234 | } |
| 221 | 235 | } |