crocodic-studio / crudbooster

src/controllers/scaffolding/traits/ColumnsRegister.php

Spacing +38 added lines, -38 removed lines

@@ -65,8 +65,8 @@ 
         $data = new TextModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("text");
 
@@ -82,8 +82,8 @@ 
         $data = new CheckboxModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("checkbox");
 
@@ -99,8 +99,8 @@ 
         $data = new PasswordModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("password");
         $data->setShowDetail(false);
@@ -118,8 +118,8 @@ 
         $data = new ImageModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("image");
 
@@ -135,8 +135,8 @@ 
         $data = new TextAreaModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("text_area");
 
@@ -147,20 +147,20 @@ 
 
     public function addSelectTable($label, $name = null, $selectConfig)
     {
-        if(isset($selectConfig['table']) && isset($selectConfig['value_option']) && isset($selectConfig['display_option'])) {
+        if (isset($selectConfig['table']) && isset($selectConfig['value_option']) && isset($selectConfig['display_option'])) {
             $this->index++;
 
             $data = new SelectTableModel();
             $data = $this->setDefaultModelValue($data);
             $data->setLabel($label);
-            $data->setName($this->name($label,$name));
+            $data->setName($this->name($label, $name));
             $data->setField($this->name($label, $name));
             $data->setType("select_table");
             $data->setOrderByColumn($selectConfig['table'].".".$selectConfig["display_option"]);
             columnSingleton()->setColumn($this->index, $data);
 
             $selectTable = new SelectTable($this->index);
-            $selectTable->optionsFromTable($selectConfig['table'],$selectConfig['value_option'],$selectConfig['display_option'],@$selectConfig['sql_condition']);
+            $selectTable->optionsFromTable($selectConfig['table'], $selectConfig['value_option'], $selectConfig['display_option'], @$selectConfig['sql_condition']);
 
             return $selectTable;
         } else {
@@ -175,7 +175,7 @@ 
         $data = new SelectOptionModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
+        $data->setName($this->name($label, $name));
         $data->setField($this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("select_option");
@@ -184,7 +184,7 @@ 
 
         $selectOption = new SelectOption($this->index);
 
-        if($options) {
+        if ($options) {
             $selectOption->options($options);
         }
 
@@ -204,16 +204,16 @@ 
         $data = new SelectQueryModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
+        $data->setName($this->name($label, $name));
         $data->setField($this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("select_query");
 
         columnSingleton()->setColumn($this->index, $data);
 
-        $selectQuery =new SelectQuery($this->index);
+        $selectQuery = new SelectQuery($this->index);
 
-        if($query) {
+        if ($query) {
             $selectQuery->optionsFromQuery($query);
         }
 
@@ -228,8 +228,8 @@ 
         $data = new CustomModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("custom");
 
@@ -245,8 +245,8 @@ 
         $data = new DateModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("date");
 
@@ -262,8 +262,8 @@ 
         $data = new DatetimeModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("datetime");
 
@@ -279,8 +279,8 @@ 
         $data = new EmailModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("email");
 
@@ -296,8 +296,8 @@ 
         $data = new FileModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("file");
 
@@ -314,8 +314,8 @@ 
         $data = new HiddenModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("hidden");
 
@@ -331,8 +331,8 @@ 
         $data = new NumberModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("number");
 
@@ -348,8 +348,8 @@ 
         $data = new MoneyModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("money");
 
@@ -365,8 +365,8 @@ 
         $data = new RadioModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("radio");
 
@@ -382,8 +382,8 @@ 
         $data = new WysiwygModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("wysiwyg");
 

src/controllers/DeveloperSecurityController.php

Spacing +7 added lines, -7 removed lines

@@ -24,12 +24,12 @@ 
 
     public function getIndex() {
         $data = [];
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function postSave()
     {
-        if(!isConfigCached()) {
+        if (!isConfigCached()) {
             setEnvironmentValue([
                 "APP_DEBUG"=>request("APP_DEBUG")
             ]);
@@ -41,15 +41,15 @@ 
         putSetting("AUTO_REDIRECT_TO_LOGIN", request("AUTO_REDIRECT_TO_LOGIN"));
         putSetting("LOGIN_NOTIFICATION", request("LOGIN_NOTIFICATION"));
 
-        if(request("htaccess_ServerSignature")) {
+        if (request("htaccess_ServerSignature")) {
             putHtaccess("ServerSignature Off");
         }
 
-        if(request("htaccess_IndexIgnore")) {
+        if (request("htaccess_IndexIgnore")) {
             putHtaccess("IndexIgnore *");
         }
 
-        if(request("htaccess_dotAccess")) {
+        if (request("htaccess_dotAccess")) {
 putHtaccess("
 <FilesMatch \"^\.\">
 Order allow,deny
@@ -57,11 +57,11 @@ 
 </FilesMatch>");
         }
 
-        if(request("htaccess_preventVendor")) {
+        if (request("htaccess_preventVendor")) {
             putHtaccess("RewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]");
         }
 
 
-        return cb()->redirectBack("Security has been updated!","success");
+        return cb()->redirectBack("Security has been updated!", "success");
     }
 }
\ No newline at end of file

src/CRUDBoosterServiceProvider.php

Spacing +12 added lines, -12 removed lines

@@ -26,13 +26,13 @@ 
         // Register views
         $this->loadViewsFrom(__DIR__.'/views', 'crudbooster');
         $this->loadViewsFrom(__DIR__.'/types', 'types');
-        $this->loadTranslationsFrom(__DIR__."/localization","cb");
+        $this->loadTranslationsFrom(__DIR__."/localization", "cb");
 
         // Publish the files
-        $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')],'cb_config');
-        $this->publishes([__DIR__.'/database' => base_path('database')],'cb_migration');
-        $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')],'cb_hook');
-        $this->publishes([__DIR__ . '/assets' =>public_path('cb_asset')],'cb_asset');
+        $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')], 'cb_config');
+        $this->publishes([__DIR__.'/database' => base_path('database')], 'cb_migration');
+        $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')], 'cb_hook');
+        $this->publishes([__DIR__.'/assets' =>public_path('cb_asset')], 'cb_asset');
 
         // Override Local FileSystem
         Config::set("filesystems.disks.local.root", cbConfig("LOCAL_FILESYSTEM_PATH", public_path("storage")));
@@ -54,7 +54,7 @@ 
         require __DIR__.'/helpers/Helper.php';
 
         // Singletons
-        $this->app->singleton('crudbooster', function ()
+        $this->app->singleton('crudbooster', function()
         {
             return true;
         });
@@ -77,7 +77,7 @@ 
         }
 
         // Merging configuration
-        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php','crudbooster');
+        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php', 'crudbooster');
 
         // Register additional library
         $this->app->register('Intervention\Image\ImageServiceProvider');
@@ -88,13 +88,13 @@ 
 
     private function registerPlugin()
     {
-        if(file_exists(app_path("CBPlugins"))) {
+        if (file_exists(app_path("CBPlugins"))) {
             $views = scandir(app_path("CBPlugins"));
-            foreach($views as $view) {
-                if($view != "." && $view != "..") {
+            foreach ($views as $view) {
+                if ($view != "." && $view != "..") {
                     $basename = basename($view);
                     // register view
-                    $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"),$basename);
+                    $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"), $basename);
                     // register route
                     require app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Routes".DIRECTORY_SEPARATOR."Route.php");
                 }
@@ -106,7 +106,7 @@ 
 
     private function registerTypeRoutes() {
         $routes = rglob(__DIR__.DIRECTORY_SEPARATOR."types".DIRECTORY_SEPARATOR."Route.php");
-        foreach($routes as $route) {
+        foreach ($routes as $route) {
             require $route;
         }
     }

src/controllers/DeveloperPluginStoreController.php

Spacing +38 added lines, -38 removed lines

@@ -28,14 +28,14 @@ 
 
     public function getIndex() {
 
-        if(request("refresh")) {
-            $this->fetchPluginData(false );
-            return cb()->redirectBack("Plugin list has been refreshed!","success");
+        if (request("refresh")) {
+            $this->fetchPluginData(false);
+            return cb()->redirectBack("Plugin list has been refreshed!", "success");
         }
 
         $data = [];
         $data['result'] = $this->fetchPluginData();
-        return view($this->view.'.index',$data);
+        return view($this->view.'.index', $data);
     }
 
     public function postLoginAccount() {
@@ -50,13 +50,13 @@ 
         ]);
         $response = $curl->send();
 
-        if($respArray = json_decode($response, true)) {
-            if($respArray['status'] && isset($respArray['token'])) {
+        if ($respArray = json_decode($response, true)) {
+            if ($respArray['status'] && isset($respArray['token'])) {
                 session(['account_token'=>$respArray['token']]);
             }
-            return response()->make($response,200,["Content-Type"=>"application/json"]);
+            return response()->make($response, 200, ["Content-Type"=>"application/json"]);
         } else {
-            return response()->json(['status'=>false,'message'=>'failed']);
+            return response()->json(['status'=>false, 'message'=>'failed']);
         }
     }
 
@@ -73,15 +73,15 @@ 
         ]);
         $response = $curl->send();
 
-        if($respArray = json_decode($response, true)) {
-            if($respArray['status']) {
+        if ($respArray = json_decode($response, true)) {
+            if ($respArray['status']) {
                 $form = base64_decode($respArray['payment']);
-                return response()->json(['status'=>true,'form'=>$form]);
+                return response()->json(['status'=>true, 'form'=>$form]);
             } else {
                 return response()->json($respArray);
             }
         } else {
-            return response()->json(['status'=>false,'message'=>'failed','raw'=>$response]);
+            return response()->json(['status'=>false, 'message'=>'failed', 'raw'=>$response]);
         }
     }
 
@@ -89,28 +89,28 @@ 
     {
         $pluginData = $this->fetchPluginData();
 
-        if(isset($pluginData[$key])) {
-            if(file_exists(app_path("CBPlugins/".$key))) {
+        if (isset($pluginData[$key])) {
+            if (file_exists(app_path("CBPlugins/".$key))) {
                 rrmdir(app_path("CBPlugins/".$key));
                 return response()->json(['status'=>true, 'message'=>'Plugin has been uninstalled!']);
-            }else{
-                return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin is not found']);
+            } else {
+                return response()->json(['status'=>false, 'message'=>'Failed to uninstall, plugin is not found']);
             }
-        }else {
-            return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin key is not found']);
+        } else {
+            return response()->json(['status'=>false, 'message'=>'Failed to uninstall, plugin key is not found']);
         }
     }
 
-    private function recursiveCopy($src,$dst) {
+    private function recursiveCopy($src, $dst) {
         $dir = opendir($src);
         @mkdir($dst);
-        while(false !== ( $file = readdir($dir)) ) {
-            if (( $file != '.' ) && ( $file != '..' )) {
-                if ( is_dir($src . '/' . $file) ) {
-                    $this->recursiveCopy($src . '/' . $file,$dst . '/' . $file);
+        while (false !== ($file = readdir($dir))) {
+            if (($file != '.') && ($file != '..')) {
+                if (is_dir($src.'/'.$file)) {
+                    $this->recursiveCopy($src.'/'.$file, $dst.'/'.$file);
                 }
                 else {
-                    copy($src . '/' . $file,$dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -122,7 +122,7 @@ 
         $pluginData = $this->fetchPluginData();
 
         try {
-            if(isset($pluginData[$key])) {
+            if (isset($pluginData[$key])) {
                 $plugin = $pluginData[$key];
 
                 // Create temp file of zip plugin
@@ -140,16 +140,16 @@ 
                     fclose($temp);
 
                     // Rename
-                    if(file_exists(app_path("CBPlugins/".$key))) rrmdir(app_path("CBPlugins/".$key));
+                    if (file_exists(app_path("CBPlugins/".$key))) rrmdir(app_path("CBPlugins/".$key));
                     rename(app_path("CBPlugins/".$dirName), app_path("CBPlugins/".$key));
 
                     // Read Plugin JSON
                     $pluginJson = json_decode(file_get_contents(app_path("CBPlugins/".$key."/plugin.json")), true);
 
                     // Check if has asset
-                    if($pluginJson && $pluginJson['asset']) {
+                    if ($pluginJson && $pluginJson['asset']) {
                         // Check destination folder is ready
-                        if(file_exists(public_path("cb_asset/".$key))) {
+                        if (file_exists(public_path("cb_asset/".$key))) {
                             rrmdir(public_path("cb_asset/".$key));
                         }
 
@@ -160,22 +160,22 @@ 
                         $this->recursiveCopy(app_path("CBPlugins/".$key."/".$pluginJson['asset']), public_path("cb_asset/".$key));
                     }
 
-                    return response()->json(['status'=>true,'message'=>'Install / update plugin has been succesfull!']);
+                    return response()->json(['status'=>true, 'message'=>'Install / update plugin has been succesfull!']);
 
                 } else {
-                    return response()->json(['status'=>false,'message'=>"Failed to install/update, can't open the plugin archive"]);
+                    return response()->json(['status'=>false, 'message'=>"Failed to install/update, can't open the plugin archive"]);
                 }
-            }else{
-                return response()->json(['status'=>false,'message'=>'Failed to install/update, plugin key is not found']);
+            } else {
+                return response()->json(['status'=>false, 'message'=>'Failed to install/update, plugin key is not found']);
             }
         } catch (\Exception $e) {
-            return response()->json(['status'=>false,'message'=>'Something went wrong!']);
+            return response()->json(['status'=>false, 'message'=>'Something went wrong!']);
         }
     }
 
     private function fetchPluginData($cache = true)
     {
-        if($cache === true && $data = Cache::get("plugin_store_data")) {
+        if ($cache === true && $data = Cache::get("plugin_store_data")) {
             return $data;
         }
 
@@ -192,13 +192,13 @@ 
             $context = stream_context_create($opts);
             $data = file_get_contents(base64_decode("aHR0cDovL2NydWRib29zdGVyLmNvbS9hcGkvcGx1Z2luP2FjY2Vzc190b2tlbj1iVmMvWm5wWU5TWnJNVlpZT0hFNVUydHFjU1U9"), false, $context);
 
-            if($data) {
+            if ($data) {
                 $data = json_decode($data, true);
-                if($data['status']==true) {
+                if ($data['status'] == true) {
 
-                    foreach($data['data'] as $item) {
+                    foreach ($data['data'] as $item) {
                         $key = $item['key'];
-                        $result[ $key ] = $item;
+                        $result[$key] = $item;
                     }
 
                     $result = collect($result)->sortBy("name")->all();

Braces +7 added lines, -6 removed lines

@@ -93,10 +93,10 @@ 
             if(file_exists(app_path("CBPlugins/".$key))) {
                 rrmdir(app_path("CBPlugins/".$key));
                 return response()->json(['status'=>true, 'message'=>'Plugin has been uninstalled!']);
-            }else{
+            } else{
                 return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin is not found']);
             }
-        }else {
+        } else {
             return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin key is not found']);
         }
     }
@@ -108,8 +108,7 @@ 
             if (( $file != '.' ) && ( $file != '..' )) {
                 if ( is_dir($src . '/' . $file) ) {
                     $this->recursiveCopy($src . '/' . $file,$dst . '/' . $file);
-                }
-                else {
+                } else {
                     copy($src . '/' . $file,$dst . '/' . $file);
                 }
             }
@@ -140,7 +139,9 @@ 
                     fclose($temp);
 
                     // Rename
-                    if(file_exists(app_path("CBPlugins/".$key))) rrmdir(app_path("CBPlugins/".$key));
+                    if(file_exists(app_path("CBPlugins/".$key))) {
+                        rrmdir(app_path("CBPlugins/".$key));
+                    }
                     rename(app_path("CBPlugins/".$dirName), app_path("CBPlugins/".$key));
 
                     // Read Plugin JSON
@@ -165,7 +166,7 @@ 
                 } else {
                     return response()->json(['status'=>false,'message'=>"Failed to install/update, can't open the plugin archive"]);
                 }
-            }else{
+            } else{
                 return response()->json(['status'=>false,'message'=>'Failed to install/update, plugin key is not found']);
             }
         } catch (\Exception $e) {

src/configs/crudbooster.php

Spacing +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@ 
     /*
      * For security reason we have limit the upload file formats bellow
      */
-    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif','pdf','xls','xlsx','doc','docx','txt','zip','rar','rtf'],
+    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'txt', 'zip', 'rar', 'rtf'],
 
-    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif'],
+    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif'],
 
     /*
      * Override Local FileSystem From Storage To Another
@@ -58,5 +58,5 @@ 
      * You can define in this array what the tables you want to include in "php artisan crudbooster:data_migration"
      * The default is all cb_ prefix will be include in data migration
      */
-    'ADDITIONAL_DATA_MIGRATION'=>['users','migrations']
+    'ADDITIONAL_DATA_MIGRATION'=>['users', 'migrations']
 ];
\ No newline at end of file

src/controllers/DeveloperThemesController.php

Spacing +5 added lines, -5 removed lines

@@ -20,21 +20,21 @@
         $themes = (new Plugin())->getAllThemes();
         $data = [];
         $data['result'] = $themes;
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function getActiveTheme($theme_path) {
         $theme_path = base64_decode($theme_path);
         putSetting("theme_path", $theme_path);
-        return cb()->redirectBack("Theme has been activated!","success");
+        return cb()->redirectBack("Theme has been activated!", "success");
     }
 
     public function postSaveConfig() {
 
-        foreach(request()->except("_token") as $key=>$val) {
-            putSetting( $key,  $val);
+        foreach (request()->except("_token") as $key=>$val) {
+            putSetting($key, $val);
         }
 
-        return cb()->redirectBack("Theme config has been saved!","success");
+        return cb()->redirectBack("Theme config has been saved!", "success");
     }
 }
\ No newline at end of file

src/middlewares/CBBackend.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
      */
     public function handle($request, Closure $next)
     {
-        if(auth()->guest()) {
-            return cb()->redirect(cb()->getLoginUrl("login"),cbLang('please_login_for_first'),'warning');
+        if (auth()->guest()) {
+            return cb()->redirect(cb()->getLoginUrl("login"), cbLang('please_login_for_first'), 'warning');
         }
 
         (new CBHook())->beforeBackendMiddleware($request);

src/helpers/SidebarMenus.php

Spacing +20 added lines, -20 removed lines

@@ -23,7 +23,7 @@ 
     private function assignToModel($menu) {
         $model = new SidebarModel();
         $model->setId($menu->id);
-        if($menu->type == "url") {
+        if ($menu->type == "url") {
             $model->setUrl($menu->path);
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
@@ -46,9 +46,9 @@ 
             $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl()));
         }
 
-        if(request()->is($model->getBasepath()."*")) {
+        if (request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else {
             $model->setIsActive(false);
         }
 
@@ -57,22 +57,22 @@ 
 
     private function loadData($parent_id = null) {
         $menus = DB::table("cb_menus");
-        if($parent_id) {
-            $menus->where("parent_cb_menus_id",$parent_id);
-        }else{
+        if ($parent_id) {
+            $menus->where("parent_cb_menus_id", $parent_id);
+        } else {
             $menus->whereNull("parent_cb_menus_id");
         }
-        return $menus->orderBy("sort_number","asc")->get();
+        return $menus->orderBy("sort_number", "asc")->get();
     }
 
     private function rolePrivilege($cb_roles_id, $cb_menus_id) {
-        return cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id]);
+        return cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id]);
     }
 
-    private function checkPrivilege($roles_id,$menu) {
-        if($roles_id) {
+    private function checkPrivilege($roles_id, $menu) {
+        if ($roles_id) {
             $privilege = $this->rolePrivilege($roles_id, $menu->id);
-            if($privilege && !$privilege->can_browse) {
+            if ($privilege && !$privilege->can_browse) {
                 return false;
             }
         }
@@ -81,30 +81,30 @@ 
     }
 
     public function all($withPrivilege = true) {
-        $roles_id = ($withPrivilege)?cb()->session()->roleId():null;
+        $roles_id = ($withPrivilege) ?cb()->session()->roleId() : null;
         $idHash = "menuUser".$roles_id.auth()->id();
-        if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu;
+        if ($menu = CacheHelper::getItemInGroup($idHash, "sidebar_menu")) return $menu;
 
         $menus = $this->loadData();
         $result = [];
-        foreach($menus as $menu) {
+        foreach ($menus as $menu) {
 
-            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
+            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
 
             $sidebarModel = $this->assignToModel($menu);
-            if($menus2 = $this->loadData($menu->id)) {
+            if ($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 foreach ($menus2 as $menu2) {
 
-                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
+                    if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
 
                     $sidebarModel2 = $this->assignToModel($menu2);
 
-                    if($menus3 = $this->loadData($menu2->id)) {
+                    if ($menus3 = $this->loadData($menu2->id)) {
                         $sub2 = [];
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
 
                             $sidebarModel3 = $this->assignToModel($menu3);
 
@@ -119,7 +119,7 @@ 
             $result[] = $sidebarModel;
         }
 
-        CacheHelper::putInGroup($idHash, $result,"sidebar_menu", 3600);
+        CacheHelper::putInGroup($idHash, $result, "sidebar_menu", 3600);
         return $result;
     }
 

Braces +16 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
             $model->setBasepath(basename($model->getUrl()));
-        }elseif ($menu->type == "module") {
+        } elseif ($menu->type == "module") {
             $module = cb()->find("cb_modules", $menu->cb_modules_id);
             $className = '\App\Http\Controllers\\'.$module->controller;
             $controllerClass = new $className();
@@ -38,7 +38,7 @@ 
             $model->setIcon($module->icon);
             $model->setName($module->name);
             $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl()));
-        }elseif ($menu->type == "path") {
+        } elseif ($menu->type == "path") {
             $model->setUrl(cb()->getAdminUrl($menu->path));
             $model->setPermalink($menu->path);
             $model->setIcon($menu->icon);
@@ -48,7 +48,7 @@ 
 
         if(request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else{
             $model->setIsActive(false);
         }
 
@@ -59,7 +59,7 @@ 
         $menus = DB::table("cb_menus");
         if($parent_id) {
             $menus->where("parent_cb_menus_id",$parent_id);
-        }else{
+        } else{
             $menus->whereNull("parent_cb_menus_id");
         }
         return $menus->orderBy("sort_number","asc")->get();
@@ -83,20 +83,26 @@ 
     public function all($withPrivilege = true) {
         $roles_id = ($withPrivilege)?cb()->session()->roleId():null;
         $idHash = "menuUser".$roles_id.auth()->id();
-        if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu;
+        if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) {
+            return $menu;
+        }
 
         $menus = $this->loadData();
         $result = [];
         foreach($menus as $menu) {
 
-            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
+            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) {
+                continue;
+            }
 
             $sidebarModel = $this->assignToModel($menu);
             if($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 foreach ($menus2 as $menu2) {
 
-                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
+                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) {
+                        continue;
+                    }
 
                     $sidebarModel2 = $this->assignToModel($menu2);
 
@@ -104,7 +110,9 @@ 
                         $sub2 = [];
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) {
+                                continue;
+                            }
 
                             $sidebarModel3 = $this->assignToModel($menu3);