@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) { |
| 48 | 48 | $query->addSelect($this->data['table'].'.'.$column->getField()); |
| 49 | 49 | } |
| 50 | - }else{ |
|
| 50 | + } else{ |
|
| 51 | 51 | $query->addSelect($column->getField()); |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $keyword = sanitizeXSS(request("q")); |
| 61 | 61 | if(isset($this->data['hook_search_query'])) { |
| 62 | 62 | $query = call_user_func($this->data['hook_search_query'], $query); |
| 63 | - }else{ |
|
| 63 | + } else{ |
|
| 64 | 64 | $query->where(function ($where) use ($columns, $keyword) { |
| 65 | 65 | /** |
| 66 | 66 | * @var $where Builder |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | if(strpos($column->getField(),".") === false) { |
| 71 | 71 | $field = $this->data['table'].'.'.$column->getField(); |
| 72 | - }else{ |
|
| 72 | + } else{ |
|
| 73 | 73 | $field = $column->getField(); |
| 74 | 74 | } |
| 75 | 75 | $where->orWhere($field, 'like', '%'.$keyword.'%'); |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | $query->orderBy(request('order_by'), request('order_sort')); |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - }else{ |
|
| 114 | + } else{ |
|
| 115 | 115 | /* |
| 116 | 116 | * For default, query will be order by primary key as descending |
| 117 | 117 | */ |
@@ -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); |
@@ -93,10 +93,10 @@ discard block |
||
| 93 | 93 | if(file_exists(app_path("CBPlugins/".$key))) { |
| 94 | 94 | rrmdir(app_path("CBPlugins/".$key)); |
| 95 | 95 | return response()->json(['status'=>true, 'message'=>'Plugin has been uninstalled!']); |
| 96 | - }else{ |
|
| 96 | + } else{ |
|
| 97 | 97 | return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin is not found']); |
| 98 | 98 | } |
| 99 | - }else { |
|
| 99 | + } else { |
|
| 100 | 100 | return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin key is not found']); |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -108,8 +108,7 @@ discard block |
||
| 108 | 108 | if (( $file != '.' ) && ( $file != '..' )) { |
| 109 | 109 | if ( is_dir($src . '/' . $file) ) { |
| 110 | 110 | $this->recursiveCopy($src . '/' . $file,$dst . '/' . $file); |
| 111 | - } |
|
| 112 | - else { |
|
| 111 | + } else { |
|
| 113 | 112 | copy($src . '/' . $file,$dst . '/' . $file); |
| 114 | 113 | } |
| 115 | 114 | } |
@@ -140,7 +139,9 @@ discard block |
||
| 140 | 139 | fclose($temp); |
| 141 | 140 | |
| 142 | 141 | // Rename |
| 143 | - if(file_exists(app_path("CBPlugins/".$key))) rrmdir(app_path("CBPlugins/".$key)); |
|
| 142 | + if(file_exists(app_path("CBPlugins/".$key))) { |
|
| 143 | + rrmdir(app_path("CBPlugins/".$key)); |
|
| 144 | + } |
|
| 144 | 145 | rename(app_path("CBPlugins/".$dirName), app_path("CBPlugins/".$key)); |
| 145 | 146 | |
| 146 | 147 | // Read Plugin JSON |
@@ -165,7 +166,7 @@ discard block |
||
| 165 | 166 | } else { |
| 166 | 167 | return response()->json(['status'=>false,'message'=>"Failed to install/update, can't open the plugin archive"]); |
| 167 | 168 | } |
| 168 | - }else{ |
|
| 169 | + } else{ |
|
| 169 | 170 | return response()->json(['status'=>false,'message'=>'Failed to install/update, plugin key is not found']); |
| 170 | 171 | } |
| 171 | 172 | } catch (\Exception $e) { |
@@ -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 | } |