crocodic-studio / crudbooster

src/types/select_query/SelectQuery.php

Spacing +5 added lines, -5 removed lines

@@ -29,16 +29,16 @@
 
         columnSingleton()->setColumn($this->index, $data);
 
-        if(is_callable($query)) {
+        if (is_callable($query)) {
             $result = call_user_func($query);
-        }else{
+        } else {
             $result = DB::select(DB::raw($query));
         }
 
-        if($result) {
+        if ($result) {
             $options = [];
-            foreach($result as $r) {
-                $options[ $r->key ] = $r->label;
+            foreach ($result as $r) {
+                $options[$r->key] = $r->label;
             }
             $this->options($options);
         }

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"),trans('cb::cb.please_login_for_first'),'warning');
+        if (auth()->guest()) {
+            return cb()->redirect(cb()->getLoginUrl("login"), trans('cb::cb.please_login_for_first'), 'warning');
         }
 
         (new CBHook())->beforeBackendMiddleware($request);

src/commands/Install.php

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
 
         if ($this->confirm('Do you have setting the database configuration at .env ?')) {
 
-            if (! file_exists(public_path('vendor')) ) {
+            if (!file_exists(public_path('vendor'))) {
                 mkdir(public_path('vendor'));
             }
 
@@ -54,11 +54,11 @@ 
              * We need it to change default laravel local filesystem from storage to public
              * We won't use symlink because of a security issue in many server
              */
-            if(!file_exists(public_path("storage"))) {
+            if (!file_exists(public_path("storage"))) {
                 $this->info("Create storage directory on /public");
                 mkdir(public_path("storage"));
-                file_put_contents(public_path("storage/.gitignore"),"!.gitignore");
-                file_put_contents(public_path("storage/index.html")," ");
+                file_put_contents(public_path("storage/.gitignore"), "!.gitignore");
+                file_put_contents(public_path("storage/index.html"), " ");
             }
 
             /*
@@ -67,8 +67,8 @@ 
              * Disable php execution on /vendor/*
              */
             $this->info("Tweak some security for your laravel");
-            file_put_contents(base_path(".htaccess"), "\n\n# Generated by CRUDBooster\nServerSignature Off\nIndexIgnore *\nRewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]\nRewriteRule ^vendor/.*\.(php|rb|py)$ - [F,L,NC]\n<FilesMatch \"^\.\">\nOrder allow,deny\nDeny from all\n</FilesMatch>",FILE_APPEND);
-            file_put_contents(public_path(".htaccess"), "\n\n# Generated by CRUDBooster\nServerSignature Off\nIndexIgnore *\nRewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]\nRewriteRule ^vendor/.*\.(php|rb|py)$ - [F,L,NC]\n<FilesMatch \"^\.\">\nOrder allow,deny\nDeny from all\n</FilesMatch>",FILE_APPEND);
+            file_put_contents(base_path(".htaccess"), "\n\n# Generated by CRUDBooster\nServerSignature Off\nIndexIgnore *\nRewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]\nRewriteRule ^vendor/.*\.(php|rb|py)$ - [F,L,NC]\n<FilesMatch \"^\.\">\nOrder allow,deny\nDeny from all\n</FilesMatch>", FILE_APPEND);
+            file_put_contents(public_path(".htaccess"), "\n\n# Generated by CRUDBooster\nServerSignature Off\nIndexIgnore *\nRewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]\nRewriteRule ^vendor/.*\.(php|rb|py)$ - [F,L,NC]\n<FilesMatch \"^\.\">\nOrder allow,deny\nDeny from all\n</FilesMatch>", FILE_APPEND);
 
 
             $this->info('Dumping the autoloaded files and reloading all new files...');

src/types/select_query/Hook.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     {
         $option = $column->getOptions();
         $key = $row->{ $column->getField() };
-        return @$option[ $key ];
+        return @$option[$key];
     }
 
     public function detailRender($row, $column)

src/types/file/FileController.php

Spacing +4 added lines, -4 removed lines

@@ -14,21 +14,21 @@
 {
     public function postUploadFile()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if (auth()->guest()) return redirect(cb()->getLoginUrl());
 
         $file = null;
         try {
 
             cb()->validation([
-                'userfile' => 'required|mimes:' . implode(",",config('crudbooster.UPLOAD_FILE_EXTENSION_ALLOWED'))
+                'userfile' => 'required|mimes:'.implode(",", config('crudbooster.UPLOAD_FILE_EXTENSION_ALLOWED'))
             ]);
 
             $file = cb()->uploadFile('userfile', request("encrypt"));
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         } catch (\Exception $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json([

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);
         }
 

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/helpers/CB.php

Spacing +31 added lines, -31 removed lines

@@ -20,7 +20,7 @@ 
 {
 
     public function getRoleByName($roleName) {
-        return $this->find("cb_roles",['name'=>$roleName]);
+        return $this->find("cb_roles", ['name'=>$roleName]);
     }
 
     public function fcm() {
@@ -36,7 +36,7 @@ 
     }
 
     public function getDeveloperUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url("developer/".getSetting("developer_path")).$path;
     }
 
@@ -53,12 +53,12 @@ 
     }
 
     public function getAdminUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url(cbConfig("ADMIN_PATH")).$path;
     }
 
     public function getAppName() {
-        return env("APP_NAME","CRUDBOOSTER");
+        return env("APP_NAME", "CRUDBOOSTER");
     }
 
     /**
@@ -72,16 +72,16 @@ 
      */
     private function uploadFileProcess($filename, $extension, $file, $encrypt = true, $resize_width = null, $resize_height = null)
     {
-        if(in_array($extension,cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
+        if (in_array($extension, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
             $file_path = cbConfig("UPLOAD_PATH_FORMAT");
-            $file_path = str_replace("{Y}",date('Y'), $file_path);
+            $file_path = str_replace("{Y}", date('Y'), $file_path);
             $file_path = str_replace("{m}", date('m'), $file_path);
             $file_path = str_replace("{d}", date("d"), $file_path);
 
             //Create Directory Base On Template
             Storage::makeDirectory($file_path);
-            Storage::put($file_path."/index.html"," ","public");
-            Storage::put($file_path."/.gitignore","!.gitignore","public");
+            Storage::put($file_path."/index.html", " ", "public");
+            Storage::put($file_path."/.gitignore", "!.gitignore", "public");
 
             if ($encrypt == true) {
                 $filename = md5(strRandom(5)).'.'.$extension;
@@ -89,17 +89,17 @@ 
                 $filename = slug($filename, '_').'.'.$extension;
             }
 
-            if($resize_width || $resize_height) {
+            if ($resize_width || $resize_height) {
                 $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height);
                 return $file_path.'/'.$filename;
-            }else{
+            } else {
                 if (Storage::put($file_path.'/'.$filename, $file, 'public')) {
                     return $file_path.'/'.$filename;
                 } else {
                     throw new \Exception("Something went wrong, file can't upload!");
                 }
             }
-        }else{
+        } else {
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -115,16 +115,16 @@ 
     {
         $fileData = base64_decode($base64_value);
         $mime_type = finfo_buffer(finfo_open(), $fileData, FILEINFO_MIME_TYPE);
-        if($mime_type) {
-            if($mime_type = explode('/', $mime_type)) {
+        if ($mime_type) {
+            if ($mime_type = explode('/', $mime_type)) {
                 $ext = $mime_type[1];
-                if($filename && $ext) {
+                if ($filename && $ext) {
                     return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height);
                 }
-            }else {
+            } else {
                 throw new \Exception("Mime type not found");
             }
-        }else{
+        } else {
             throw new \Exception("Mime type not found");
         }
     }
@@ -144,7 +144,7 @@ 
             $filename = $file->getClientOriginalName();
             $ext = strtolower($file->getClientOriginalExtension());
 
-            if($filename && $ext) {
+            if ($filename && $ext) {
                 return $this->uploadFileProcess($filename, $ext, $file, $encrypt, $resize_width, $resize_height);
             }
 
@@ -179,29 +179,29 @@ 
             if ($resize_width && $resize_height) {
                 $img->fit($resize_width, $resize_height);
 
-            } elseif ($resize_width && ! $resize_height) {
+            } elseif ($resize_width && !$resize_height) {
 
-                $img->resize($resize_width, null, function ($constraint) {
+                $img->resize($resize_width, null, function($constraint) {
                     $constraint->aspectRatio();
                 });
 
-            } elseif (! $resize_width && $resize_height) {
+            } elseif (!$resize_width && $resize_height) {
 
-                $img->resize(null, $resize_height, function ($constraint) {
+                $img->resize(null, $resize_height, function($constraint) {
                     $constraint->aspectRatio();
                 });
 
             } else {
 
                 if ($img->width() > cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES")) {
-                    $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function ($constraint) {
+                    $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function($constraint) {
                         $constraint->aspectRatio();
                     });
                 }
             }
 
             Storage::put($fullFilePath, $img, 'public');
-        }else{
+        } else {
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -314,7 +314,7 @@ 
         $validator = Validator::make($input_arr, $rules, $messages);
         if ($validator->fails()) {
             $message = $validator->errors()->all();
-            throw new CBValidationException(implode("; ",$message));
+            throw new CBValidationException(implode("; ", $message));
         }
     }
 
@@ -326,7 +326,7 @@ 
     public function findPrimaryKey($table)
     {
         $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-        if(!$pk) {
+        if (!$pk) {
             return null;
         }
         return $pk->getColumns()[0];
@@ -375,7 +375,7 @@ 
             $string_parameters_array = explode('&', $string_parameters);
             foreach ($string_parameters_array as $s) {
                 $part = explode('=', $s);
-                if(isset($part[0]) && isset($part[1])) {
+                if (isset($part[0]) && isset($part[1])) {
                     $name = htmlspecialchars(urldecode($part[0]));
                     $name = strip_tags($name);
                     $value = htmlspecialchars(urldecode($part[1]));
@@ -392,16 +392,16 @@ 
 
 
     public function routeGet($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::get($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 
     public function routePost($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::post($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 
@@ -426,7 +426,7 @@ 
 
         $prefix = trim($prefix, '/').'/';
 
-        if(substr($controller,0,1) != "\\") {
+        if (substr($controller, 0, 1) != "\\") {
             $controller = "\App\Http\Controllers\\".$controller;
         }
 

src/helpers/Helper.php

Spacing +56 added lines, -56 removed lines

@@ -9,7 +9,7 @@ 
 |
 */
 
-if(!function_exists("cbLang")) {
+if (!function_exists("cbLang")) {
     /**
      * @param string $key
      * @param array $replace
@@ -21,17 +21,17 @@ 
     }
 }
 
-if(!function_exists('rglob')) {
+if (!function_exists('rglob')) {
     function rglob($pattern, $flags = 0) {
         $files = glob($pattern, $flags);
-        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
+        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
             $files = array_merge($files, rglob($dir.'/'.basename($pattern), $flags));
         }
         return $files;
     }
 }
 
-if(!function_exists('convertPHPToMomentFormat')) {
+if (!function_exists('convertPHPToMomentFormat')) {
     function convertPHPToMomentFormat($format)
     {
         $replacements = [
@@ -78,13 +78,13 @@ 
     }
 }
 
-if(!function_exists('slug')) {
+if (!function_exists('slug')) {
     function slug($string, $separator = '-') {
         return \Illuminate\Support\Str::slug($string, $separator);
     }
 }
 
-if(!function_exists('columnSingleton')) {
+if (!function_exists('columnSingleton')) {
     /**
      * @return \crocodicstudio\crudbooster\controllers\scaffolding\singletons\ColumnSingleton
      */
@@ -93,7 +93,7 @@ 
     }
 }
 
-if(!function_exists('cbHook'))
+if (!function_exists('cbHook'))
 {
     /**
      * @return crocodicstudio\crudbooster\hooks\CBHook
@@ -105,7 +105,7 @@ 
     }
 }
 
-if(!function_exists('getTypeHook'))
+if (!function_exists('getTypeHook'))
 {
     /**
      * @param string $type
@@ -118,7 +118,7 @@ 
     }
 }
 
-if(!function_exists('getPrimaryKey'))
+if (!function_exists('getPrimaryKey'))
 {
     function getPrimaryKey($table_name)
     {
@@ -126,7 +126,7 @@ 
     }
 }
 
-if(!function_exists('cb'))
+if (!function_exists('cb'))
 {
     function cb()
     {
@@ -134,25 +134,25 @@ 
     }
 }
 
-if(!function_exists('cbAsset')) {
+if (!function_exists('cbAsset')) {
     function cbAsset($path) {
         return asset("cb_asset/".$path);
     }
 }
 
-if(!function_exists("cbConfig")) {
+if (!function_exists("cbConfig")) {
     function cbConfig($name) {
         return config("crudbooster.".$name);
     }
 }
 
-if(!function_exists("strRandom")) {
+if (!function_exists("strRandom")) {
     function strRandom($length = 5) {
         return \Illuminate\Support\Str::random($length);
     }
 }
 
-if(!function_exists('module')) {
+if (!function_exists('module')) {
     function module()
     {
         $module = new \crocodicstudio\crudbooster\helpers\Module();
@@ -160,43 +160,43 @@ 
     }
 }
 
-if(!function_exists('getAdminLoginURL')) {
+if (!function_exists('getAdminLoginURL')) {
     function getAdminLoginURL()
     {
         return url(config('crudbooster.ADMIN_LOGIN_PATH'));
     }
 }
 
-if(!function_exists('dummyPhoto')) {
+if (!function_exists('dummyPhoto')) {
     function dummyPhoto()
     {
         return cbConfig("DUMMY_PHOTO");
     }
 }
 
-if(!function_exists('assetThumbnail')) {
+if (!function_exists('assetThumbnail')) {
 	function assetThumbnail($path) {
-		$path = str_replace('uploads/','uploads_thumbnail/',$path);
+		$path = str_replace('uploads/', 'uploads_thumbnail/', $path);
 		return asset($path);
 	}
 }
 
-if(!function_exists('assetResize')) {
-	function assetResize($path,$width,$height=null,$quality=70) {
+if (!function_exists('assetResize')) {
+	function assetResize($path, $width, $height = null, $quality = 70) {
 		$basename = basename($path);
 	    $pathWithoutName = str_replace($basename, '', $path);
 	    $newLocation = $pathWithoutName.'/w_'.$width.'_h_'.$height.'_'.$basename;
-	    if(Storage::exists($newLocation)) {
+	    if (Storage::exists($newLocation)) {
 	        return asset($newLocation);
-	    }else{
-	        $img = Image::make(storage_path($path))->fit($width,$height);
-	        $img->save(storage_path($newLocation),$quality);
+	    } else {
+	        $img = Image::make(storage_path($path))->fit($width, $height);
+	        $img->save(storage_path($newLocation), $quality);
 	        return asset($newLocation);
 	    }
 	}
 }
 
-if(!function_exists('extract_unit')) {	
+if (!function_exists('extract_unit')) {	
 	/*
 	Credits: Bit Repository
 	URL: http://www.bitrepository.com/extract-content-between-two-delimiters-with-php.html
@@ -214,7 +214,7 @@ 
 }
 
 
-if(!function_exists('now')) {
+if (!function_exists('now')) {
 	function now() {		
 		return date('Y-m-d H:i:s');
 	}
@@ -228,14 +228,14 @@ 
 |
 */
 
-if(!function_exists('putSetting')) {
+if (!function_exists('putSetting')) {
     function putSetting($key, $value)
     {
-        if(file_exists(storage_path('.cbconfig'))) {
+        if (file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
@@ -249,31 +249,31 @@ 
     }
 }
 
-if(!function_exists('getSetting')) {
+if (!function_exists('getSetting')) {
     function getSetting($key, $default = null)
     {
-        if($cache = \Illuminate\Support\Facades\Cache::get("setting_".$key)) {
+        if ($cache = \Illuminate\Support\Facades\Cache::get("setting_".$key)) {
             return $cache;
         }
 
-        if(file_exists(storage_path('.cbconfig'))) {
+        if (file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
-        if(isset($settings[$key])) {
+        if (isset($settings[$key])) {
             \Illuminate\Support\Facades\Cache::put("setting_".$key, $settings[$key], 180);
-            return $settings[$key]?:$default;
-        }else{
+            return $settings[$key] ?: $default;
+        } else {
             return $default;
         }
     }
 }
 
-if(!function_exists('timeAgo')) {
+if (!function_exists('timeAgo')) {
     function timeAgo($datetime_to, $datetime_from = null, $full = false)
     {
         $datetime_from = ($datetime_from) ?: date('Y-m-d H:i:s');
@@ -304,7 +304,7 @@ 
             }
         }
 
-        if (! $full) {
+        if (!$full) {
             $string = array_slice($string, 0, 1);
         }
 
@@ -312,22 +312,22 @@ 
     }
 }
 
-if(!function_exists("array_map_r")) {
-    function array_map_r( $func, $arr )
+if (!function_exists("array_map_r")) {
+    function array_map_r($func, $arr)
     {
         $newArr = array();
 
-        foreach( $arr as $key => $value )
+        foreach ($arr as $key => $value)
         {
             $key = $func($key);
-            $newArr[ $key ] = ( is_array( $value ) ? array_map_r( $func, $value ) : ( is_array($func) ? call_user_func_array($func, $value) : $func( $value ) ) );
+            $newArr[$key] = (is_array($value) ? array_map_r($func, $value) : (is_array($func) ? call_user_func_array($func, $value) : $func($value)));
         }
 
         return $newArr;
     }
 }
 
-if(!function_exists("sanitizeXSS"))
+if (!function_exists("sanitizeXSS"))
 {
     function sanitizeXSS($value)
     {
@@ -339,7 +339,7 @@ 
     }
 }
 
-if(!function_exists("requestAll")) {
+if (!function_exists("requestAll")) {
     function requestAll() {
         $all = array_map_r("sanitizeXSS", request()->all());
         return $all;
@@ -348,22 +348,22 @@ 
 
 
 
-if(!function_exists('getURLFormat')) {
+if (!function_exists('getURLFormat')) {
     function getURLFormat($name) {
         $url = request($name);
-        if(filter_var($url, FILTER_VALIDATE_URL)) {
+        if (filter_var($url, FILTER_VALIDATE_URL)) {
             return $url;
-        }else{
+        } else {
             return request()->url();
         }
     }
 }
 
-if(!function_exists('g')) {
+if (!function_exists('g')) {
     function g($name, $safe = true) {
-        if($safe == true) {
+        if ($safe == true) {
             $response = request($name);
-            if(is_string($response)) {
+            if (is_string($response)) {
                 $response = sanitizeXSS($response);
             }elseif (is_array($response)) {
                 array_walk_recursive($response, function(&$response) {
@@ -372,25 +372,25 @@ 
             }
 
             return $response;
-        }else{
+        } else {
             return Request::get($name);
         }
     }
 }
 
-if(!function_exists('min_var_export')) {
+if (!function_exists('min_var_export')) {
     function min_var_export($input) {
-        if(is_array($input)) {
+        if (is_array($input)) {
             $buffer = [];
-            foreach($input as $key => $value)
+            foreach ($input as $key => $value)
                 $buffer[] = var_export($key, true)."=>".min_var_export($value);
-            return "[".implode(",",$buffer)."]";
+            return "[".implode(",", $buffer)."]";
         } else
             return var_export($input, true);
     }
 }
 
-if(!function_exists('rrmdir')) {
+if (!function_exists('rrmdir')) {
 	/*
 	* http://stackoverflow.com/questions/3338123/how-do-i-recursively-delete-a-directory-and-its-entire-contents-files-sub-dir
 	*/