crocodic-studio / crudbooster

src/controllers/ForgetController.php

Spacing +11 added lines, -11 removed lines

@@ -24,7 +24,7 @@ 
         try {
             cb()->validation(['email'=>'required|email']);
 
-            if($user = cb()->find("users",["email"=>request("email")])) {
+            if ($user = cb()->find("users", ["email"=>request("email")])) {
                 $token = Str::random(6);
                 $linkToken = cb()->getAdminUrl("continue-reset/".$token);
                 Cache::put("forget_".$token, $user->id, now()->addHours(12));
@@ -37,8 +37,8 @@ 
 
                 $mail = new MailHelper();
                 $mail->to($user->email);
-                $mail->sender(getSetting("forget_email_sender","noreply@".$_SERVER['SERVER_NAME']),cb()->getAppName());
-                $mail->content("Please Confirm Your Forgot Password","
+                $mail->sender(getSetting("forget_email_sender", "noreply@".$_SERVER['SERVER_NAME']), cb()->getAppName());
+                $mail->content("Please Confirm Your Forgot Password", "
                     Hi $user->name,<br/><br>
                     Someone with the detail bellow: <br/>
                     Time = ".now()->format("Y-m-d H:i:s")."<br/>
@@ -58,28 +58,28 @@ 
                 return cb()->redirectBack("Your email is not registered");
             }
 
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
         } catch (\Exception $e) {
             Log::error($e);
             return cb()->redirectBack(cbLang("something_went_wrong"));
         }
 
-        return cb()->redirectBack("We've sent you an email instruction. Please follow the instruction inside the email","success");
+        return cb()->redirectBack("We've sent you an email instruction. Please follow the instruction inside the email", "success");
     }
 
     public function getContinueReset($token) {
-        if(Cache::has("forget_".$token)) {
+        if (Cache::has("forget_".$token)) {
             $id = Cache::get("forget_".$token);
             $newPassword = Str::random(6);
             cb()->update("users", $id, ["password"=>Hash::make($newPassword)]);
 
-            $user = cb()->find("users",$id);
+            $user = cb()->find("users", $id);
 
             $mail = new MailHelper();
             $mail->to($user->email);
-            $mail->sender(getSetting("forget_email_sender","noreply@".$_SERVER['SERVER_NAME']),cb()->getAppName());
-            $mail->content("This Is Your New Password","
+            $mail->sender(getSetting("forget_email_sender", "noreply@".$_SERVER['SERVER_NAME']), cb()->getAppName());
+            $mail->content("This Is Your New Password", "
                     Hi $user->name,<br/><br>
                     Thank you for confirming the request new password. Here is your new password: <br>
                     <h2>$newPassword</h2>
@@ -90,9 +90,9 @@ 
                 ");
             $mail->send();
 
-            return cb()->redirect(cb()->getAdminUrl("login"),"We've sent you new password email. Please check at your mail inbox or spambox","success");
+            return cb()->redirect(cb()->getAdminUrl("login"), "We've sent you new password email. Please check at your mail inbox or spambox", "success");
         } else {
-            return cb()->redirect(cb()->getAdminUrl("login"),"It looks like the url has been expired!");
+            return cb()->redirect(cb()->getAdminUrl("login"), "It looks like the url has been expired!");
         }
     }
 

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
                 return cb()->redirectBack("Your email is not registered");
             }
 
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
         } catch (\Exception $e) {
             Log::error($e);

src/controllers/SubModuleController.php

Spacing +5 added lines, -5 removed lines

@@ -14,16 +14,16 @@ 
 {
 
     public function getSubModule($subModuleKey) {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
-        if(!verifyReferalUrl()) return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
+        if (!verifyReferalUrl()) return cb()->redirect(module()->url(), "It looks like your url is incorrect");
 
-        if($subModule = Cache::get("subModule".$subModuleKey)) {
+        if ($subModule = Cache::get("subModule".$subModuleKey)) {
             $foreignKey = $subModule['foreignKey'];
             $foreignValue = $subModule['foreignValue'];
 
             $query = $this->repository();
             $query->where($foreignKey, $foreignValue);
-            $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") );
+            $result = $query->paginate(request("limit") ?: cbConfig("LIMIT_TABLE_DATA"));
             $data['result'] = $result;
 
             $data['additionalHeaderTitle'] = $subModule['parentTitle'];
@@ -33,7 +33,7 @@ 
             return view("crudbooster::module.index.index", array_merge($data, $this->data));
         }
 
-        return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        return cb()->redirect(module()->url(), "It looks like your url is incorrect");
     }
 
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -14,8 +14,12 @@
 {
 
     public function getSubModule($subModuleKey) {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
-        if(!verifyReferalUrl()) return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
+        if(!verifyReferalUrl()) {
+            return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        }
 
         if($subModule = Cache::get("subModule".$subModuleKey)) {
             $foreignKey = $subModule['foreignKey'];

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")?:cbConfig("LIMIT_TABLE_DATA") );
+        $result = $query->paginate(request("limit") ?: cbConfig("LIMIT_TABLE_DATA"));
         $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'], $id, $data);
             }
 
             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")?:cbConfig("LIMIT_TABLE_DATA") );
@@ -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/ColumnIntervention.php

Spacing +2 added lines, -2 removed lines

@@ -18,14 +18,14 @@
      */
     public function columnIntervention()
     {
-        if(request("sub_module") && Cache::has("subModule".request("sub_module")) && cb()->getCurrentMethod() != "getDetail") {
+        if (request("sub_module") && Cache::has("subModule".request("sub_module")) && cb()->getCurrentMethod() != "getDetail") {
             /*
              * If there is sub module, the column that has same name with foreign key should be remove
              * And change to hidden. So we can save the foreign Key id from the parent module.
              */
             $subModule = Cache::get("subModule".request("sub_module"));
             $this->removeColumn($subModule["foreignKey"])
-                ->addHidden($subModule["foreignKey"],$subModule['foreignKey'])
+                ->addHidden($subModule["foreignKey"], $subModule['foreignKey'])
                 ->defaultValue($subModule['foreignValue']);
         }
     }

src/controllers/traits/ControllerSetting.php

Indentation +15 added lines, -15 removed lines

@@ -202,13 +202,13 @@ 
         $parentPath = $this->getData("permalink");
         $parentTitle = $this->getData("page_title");
         $this->addActionButton($label,function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) {
-           $actionParameters = [
-               "label"=>$label,
-               "foreignKey"=>$foreignKey,
-               "foreignValue"=>$row->primary_key,
-               "parentPath"=>$parentPath,
-               "parentTitle"=>$parentTitle
-           ];
+            $actionParameters = [
+                "label"=>$label,
+                "foreignKey"=>$foreignKey,
+                "foreignValue"=>$row->primary_key,
+                "parentPath"=>$parentPath,
+                "parentTitle"=>$parentTitle
+            ];
 
             if(isset($additionalInfo) && is_callable($additionalInfo)) {
                 $additionalInfo = call_user_func($additionalInfo, $row);
@@ -217,15 +217,15 @@ 
                 }
             }
 
-           $actionHash = md5(serialize($actionParameters));
-           $actionHashToken = Cache::get("subModule".$actionHash);
-           if(!$actionHashToken) {
-               $actionHashToken = Str::random(5);
-               Cache::forever("subModule".$actionHash, $actionHashToken);
-               Cache::forever("subModule".$actionHashToken, $actionParameters);
-           }
+            $actionHash = md5(serialize($actionParameters));
+            $actionHashToken = Cache::get("subModule".$actionHash);
+            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);
 
     }

Spacing +15 added lines, -15 removed lines

@@ -32,11 +32,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 style(callable $style) {
@@ -140,9 +140,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);
@@ -201,7 +201,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,
@@ -210,22 +210,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);
 
     }
@@ -238,12 +238,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/controllers/traits/Validation.php

Spacing +2 added lines, -2 removed lines

@@ -19,12 +19,12 @@
      */
     private function validation()
     {
-        if(isset($this->data['validation'])) {
+        if (isset($this->data['validation'])) {
             $validator = Validator::make(request()->all(), @$this->data['validation'], @$this->data['validation_messages']);
             if ($validator->fails()) {
                 $message = $validator->messages();
                 $message_all = $message->all();
-                throw new CBValidationException(implode(', ',$message_all));
+                throw new CBValidationException(implode(', ', $message_all));
             }
         }
     }

src/helpers/MiscellanousSingleton.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
     public function hasData($key) {
         $data = $this->data;
-        if(isset($data[$key])) return true;
+        if (isset($data[$key])) return true;
         else return false;
     }
 

Braces +5 added lines, -2 removed lines

@@ -23,8 +23,11 @@
 
     public function hasData($key) {
         $data = $this->data;
-        if(isset($data[$key])) return true;
-        else return false;
+        if(isset($data[$key])) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     public function setData($key, $value): void

src/helpers/SchemaHelper.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
     public static function hasColumn($table, $column)
     {
         $columns = cb()->listAllColumns($table);
-        return in_array($column,$columns);
+        return in_array($column, $columns);
     }
 }
\ No newline at end of file

src/helpers/CB.php

Braces +26 added lines, -12 removed lines

@@ -100,14 +100,14 @@ 
             if($resize_width || $resize_height) {
                 $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height);
                 return $file_path.'/'.$filename;
-            }else{
+            } else{
                 if (Storage::putFileAs($file_path, $file, $filename, '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!");
         }
     }
@@ -129,10 +129,10 @@ 
                 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");
         }
     }
@@ -209,7 +209,7 @@ 
             }
 
             Storage::put($fullFilePath, $img, 'public');
-        }else{
+        } else{
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -233,7 +233,9 @@ 
     {
         if (is_array($id)) {
             $idHash = md5("find".$table.serialize($id));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $first = DB::table($table);
             foreach ($id as $k => $v) {
@@ -245,7 +247,9 @@ 
             return $data;
         } else {
             $idHash = md5("find".$table.$id);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $pk = $this->pk($table);
             $data = DB::table($table)->where($pk, $id)->first();
@@ -266,19 +270,25 @@ 
 
         if(is_array($conditionOrCallback)) {
             $idHash = md5("findAll".$table.serialize($conditionOrCallback));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $data = DB::table($table)->where($conditionOrCallback)->get();
         } elseif (is_callable($conditionOrCallback)) {
             $idHash = "findAll".$table.spl_object_hash($conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $data = DB::table($table);
             $data = call_user_func($conditionOrCallback, $data);
             $data = $data->get();
         } else {
             $idHash = md5("findAll".$table.$conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $data = DB::table($table);
             if($conditionOrCallback) {
@@ -297,7 +307,9 @@ 
     public function listAllTable()
     {
         $idHash = md5("listAllTable");
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if(miscellanousSingleton()->hasData($idHash)) {
+            return miscellanousSingleton()->getData($idHash);
+        }
         $data = DB::connection()->getDoctrineSchemaManager()->listTableNames();
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -306,7 +318,9 @@ 
     public function listAllColumns($table)
     {
         $idHash = md5("listAllColumns".$table);
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if(miscellanousSingleton()->hasData($idHash)) {
+            return miscellanousSingleton()->getData($idHash);
+        }
         $data = Schema::getColumnListing($table);
         miscellanousSingleton()->setData($idHash, $data);
         return $data;

Spacing +44 added lines, -44 removed lines

@@ -24,7 +24,7 @@ 
     }
 
     public function getRoleByName($roleName) {
-        return $this->find("cb_roles",['name'=>$roleName]);
+        return $this->find("cb_roles", ['name'=>$roleName]);
     }
 
     public function fcm() {
@@ -40,7 +40,7 @@ 
     }
 
     public function getDeveloperPath($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return "developer/".getSetting("developer_path").$path;
     }
 
@@ -61,16 +61,16 @@ 
     }
 
     public function getAdminPath() {
-        return getSetting("ADMIN_PATH","admin");
+        return getSetting("ADMIN_PATH", "admin");
     }
 
     public function getAdminUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url($this->getAdminPath()).$path;
     }
 
     public function getAppName() {
-        return getSetting("APP_NAME", env("APP_NAME","CRUDBOOSTER"));
+        return getSetting("APP_NAME", env("APP_NAME", "CRUDBOOSTER"));
     }
 
     /**
@@ -84,16 +84,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;
@@ -101,17 +101,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::putFileAs($file_path, $file, $filename, '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!");
         }
     }
@@ -127,16 +127,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");
         }
     }
@@ -156,7 +156,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);
             }
 
@@ -191,29 +191,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!");
         }
     }
@@ -237,7 +237,7 @@ 
     {
         if (is_array($id)) {
             $idHash = md5("find".$table.serialize($id));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $first = DB::table($table);
             foreach ($id as $k => $v) {
@@ -245,15 +245,15 @@ 
             }
 
             $data = $first->first();
-            miscellanousSingleton()->setData($idHash,$data);
+            miscellanousSingleton()->setData($idHash, $data);
             return $data;
         } else {
             $idHash = md5("find".$table.$id);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $pk = $this->pk($table);
             $data = DB::table($table)->where($pk, $id)->first();
-            miscellanousSingleton()->setData($idHash,$data);
+            miscellanousSingleton()->setData($idHash, $data);
             return $data;
         }
     }
@@ -268,30 +268,30 @@ 
         $data = [];
         $idHash = null;
 
-        if(is_array($conditionOrCallback)) {
+        if (is_array($conditionOrCallback)) {
             $idHash = md5("findAll".$table.serialize($conditionOrCallback));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table)->where($conditionOrCallback)->get();
         } elseif (is_callable($conditionOrCallback)) {
             $idHash = "findAll".$table.spl_object_hash($conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table);
             $data = call_user_func($conditionOrCallback, $data);
             $data = $data->get();
         } else {
             $idHash = md5("findAll".$table.$conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table);
-            if($conditionOrCallback) {
+            if ($conditionOrCallback) {
                 $data = $data->whereRaw($conditionOrCallback);
             }
             $data = $data->get();
         }
 
-        if($idHash && $data) {
+        if ($idHash && $data) {
             miscellanousSingleton()->setData($idHash, $data);
         }
 
@@ -301,7 +301,7 @@ 
     public function listAllTable()
     {
         $idHash = md5("listAllTable");
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
         $data = DB::connection()->getDoctrineSchemaManager()->listTableNames();
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -310,7 +310,7 @@ 
     public function listAllColumns($table)
     {
         $idHash = md5("listAllColumns".$table);
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
         $data = Schema::getColumnListing($table);
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -378,7 +378,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));
         }
     }
 
@@ -390,7 +390,7 @@ 
     public function findPrimaryKey($table)
     {
         $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-        if(!$pk) {
+        if (!$pk) {
             return null;
         }
         return $pk->getColumns()[0];
@@ -439,7 +439,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]));
@@ -456,16 +456,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]);
     }
 
@@ -498,7 +498,7 @@ 
 
         $prefix = trim($prefix, '/').'/';
 
-        if(substr($controller,0,1) != "\\") {
+        if (substr($controller, 0, 1) != "\\") {
             $controller = "\App\Http\Controllers\\".$controller;
         }