crocodic-studio / crudbooster

src/views/dev_layouts/modules/appearance/index.blade.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                                 <label>Dashboard Controller</label>
                                 <select name="dashboard_controller" class="form-control">
                                     <option value="">** Default CB</option>
-                                    <?php $controllers = glob(app_path("Http/Controllers/*Controller.php"));?>
+                                    <?php $controllers = glob(app_path("Http/Controllers/*Controller.php")); ?>
                                     @foreach($controllers as $controller)
                                         @if(basename($controller) != "Controller.php")
                                         <option {{ getSetting("dashboard_controller")==rtrim(basename($controller),".php")?"selected":"" }} value="{{ rtrim(basename($controller),".php") }}">{{ rtrim(basename($controller),".php") }}</option>

src/types/image/Hook.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
     {
         // Direct return value because its been uploaded on client side
         $ext = strtolower(pathinfo($value, PATHINFO_EXTENSION));
-        if(in_array($ext, cbConfig("UPLOAD_IMAGE_EXTENSION_ALLOWED"))) {
+        if (in_array($ext, cbConfig("UPLOAD_IMAGE_EXTENSION_ALLOWED"))) {
             return $value;
         }
     }
@@ -31,7 +31,7 @@ 
     public function detailRender($row, $column)
     {
         $column->setValue($row->{ $column->getField() });
-        return view("types::image.detail",[
+        return view("types::image.detail", [
             'row'=>$row,
             'column'=>$column
         ]);
@@ -40,7 +40,7 @@ 
     public function indexRender($row, $column)
     {
         $column->setValue($row->{ $column->getField() });
-        return view("types::image.index",[
+        return view("types::image.index", [
             'row'=>$row,
             'column'=>$column
         ]);

src/types/file/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function assignment($value, $column)
     {
         $ext = strtolower(pathinfo($value, PATHINFO_EXTENSION));
-        if(in_array($ext, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
+        if (in_array($ext, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
             return $value;
         }
     }
@@ -30,7 +30,7 @@ 
     public function detailRender($row, $column)
     {
         $column->setValue($row->{ $column->getField() });
-        return view("types::file.detail",[
+        return view("types::file.detail", [
             'row'=>$row,
             'column'=>$column
         ]);

src/helpers/Helper.php

Spacing +79 added lines, -79 removed lines

@@ -3,64 +3,64 @@ 
 /*
  * Theme Helper
  */
-if(!function_exists("themeLoginBackground")) {
+if (!function_exists("themeLoginBackground")) {
     function themeLoginBackground() {
         return "crudbooster::layouts.login_background_css";
     }
 }
-if(!function_exists("themeFlashMessageAlert")) {
+if (!function_exists("themeFlashMessageAlert")) {
     function themeFlashMessageAlert() {
         return "crudbooster::layouts.flash_message_alert";
     }
 }
 
-if(!function_exists("themeFlashMessage")) {
+if (!function_exists("themeFlashMessage")) {
     function themeFlashMessage() {
         return "crudbooster::layouts.flash_message";
     }
 }
 
-if(!function_exists("themeAlertMessage")) {
+if (!function_exists("themeAlertMessage")) {
     function themeAlertMessage() {
         return "crudbooster::layouts.alert_message";
     }
 }
 
-if(!function_exists("themeLayoutPageTitleAndButton")) {
+if (!function_exists("themeLayoutPageTitleAndButton")) {
     function themeLayoutPageTitleAndButton() {
         return 'crudbooster::module.index.index_head_buttons';
     }
 }
 
-if(!function_exists("themeLayoutHead")) {
+if (!function_exists("themeLayoutHead")) {
     function themeLayoutHead() {
         return "crudbooster::layouts.head";
     }
 }
-if(!function_exists("themeTitle")) {
+if (!function_exists("themeTitle")) {
     function themeTitle($page_title) {
-        $page_title = isset($page_title)?$page_title:module()->getPageTitle();
-        return (isset($page_title))?cb()->getAppName().': '.strip_tags($page_title):"Admin Area";
+        $page_title = isset($page_title) ? $page_title : module()->getPageTitle();
+        return (isset($page_title)) ?cb()->getAppName().': '.strip_tags($page_title) : "Admin Area";
     }
 }
 
-if(!function_exists("getThemePath")) {
+if (!function_exists("getThemePath")) {
     function getThemePath($path = null) {
-        return getSetting("theme_path", "crudbooster::themes.adminlte").(($path)?".".$path:null);
+        return getSetting("theme_path", "crudbooster::themes.adminlte").(($path) ? ".".$path : null);
     }
 }
 
 // End Theme Helper
 
-if(!function_exists("isConfigCached")) {
+if (!function_exists("isConfigCached")) {
     function isConfigCached()
     {
-        if(env("APP_NAME")=="" || env("APP_NAME")==null) return true;
+        if (env("APP_NAME") == "" || env("APP_NAME") == null) return true;
         else return false;
     }
 }
 
-if(!function_exists("miscellanousSingleton")) {
+if (!function_exists("miscellanousSingleton")) {
     /**
      * @return \crocodicstudio\crudbooster\helpers\MiscellanousSingleton
      */
@@ -69,14 +69,14 @@ 
     }
 }
 
-if(!function_exists("makeReferalUrl")) {
+if (!function_exists("makeReferalUrl")) {
     function makeReferalUrl($name = null) {
         $ref = [];
         $ref['url'] = request()->fullUrl();
         $ref['name'] = $name;
         $md5Hash = md5(serialize($ref));
 
-        if($exist = \Illuminate\Support\Facades\Cache::get("refurl_".$md5Hash)) {
+        if ($exist = \Illuminate\Support\Facades\Cache::get("refurl_".$md5Hash)) {
             return $exist['id'];
         }
 
@@ -88,12 +88,12 @@ 
     }
 }
 
-if(!function_exists("getReferalUrl")) {
+if (!function_exists("getReferalUrl")) {
     function getReferalUrl($key = null) {
-        if(verifyReferalUrl()) {
+        if (verifyReferalUrl()) {
             $md5hash = \Illuminate\Support\Facades\Cache::get("refurl_token_".request("ref"));
             $ref = \Illuminate\Support\Facades\Cache::get("refurl_".$md5hash);
-            if($key) {
+            if ($key) {
                 return @$ref[$key];
             } else {
                 return $ref;
@@ -103,13 +103,13 @@ 
     }
 }
 
-if(!function_exists("verifyReferalUrl")) {
+if (!function_exists("verifyReferalUrl")) {
     function verifyReferalUrl()
     {
-        if(request("ref")) {
-            if($md5hash = \Illuminate\Support\Facades\Cache::get("refurl_token_".request("ref"))) {
+        if (request("ref")) {
+            if ($md5hash = \Illuminate\Support\Facades\Cache::get("refurl_token_".request("ref"))) {
                 $ref = \Illuminate\Support\Facades\Cache::get("refurl_".$md5hash);
-                if(filter_var($ref['url'], FILTER_VALIDATE_URL)) {
+                if (filter_var($ref['url'], FILTER_VALIDATE_URL)) {
                     return true;
                 }
             }
@@ -118,7 +118,7 @@ 
     }
 }
 
-if(!function_exists("putHtaccess")) {
+if (!function_exists("putHtaccess")) {
     function putHtaccess($stringToPut)
     {
         file_put_contents(base_path(".htaccess"), "\n".$stringToPut, FILE_APPEND);
@@ -126,13 +126,13 @@ 
     }
 }
 
-if(!function_exists("checkHtaccess")) {
+if (!function_exists("checkHtaccess")) {
     function checkHtaccess($stringToCheck)
     {
-        if(file_exists(base_path(".htaccess")) && file_exists(public_path(".htaccess"))) {
+        if (file_exists(base_path(".htaccess")) && file_exists(public_path(".htaccess"))) {
             $htaccess = file_get_contents(base_path(".htaccess"));
-            $htaccess2= file_get_contents(public_path(".htaccess"));
-            if(\Illuminate\Support\Str::contains($htaccess, $stringToCheck) && \Illuminate\Support\Str::contains($htaccess2, $stringToCheck)) {
+            $htaccess2 = file_get_contents(public_path(".htaccess"));
+            if (\Illuminate\Support\Str::contains($htaccess, $stringToCheck) && \Illuminate\Support\Str::contains($htaccess2, $stringToCheck)) {
                 return true;
             }
         }
@@ -141,7 +141,7 @@ 
     }
 }
 
-if(!function_exists("setEnvironmentValue")) {
+if (!function_exists("setEnvironmentValue")) {
     function setEnvironmentValue(array $values)
     {
         $envFile = app()->environmentFilePath();
@@ -172,7 +172,7 @@ 
 }
 
 
-if(!function_exists("cbLang")) {
+if (!function_exists("cbLang")) {
     /**
      * @param string $key
      * @param array $replace
@@ -184,17 +184,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 = [
@@ -241,13 +241,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
      */
@@ -256,7 +256,7 @@ 
     }
 }
 
-if(!function_exists('cbHook'))
+if (!function_exists('cbHook'))
 {
     /**
      * @return crocodicstudio\crudbooster\hooks\CBHook
@@ -268,7 +268,7 @@ 
     }
 }
 
-if(!function_exists('getTypeHook'))
+if (!function_exists('getTypeHook'))
 {
     /**
      * @param string $type
@@ -281,7 +281,7 @@ 
     }
 }
 
-if(!function_exists('getPrimaryKey'))
+if (!function_exists('getPrimaryKey'))
 {
     function getPrimaryKey($table_name)
     {
@@ -289,7 +289,7 @@ 
     }
 }
 
-if(!function_exists('cb'))
+if (!function_exists('cb'))
 {
     function cb()
     {
@@ -297,30 +297,30 @@ 
     }
 }
 
-if(!function_exists("cbAssetPath")) {
+if (!function_exists("cbAssetPath")) {
     function cbAssetPath($path = null) {
-        return "cb_asset".(($path)?"/".$path:null);
+        return "cb_asset".(($path) ? "/".$path : null);
     }
 }
-if(!function_exists('cbAsset')) {
+if (!function_exists('cbAsset')) {
     function cbAsset($path, $secure = null) {
         return asset(cbAssetPath()."/".$path, $secure);
     }
 }
 
-if(!function_exists("cbConfig")) {
+if (!function_exists("cbConfig")) {
     function cbConfig($name, $default = null) {
         return config("crudbooster.".$name, $default);
     }
 }
 
-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();
@@ -328,21 +328,21 @@ 
     }
 }
 
-if(!function_exists('getAdminLoginURL')) {
+if (!function_exists('getAdminLoginURL')) {
     function getAdminLoginURL()
     {
         return cb()->getAdminUrl("login");
     }
 }
 
-if(!function_exists('dummyPhoto')) {
+if (!function_exists('dummyPhoto')) {
     function dummyPhoto()
     {
-        return getSetting("dummy_photo","cb_asset/images/user8-128x128.jpg");
+        return getSetting("dummy_photo", "cb_asset/images/user8-128x128.jpg");
     }
 }
 
-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
@@ -367,14 +367,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 = [];
         }
 
@@ -388,31 +388,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::forever("setting_".$key, $settings[$key]);
-            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');
@@ -443,7 +443,7 @@ 
             }
         }
 
-        if (! $full) {
+        if (!$full) {
             $string = array_slice($string, 0, 1);
         }
 
@@ -451,22 +451,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)
     {
@@ -478,7 +478,7 @@ 
     }
 }
 
-if(!function_exists("requestAll")) {
+if (!function_exists("requestAll")) {
     function requestAll() {
         $all = array_map_r("sanitizeXSS", request()->all());
         return $all;
@@ -487,22 +487,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) {
@@ -511,25 +511,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
 	*/

src/controllers/CBController.php

Spacing +37 added lines, -37 removed lines

@@ -32,10 +32,10 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $query = $this->repository();
-        $result = $query->paginate( request("limit")?:$this->data['limit'] );
+        $result = $query->paginate(request("limit") ?: $this->data['limit']);
         $data['result'] = $result;
 
         return view("crudbooster::module.index.index", array_merge($data, $this->data));
@@ -43,17 +43,17 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : '.cbLang('add');
         $data['action_url'] = module()->addSaveURL();
-        return view('crudbooster::module.form.form',array_merge($data, $this->data));
+        return view('crudbooster::module.form.form', array_merge($data, $this->data));
     }
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         try {
             $this->validation();
@@ -61,38 +61,38 @@ 
             $data = columnSingleton()->getAssignmentData();
 
             //Clear data from Primary Key
-            unset($data[ cb()->pk($this->data['table']) ]);
+            unset($data[cb()->pk($this->data['table'])]);
 
-            if(Schema::hasColumn($this->data['table'], 'created_at')) {
+            if (Schema::hasColumn($this->data['table'], 'created_at')) {
                 $data['created_at'] = date('Y-m-d H:i:s');
             }
 
-            if(Schema::hasColumn($this->data['table'], 'updated_at')) {
+            if (Schema::hasColumn($this->data['table'], 'updated_at')) {
                 $data['updated_at'] = date('Y-m-d H:i:s');
             }
 
-            if(isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) {
+            if (isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) {
                 $data = call_user_func($this->data['hook_before_insert'], $data);
             }
 
             $id = DB::table($this->data['table'])->insertGetId($data);
 
-            if(isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
+            if (isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
                 call_user_func($this->data['hook_after_insert'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack(cbLang("something_went_wrong"),'warning');
+            return cb()->redirectBack(cbLang("something_went_wrong"), 'warning');
         }
 
-        if (Str::contains(request("submit"),cbLang("more"))) {
+        if (Str::contains(request("submit"), cbLang("more"))) {
             return cb()->redirectBack(cbLang("the_data_has_been_added"), 'success');
         } else {
-            if(verifyReferalUrl()) {
+            if (verifyReferalUrl()) {
                 return cb()->redirect(getReferalUrl("url"), cbLang("the_data_has_been_added"), 'success');
             } else {
                 return cb()->redirect(module()->url(), cbLang("the_data_has_been_added"), 'success');
@@ -102,7 +102,7 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -113,7 +113,7 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         try {
             $this->validation();
@@ -121,40 +121,40 @@ 
             $data = columnSingleton()->getAssignmentData();
 
             // Make sure the Primary Key is not included
-            unset($data[ cb()->pk($this->data['table']) ]);
+            unset($data[cb()->pk($this->data['table'])]);
 
-            if(Schema::hasColumn($this->data['table'], 'updated_at')) {
+            if (Schema::hasColumn($this->data['table'], 'updated_at')) {
                 $data['updated_at'] = date('Y-m-d H:i:s');
             }
 
             unset($data['created_at']);
 
-            if(isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
+            if (isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
                 $data = call_user_func($this->data['hook_before_update'], $data, $id);
             }
 
             cb()->update($this->data['table'], $id, $data);
 
-            if(isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
+            if (isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
                 call_user_func($this->data['hook_after_update'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack(cbLang("something_went_wrong"),'warning');
+            return cb()->redirectBack(cbLang("something_went_wrong"), 'warning');
         }
 
 
         if (Str::contains(request("submit"), cbLang("more"))) {
-            return cb()->redirectBack( cbLang("the_data_has_been_updated"), 'success');
+            return cb()->redirectBack(cbLang("the_data_has_been_updated"), 'success');
         } else {
-            if(verifyReferalUrl()) {
-                return cb()->redirect(getReferalUrl("url"),  cbLang("the_data_has_been_updated"), 'success');
+            if (verifyReferalUrl()) {
+                return cb()->redirect(getReferalUrl("url"), cbLang("the_data_has_been_updated"), 'success');
             } else {
-                return cb()->redirect(module()->url(),  cbLang("the_data_has_been_updated"), 'success');
+                return cb()->redirect(module()->url(), cbLang("the_data_has_been_updated"), 'success');
             }
 
         }
@@ -162,15 +162,15 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
-        if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
+        if (isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
 
-        if ($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) {
             DB::table($this->data['table'])
                 ->where(getPrimaryKey($this->data['table']), $id)
                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
@@ -180,16 +180,16 @@ 
                 ->delete();
         }
 
-        if(isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
+        if (isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
             call_user_func($this->data['hook_after_delete'], $id);
         }
 
-        return cb()->redirectBack( cbLang("the_data_has_been_deleted"), 'success');
+        return cb()->redirectBack(cbLang("the_data_has_been_deleted"), 'success');
     }
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first();
@@ -208,14 +208,14 @@ 
      */
     public function __call($method, $parameters)
     {
-        if($method == "getData") {
+        if ($method == "getData") {
             $key = $parameters[0];
-            if(isset($this->data[$key])) {
+            if (isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else {
                 return null;
             }
-        }else{
+        } else {
             return null;
         }
     }

Braces +23 added lines, -9 removed lines

@@ -32,7 +32,9 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $query = $this->repository();
         $result = $query->paginate( request("limit")?:$this->data['limit'] );
@@ -43,7 +45,9 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : '.cbLang('add');
@@ -53,7 +57,9 @@ 
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         try {
             $this->validation();
@@ -102,7 +108,9 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -113,7 +121,9 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         try {
             $this->validation();
@@ -162,7 +172,9 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canDelete()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
@@ -189,7 +201,9 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canRead()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first();
@@ -212,10 +226,10 @@ 
             $key = $parameters[0];
             if(isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else{
                 return null;
             }
-        }else{
+        } else{
             return null;
         }
     }

src/controllers/traits/ControllerSetting.php

Spacing +15 added lines, -15 removed lines

@@ -33,11 +33,11 @@ 
         $this->setButtonDetail(true);
         $this->setButtonSave(true);
         $this->setButtonLimitPage(true);
-        $this->hideButtonDeleteWhen(function ($row) { return false; });
-        $this->hideButtonDetailWhen(function ($row) { return false; });
-        $this->hideButtonEditWhen(function ($row) { return false; });
-        $this->style(function () { return null; });
-        $this->javascript(function () { return null; });
+        $this->hideButtonDeleteWhen(function($row) { return false; });
+        $this->hideButtonDetailWhen(function($row) { return false; });
+        $this->hideButtonEditWhen(function($row) { return false; });
+        $this->style(function() { return null; });
+        $this->javascript(function() { return null; });
     }
 
     public function appendAddForm(callable $html) {
@@ -157,9 +157,9 @@ 
      * @param ButtonColor $color
      * @param string $attributes
      */
-    public function addIndexActionButton($label, $actionURL, $fontAwesome_icon=null, $color=null, $attributes = null)
+    public function addIndexActionButton($label, $actionURL, $fontAwesome_icon = null, $color = null, $attributes = null)
     {
-        $color = ($color)?:ButtonColor::DARK_BLUE;
+        $color = ($color) ?: ButtonColor::DARK_BLUE;
 
         $model = new IndexActionButtonModel();
         $model->setLabel($label);
@@ -218,7 +218,7 @@ 
     public function addSubModule($label, $controllerName, $foreignKey, callable $additionalInfo = null, callable $condition = null, $font = null, $color = null) {
         $parentPath = $this->getData("permalink");
         $parentTitle = $this->getData("page_title");
-        $this->addActionButton($label,function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) {
+        $this->addActionButton($label, function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) {
            $actionParameters = [
                "label"=>$label,
                "foreignKey"=>$foreignKey,
@@ -227,22 +227,22 @@ 
                "parentTitle"=>$parentTitle
            ];
 
-            if(isset($additionalInfo) && is_callable($additionalInfo)) {
+            if (isset($additionalInfo) && is_callable($additionalInfo)) {
                 $additionalInfo = call_user_func($additionalInfo, $row);
-                if(is_array($additionalInfo)) {
+                if (is_array($additionalInfo)) {
                     $actionParameters['info'] = $additionalInfo;
                 }
             }
 
            $actionHash = md5(serialize($actionParameters));
            $actionHashToken = Cache::get("subModule".$actionHash);
-           if(!$actionHashToken) {
+           if (!$actionHashToken) {
                $actionHashToken = Str::random(5);
                Cache::forever("subModule".$actionHash, $actionHashToken);
                Cache::forever("subModule".$actionHashToken, $actionParameters);
            }
 
-           return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
+           return action(class_basename($controllerName)."@getSubModule", ['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
         }, $condition, $font, $color);
 
     }
@@ -255,12 +255,12 @@ 
      * @param $fontAwesome_icon
      * @param ButtonColor|string $color
      */
-    public function addActionButton($label, $url_target, $condition_callback=null, $fontAwesome_icon=null, $color=null, $confirmation = false)
+    public function addActionButton($label, $url_target, $condition_callback = null, $fontAwesome_icon = null, $color = null, $confirmation = false)
     {
         $new = new AddActionButtonModel();
         $new->setLabel($label);
-        $new->setIcon($fontAwesome_icon?:"fa fa-bars");
-        $new->setColor($color?:"primary");
+        $new->setIcon($fontAwesome_icon ?: "fa fa-bars");
+        $new->setColor($color ?: "primary");
         $new->setUrl($url_target);
         $new->setCondition($condition_callback);
         $new->setConfirmation($confirmation);

src/routes.php

Spacing +32 added lines, -32 removed lines

@@ -1,59 +1,59 @@ 
 <?php
 
 // Developer Backend Middleware
-Route::group(['middleware' => ['web',\crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
+Route::group(['middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
     'prefix'=>"developer/".getSetting('developer_path'),
-    'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
+    'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
     cb()->routeController("modules", "\crocodicstudio\crudbooster\controllers\DeveloperModulesController");
     cb()->routeController("menus", "\crocodicstudio\crudbooster\controllers\DeveloperMenusController");
-    cb()->routeController("roles","\crocodicstudio\crudbooster\controllers\DeveloperRolesController");
-    cb()->routeController("users","\crocodicstudio\crudbooster\controllers\DeveloperUsersController");
-    cb()->routeController("plugins","\crocodicstudio\crudbooster\controllers\DeveloperPluginStoreController");
-    cb()->routeController("mail","\crocodicstudio\crudbooster\controllers\DeveloperMailController");
-    cb()->routeController("security","\crocodicstudio\crudbooster\controllers\DeveloperSecurityController");
-    cb()->routeController("themes","\crocodicstudio\crudbooster\controllers\DeveloperThemesController");
-    cb()->routeController("appearance","\crocodicstudio\crudbooster\controllers\DeveloperAppearanceController");
-    cb()->routeController("miscellaneous","\crocodicstudio\crudbooster\controllers\DeveloperMiscellaneousController");
-    cb()->routePost("skip-tutorial","DeveloperDashboardController@postSkipTutorial");
-    cb()->routeGet("/","DeveloperDashboardController@getIndex");
+    cb()->routeController("roles", "\crocodicstudio\crudbooster\controllers\DeveloperRolesController");
+    cb()->routeController("users", "\crocodicstudio\crudbooster\controllers\DeveloperUsersController");
+    cb()->routeController("plugins", "\crocodicstudio\crudbooster\controllers\DeveloperPluginStoreController");
+    cb()->routeController("mail", "\crocodicstudio\crudbooster\controllers\DeveloperMailController");
+    cb()->routeController("security", "\crocodicstudio\crudbooster\controllers\DeveloperSecurityController");
+    cb()->routeController("themes", "\crocodicstudio\crudbooster\controllers\DeveloperThemesController");
+    cb()->routeController("appearance", "\crocodicstudio\crudbooster\controllers\DeveloperAppearanceController");
+    cb()->routeController("miscellaneous", "\crocodicstudio\crudbooster\controllers\DeveloperMiscellaneousController");
+    cb()->routePost("skip-tutorial", "DeveloperDashboardController@postSkipTutorial");
+    cb()->routeGet("/", "DeveloperDashboardController@getIndex");
 });
 
 // Developer Auth Middleware
 Route::group(['middleware' => ['web'],
     'prefix'=>"developer/".getSetting('developer_path'),
-    'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
-    cb()->routePost("login","AdminAuthController@postLoginDeveloper");
-    cb()->routeGet("login","AdminAuthController@getLoginDeveloper");
-    cb()->routeGet("logout","AdminAuthController@getLogoutDeveloper");
+    'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
+    cb()->routePost("login", "AdminAuthController@postLoginDeveloper");
+    cb()->routeGet("login", "AdminAuthController@getLoginDeveloper");
+    cb()->routeGet("logout", "AdminAuthController@getLogoutDeveloper");
 });
 
 // Routing without any middleware
-Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function () {
-    if(getSetting("AUTO_REDIRECT_TO_LOGIN")) {
-        cb()->routeGet("/","AdminAuthController@getRedirectToLogin");
+Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function() {
+    if (getSetting("AUTO_REDIRECT_TO_LOGIN")) {
+        cb()->routeGet("/", "AdminAuthController@getRedirectToLogin");
     }
 });
 
 // Routing without any middleware with admin prefix
-Route::group(['middleware' => ['web'], 'prefix' => cb()->getAdminPath(), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
+Route::group(['middleware' => ['web'], 'prefix' => cb()->getAdminPath(), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
     cb()->routeGet('logout', "AdminAuthController@getLogout");
 
-    if(!getSetting("DISABLE_LOGIN")) {
+    if (!getSetting("DISABLE_LOGIN")) {
         cb()->routePost('login', "AdminAuthController@postLogin");
         cb()->routeGet('login', "AdminAuthController@getLogin");
     }
 
-    if(getSetting("enable_forget")) {
-        cb()->routePost("forget","AdminAuthController@postForget");
+    if (getSetting("enable_forget")) {
+        cb()->routePost("forget", "AdminAuthController@postForget");
     }
 
-    if(getSetting("enable_register")) {
-        cb()->routePost("register","AdminAuthController@postRegister");
+    if (getSetting("enable_register")) {
+        cb()->routePost("register", "AdminAuthController@postRegister");
     }
 });
 
 // Routing package controllers
-cb()->routeGroupBackend(function () {
+cb()->routeGroupBackend(function() {
     cb()->routeController('profile', '\crocodicstudio\crudbooster\controllers\AdminProfileController');
 });
 
@@ -62,24 +62,24 @@ 
     'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBBackend::class],
     'prefix' => cb()->getAdminPath(),
     'namespace' => 'App\Http\Controllers',
-], function () {
+], function() {
 
     if (Request::is(cb()->getAdminPath())) {
-        if($dashboard = getSetting("dashboard_controller")) {
+        if ($dashboard = getSetting("dashboard_controller")) {
             cb()->routeGet("/", $dashboard."@getIndex");
-        }else{
+        } else {
             cb()->routeGet("/", "\crocodicstudio\crudbooster\controllers\AdminDashboardController@getIndex");
         }
     }
 
     $controllers = glob(app_path('Http/Controllers/Admin*Controller.php'));
 
-    foreach($controllers as $controller) {
+    foreach ($controllers as $controller) {
         $controllerName = basename($controller);
-        $controllerName = rtrim($controllerName,".php");
+        $controllerName = rtrim($controllerName, ".php");
         $className = '\App\Http\Controllers\\'.$controllerName;
         $controllerClass = new $className();
-        if(method_exists($controllerClass, 'cbInit')) {
+        if (method_exists($controllerClass, 'cbInit')) {
             cb()->routeController($controllerClass->getData('permalink'), $controllerName);
         }
     }

Braces +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
     if (Request::is(cb()->getAdminPath())) {
         if($dashboard = getSetting("dashboard_controller")) {
             cb()->routeGet("/", $dashboard."@getIndex");
-        }else{
+        } else{
             cb()->routeGet("/", "\crocodicstudio\crudbooster\controllers\AdminDashboardController@getIndex");
         }
     }