crocodic-studio / crudbooster

src/helpers/ModuleGenerator.php

Spacing +38 added lines, -38 removed lines

@@ -37,15 +37,15 @@ 
     }
 
     public function make() {
-        $name = trim(($this->name)?:ucwords(str_replace("_"," ",$this->table)));
+        $name = trim(($this->name) ?: ucwords(str_replace("_", " ", $this->table)));
 
         $template = file_get_contents(__DIR__."/../templates/FooBarController.stub");
 
         //Replace table
-        $template = str_replace("{table}",'"'.$this->table.'"', $template);
+        $template = str_replace("{table}", '"'.$this->table.'"', $template);
 
         //Replace permalink
-        $permalink = strtolower(Str::slug($name,"_"));
+        $permalink = strtolower(Str::slug($name, "_"));
         $template = str_replace("{permalink}", '"'.$permalink.'"', $template);
 
         //Replace Page title
@@ -53,20 +53,20 @@ 
 
         //Replace scaffolding
         $scaffold = "";
-        foreach($this->columns as $field) {
+        foreach ($this->columns as $field) {
             $label = $field['column_label'];
             $column = $field['column_field'];
-            $help = isset($field['column_help'])?"->help(\"".$field['column_help']."\")":"";
-            $required = ($field['column_mandatory']=="on")?"":"->required(false)";
-            $indexShow = ($field['column_browse']=="on")?"":"->showIndex(false)";
-            $detailShow = ($field['column_detail']=="on")?"":"->showDetail(false)";
-            $editShow = ($field['column_edit']=="on")?"":"->showEdit(false)";
-            $addShow = ($field['column_add']=="on")?"":"->showAdd(false)";
+            $help = isset($field['column_help']) ? "->help(\"".$field['column_help']."\")" : "";
+            $required = ($field['column_mandatory'] == "on") ? "" : "->required(false)";
+            $indexShow = ($field['column_browse'] == "on") ? "" : "->showIndex(false)";
+            $detailShow = ($field['column_detail'] == "on") ? "" : "->showDetail(false)";
+            $editShow = ($field['column_edit'] == "on") ? "" : "->showEdit(false)";
+            $addShow = ($field['column_add'] == "on") ? "" : "->showAdd(false)";
             $optionTable = $field['column_option_table'];
             $optionValue = $field['column_option_value'];
             $optionDisplay = $field['column_option_display'];
             $optionSqlCondition = $field['column_option_sql_condition'];
-            $optionSqlCondition = str_replace('"',"'", $optionSqlCondition);
+            $optionSqlCondition = str_replace('"', "'", $optionSqlCondition);
             $sqlRawQuery = $field['column_sql_query'];
             $options = $field['column_options'];
             $imageResizeWidth = $field['column_image_width'];
@@ -82,45 +82,45 @@ 
             $moneyDecimalSeparator = $field['column_money_decimal_separator'];
 
             // Additional Attributes
-            $additional = $required . $indexShow . $detailShow . $addShow . $editShow . $help ;
+            $additional = $required.$indexShow.$detailShow.$addShow.$editShow.$help;
 
             // Additional money
-            $additional .= ($moneyPrefix && $field['column_type']=='money')?"->prefix('".$moneyPrefix."')":"";
-            $additional .= ($moneyPrecision && $field['column_type']=='money')?"->precision('".$moneyPrecision."')":"";
-            $additional .= ($moneyThousandSeparator && $field['column_type']=='money')?"->thousandSeparator('".$moneyThousandSeparator."')":"";
-            $additional .= ($moneyDecimalSeparator && $field['column_type']=='money')?"->decimalSeparator('".$moneyDecimalSeparator."')":"";
+            $additional .= ($moneyPrefix && $field['column_type'] == 'money') ? "->prefix('".$moneyPrefix."')" : "";
+            $additional .= ($moneyPrecision && $field['column_type'] == 'money') ? "->precision('".$moneyPrecision."')" : "";
+            $additional .= ($moneyThousandSeparator && $field['column_type'] == 'money') ? "->thousandSeparator('".$moneyThousandSeparator."')" : "";
+            $additional .= ($moneyDecimalSeparator && $field['column_type'] == 'money') ? "->decimalSeparator('".$moneyDecimalSeparator."')" : "";
 
             // Additional for image & file type
-            $additional .= ($fileEncrypt && in_array($field['column_type'],['file','image']))?"->encrypt(true)":"";
-            $additional .= ($imageResizeWidth && in_array($field['column_type'],['file','image']))?"->resize(".$imageResizeWidth.",".$imageResizeHeight.")":"";
+            $additional .= ($fileEncrypt && in_array($field['column_type'], ['file', 'image'])) ? "->encrypt(true)" : "";
+            $additional .= ($imageResizeWidth && in_array($field['column_type'], ['file', 'image'])) ? "->resize(".$imageResizeWidth.",".$imageResizeHeight.")" : "";
 
             // Additional for date & datetime
-            $additional .= ($dateFormat && in_array($field['column_type'],['date','datetime']))?"->format('".$dateFormat."')":"";
+            $additional .= ($dateFormat && in_array($field['column_type'], ['date', 'datetime'])) ? "->format('".$dateFormat."')" : "";
 
             // Additional for text
-            $additional .= ($textDisplayLimit!="" && in_array($field['column_type'],['text','text_area','wysiwyg']))?"->strLimit(".$textDisplayLimit.")":"";
-            $additional .= ($maxCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->maxLength(".$maxCharacter.")":"";
-            $additional .= ($minCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->minLength(".$minCharacter.")":"";
+            $additional .= ($textDisplayLimit != "" && in_array($field['column_type'], ['text', 'text_area', 'wysiwyg'])) ? "->strLimit(".$textDisplayLimit.")" : "";
+            $additional .= ($maxCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->maxLength(".$maxCharacter.")" : "";
+            $additional .= ($minCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->minLength(".$minCharacter.")" : "";
 
             $methodName = Str::studly($field['column_type']);
-            if($label && $column) {
-                if(in_array($field['column_type'],['radio','select_option','checkbox'])) {
-                    if($options) {
+            if ($label && $column) {
+                if (in_array($field['column_type'], ['radio', 'select_option', 'checkbox'])) {
+                    if ($options) {
                         $optResult = [];
-                        foreach($options as $opt) {
+                        foreach ($options as $opt) {
                             $optResult[$opt['key']] = $opt['label'];
                         }
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $additional . ';' . "\n\t\t";
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")->options('.min_var_export($optResult).')'.$additional.';'."\n\t\t";
                     }
-                }elseif (in_array($field['column_type'],['radio_table','select_table'])) {
+                }elseif (in_array($field['column_type'], ['radio_table', 'select_table'])) {
                     if ($optionTable && $optionValue && $optionDisplay) {
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $additional . ';' . "\n\t\t";
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'",["table"=>"'.$optionTable.'","value_option"=>"'.$optionValue.'","display_option"=>"'.$optionDisplay.'","sql_condition"=>"'.$optionSqlCondition.'"])'.$additional.';'."\n\t\t";
                     }
                 }elseif ($field['column_type'] == "select_query") {
-                    if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) {
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $additional . ';' . "\n\t\t";
+                    if ($sqlRawQuery && Str::contains($sqlRawQuery, ["as `key`", "as `label`"])) {
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'","'.$sqlRawQuery.'")'.$additional.';'."\n\t\t";
                     }
-                }else{
+                } else {
                     $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$additional.';'."\n\t\t";
                 }
             }
@@ -143,10 +143,10 @@ 
         $module['controller'] = $filename;
         $module['last_column_build'] = json_encode($this->columns);
 
-        if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) {
-            DB::table("cb_modules")->where("id",$moduleData->id)->update($module);
+        if ($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name", $this->table)->first()) {
+            DB::table("cb_modules")->where("id", $moduleData->id)->update($module);
             $id_modules = $moduleData->id;
-        }else{
+        } else {
             $id_modules = DB::table('cb_modules')->insertGetId($module);
         }
 
@@ -155,9 +155,9 @@ 
         $menu['name'] = $module['name'];
         $menu['type'] = 'module';
         $menu['cb_modules_id'] = $id_modules;
-        if(isset($moduleData)) {
-            DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu);
-        }else{
+        if (isset($moduleData)) {
+            DB::table("cb_menus")->where("cb_modules_id", $moduleData->id)->update($menu);
+        } else {
             DB::table('cb_menus')->insertGetId($menu);
         }
 

Braces +5 added lines, -5 removed lines

@@ -112,15 +112,15 @@ 
                         }
                         $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $additional . ';' . "\n\t\t";
                     }
-                }elseif (in_array($field['column_type'],['radio_table','select_table'])) {
+                } elseif (in_array($field['column_type'],['radio_table','select_table'])) {
                     if ($optionTable && $optionValue && $optionDisplay) {
                         $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $additional . ';' . "\n\t\t";
                     }
-                }elseif ($field['column_type'] == "select_query") {
+                } elseif ($field['column_type'] == "select_query") {
                     if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) {
                         $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $additional . ';' . "\n\t\t";
                     }
-                }else{
+                } else{
                     $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$additional.';'."\n\t\t";
                 }
             }
@@ -146,7 +146,7 @@ 
         if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) {
             DB::table("cb_modules")->where("id",$moduleData->id)->update($module);
             $id_modules = $moduleData->id;
-        }else{
+        } else{
             $id_modules = DB::table('cb_modules')->insertGetId($module);
         }
 
@@ -157,7 +157,7 @@ 
         $menu['cb_modules_id'] = $id_modules;
         if(isset($moduleData)) {
             DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu);
-        }else{
+        } else{
             DB::table('cb_menus')->insertGetId($menu);
         }
 

src/configs/crudbooster.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,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
@@ -69,7 +69,7 @@ 
      * 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'],
 
 
     /*

src/middlewares/CBDeveloper.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
     public function handle($request, Closure $next)
     {
 
-        if(session()->get("developer") != getSetting('developer_username')) {
-            return cb()->redirect(cb()->getDeveloperUrl("login"),"Please login for first");
+        if (session()->get("developer") != getSetting('developer_username')) {
+            return cb()->redirect(cb()->getDeveloperUrl("login"), "Please login for first");
         }
 
         return $next($request);

src/commands/DeveloperCommandService.php

Spacing +4 added lines, -4 removed lines

@@ -25,15 +25,15 @@
     {
 
         try {
-            if(@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) {
+            if (@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) {
                 $password = Str::random(16);
-            }else{
+            } else {
                 $password = $this->command->option("password");
             }
 
-            if(@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) {
+            if (@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) {
                 $username = Str::random(5);
-            }else{
+            } else {
                 $username = $this->command->option("username");
             }
         } catch (\Exception $e) {

Braces +2 added lines, -2 removed lines

@@ -27,13 +27,13 @@
         try {
             if(@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) {
                 $password = Str::random(16);
-            }else{
+            } else{
                 $password = $this->command->option("password");
             }
 
             if(@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) {
                 $username = Str::random(5);
-            }else{
+            } else{
                 $username = $this->command->option("username");
             }
         } catch (\Exception $e) {

src/CRUDBoosterServiceProvider.php

Spacing +11 added lines, -11 removed lines

@@ -25,13 +25,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")));
@@ -53,7 +53,7 @@ 
         require __DIR__.'/helpers/Helper.php';
 
         // Singletons
-        $this->app->singleton('crudbooster', function ()
+        $this->app->singleton('crudbooster', function()
         {
             return true;
         });
@@ -71,7 +71,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');
@@ -83,11 +83,11 @@ 
     private function registerPlugin()
     {
         $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");
             }
@@ -96,7 +96,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/helpers/Plugin.php

Spacing +10 added lines, -10 removed lines

@@ -15,26 +15,26 @@ 
 
     public static function has($key)
     {
-        if(file_exists(app_path("CBPlugins/".$key))) return true;
+        if (file_exists(app_path("CBPlugins/".$key))) return true;
         else return false;
     }
 
     public static function isNeedUpgrade($pluginKey, $versionToCompare)
     {
         $pluginJson = json_decode(file_get_contents(app_path("CBPlugins/".$pluginKey."/plugin.json")), true);
-        if($pluginJson) {
-            return version_compare($pluginJson['version'], $versionToCompare,"!=");
-        }else{
+        if ($pluginJson) {
+            return version_compare($pluginJson['version'], $versionToCompare, "!=");
+        } else {
             return false;
         }
     }
 
     public static function registerDefaultRoute($dir)
     {
-        Route::group(['middleware' => ['web',\crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
+        Route::group(['middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
             'prefix'=>"developer/".getSetting('developer_path'),
-            'namespace' => 'App\CBPlugins\\'.basename(dirname("./../".$dir)).'\Controllers'], function () use ($dir) {
-            cb()->routeController("plugins/".basename(dirname("./../".$dir)),"\App\CBPlugins\\".basename(dirname("./../".$dir))."\Controllers\\".basename(dirname("./../".$dir))."Controller");
+            'namespace' => 'App\CBPlugins\\'.basename(dirname("./../".$dir)).'\Controllers'], function() use ($dir) {
+            cb()->routeController("plugins/".basename(dirname("./../".$dir)), "\App\CBPlugins\\".basename(dirname("./../".$dir))."\Controllers\\".basename(dirname("./../".$dir))."Controller");
         });
     }
 
@@ -43,11 +43,11 @@ 
         $plugins = scandir(app_path("CBPlugins"));
 
         $result = [];
-        foreach($plugins as $plugin) {
-            if($plugin != "." && $plugin != "..") {
+        foreach ($plugins as $plugin) {
+            if ($plugin != "." && $plugin != "..") {
                 $basename = basename($plugin);
                 $row = json_decode(file_get_contents(app_path("CBPlugins".DIRECTORY_SEPARATOR.$plugin.DIRECTORY_SEPARATOR."plugin.json")), true);
-                if($row) {
+                if ($row) {
                     $result[] = [
                         "name"=>$row['name'],
                         "version"=>$row['version'],

Braces +6 added lines, -3 removed lines

@@ -15,8 +15,11 @@ 
 
     public static function has($key)
     {
-        if(file_exists(app_path("CBPlugins/".$key))) return true;
-        else return false;
+        if(file_exists(app_path("CBPlugins/".$key))) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     public static function isNeedUpgrade($pluginKey, $versionToCompare)
@@ -24,7 +27,7 @@ 
         $pluginJson = json_decode(file_get_contents(app_path("CBPlugins/".$pluginKey."/plugin.json")), true);
         if($pluginJson) {
             return version_compare($pluginJson['version'], $versionToCompare,"!=");
-        }else{
+        } else{
             return false;
         }
     }

src/controllers/DeveloperDashboardController.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     public function getIndex() {
         $data = [];
         $data['page_title'] = "Dashboard";
-        return view('crudbooster::dev_layouts.modules.dashboard',$data);
+        return view('crudbooster::dev_layouts.modules.dashboard', $data);
     }
     
     public function postSkipTutorial()

src/controllers/DeveloperMailController.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 
     public function getIndex() {
         $data = [];
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function postSave()
@@ -38,6 +38,6 @@ 
             "MAIL_ENCRYPTION"=>request("MAIL_ENCRYPTION")
         ]);
 
-        return cb()->redirectBack("Mail configuration has been updated!","success");
+        return cb()->redirectBack("Mail configuration has been updated!", "success");
     }
 }
\ No newline at end of file

src/controllers/AdminProfileController.php

Spacing +7 added lines, -7 removed lines

@@ -11,11 +11,11 @@ 
     public function getIndex() {
         $data = [];
         $data['page_title'] = cbLang("profile");
-        return view('crudbooster::profile',$data);
+        return view('crudbooster::profile', $data);
     }
 
     public function postUpdate() {
-        validator(request()->all(),[
+        validator(request()->all(), [
             'name'=>'required|max:255|min:3',
             'email'=>'required|email',
             'photo'=>'image',
@@ -26,20 +26,20 @@ 
             $data = [];
             $data['name'] = request('name');
             $data['email'] = request('email');
-            if(request('password')) {
+            if (request('password')) {
                 $data['password'] = Hash::make(request('password'));
             }
-            if(request()->hasFile('photo')) {
+            if (request()->hasFile('photo')) {
                 $data['photo'] = cb()->uploadFile('photo', true, 200, 200);
             }
 
             DB::table("users")->where("id", auth()->id())->update($data);
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack(cbLang("something_went_wrong"),"warning");
+            return cb()->redirectBack(cbLang("something_went_wrong"), "warning");
         }
 
-        return cb()->redirectBack("The profile data has been updated!","success");
+        return cb()->redirectBack("The profile data has been updated!", "success");
     }
 
 }

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             }
 
             DB::table("users")->where("id", auth()->id())->update($data);
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             Log::error($e);
             return cb()->redirectBack(cbLang("something_went_wrong"),"warning");
         }