crocodic-studio / crudbooster

src/controllers/DeveloperModulesController.php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
     public function getIndex() {
         $data = [];
         $data['result'] = DB::table("cb_modules")->get();
-        return view($this->view.'.index',$data);
+        return view($this->view.'.index', $data);
     }
 
     public function getAdd() {
@@ -32,11 +32,11 @@ 
 
     public function postAddSave() {
         try {
-            cb()->validation(['name', 'table','icon']);
+            cb()->validation(['name', 'table', 'icon']);
 
             (new ModuleGenerator(request('table'), request('name'), request('icon')))->make();
 
-            return cb()->redirect(action("DeveloperModulesController@getIndex"),"New module has been created!","success");
+            return cb()->redirect(action("DeveloperModulesController@getIndex"), "New module has been created!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -53,9 +53,9 @@ 
         try {
             cb()->validation(['name', 'icon']);
 
-            cb()->updateCompact("cb_modules", $id, ['name','icon']);
+            cb()->updateCompact("cb_modules", $id, ['name', 'icon']);
 
-            return cb()->redirect(action("DeveloperModulesController@getIndex"),"Module has been updated!","success");
+            return cb()->redirect(action("DeveloperModulesController@getIndex"), "Module has been updated!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -63,12 +63,12 @@ 
     }
 
     public function getDelete($id) {
-        $module = cb()->find("cb_modules",$id);
+        $module = cb()->find("cb_modules", $id);
         @unlink(app_path("Http/Controllers/".$module->controller));
         DB::table("cb_modules")->where("id", $id)->delete();
         DB::table("cb_menus")->where("cb_modules_id", $id)->delete();
 
-        return cb()->redirectBack("The module has been deleted!","success");
+        return cb()->redirectBack("The module has been deleted!", "success");
     }
 
 }
\ No newline at end of file

src/controllers/AdminProfileController.php

Spacing +6 added lines, -6 removed lines

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

Braces +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
                 $data['photo'] = cb()->uploadFile('photo', true, 200, 200);
             }
             DB::table("users")->where("id", auth()->id())->update($data);
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             Log::error($e);
             return cb()->redirectBack("Something went wrong!","warning");
         }

src/controllers/AdminAuthController.php

Spacing +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(getAdminURL());
+        if (!auth()->guest()) return redirect(getAdminURL());
 
         cbHook()->hookGetLogin();
 
@@ -16,20 +16,20 @@ 
 
     public function postLogin()
     {
-        try{
+        try {
             cb()->validation([
                 'email'=>'required|email',
                 'password'=>'required'
             ]);
-            $credential = request()->only(['email','password']);
+            $credential = request()->only(['email', 'password']);
             if (auth()->attempt($credential)) {
                 cbHook()->hookPostLogin();
                 return redirect(getAdminURL());
             } else {
-                return redirect(getAdminLoginURL())->with(['message'=>__('crudbooster.alert_password_wrong'),'message_type'=>'warning']);
+                return redirect(getAdminLoginURL())->with(['message'=>__('crudbooster.alert_password_wrong'), 'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
-            return cb()->redirect(getAdminLoginURL(),$e->getMessage(),'warning');
+        } catch (CBValidationException $e) {
+            return cb()->redirect(getAdminLoginURL(), $e->getMessage(), 'warning');
         }
     }
 
@@ -44,25 +44,25 @@ 
     }
 
     public function postLoginDeveloper() {
-        try{
+        try {
             cb()->validation([
                 'username'=>'required',
                 'password'=>'required'
             ]);
 
-            if(request('username') == config('crudbooster.DEV_USERNAME')
+            if (request('username') == config('crudbooster.DEV_USERNAME')
                 && request('password') == config('crudbooster.DEV_PASSWORD')) {
 
                 session(['developer'=>1]);
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
+            } else {
                 return cb()->redirectBack("Username and or password is wrong!");
             }
 
-        }catch (CBValidationException $e) {
-            return cb()->redirect(getAdminLoginURL(),$e->getMessage(),'warning');
+        } catch (CBValidationException $e) {
+            return cb()->redirect(getAdminLoginURL(), $e->getMessage(), 'warning');
         }
     }
 

Braces +6 added lines, -4 removed lines

@@ -7,7 +7,9 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(getAdminURL());
+        if(!auth()->guest()) {
+            return redirect(getAdminURL());
+        }
 
         cbHook()->hookGetLogin();
 
@@ -28,7 +30,7 @@ 
             } else {
                 return redirect(getAdminLoginURL())->with(['message'=>__('crudbooster.alert_password_wrong'),'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(getAdminLoginURL(),$e->getMessage(),'warning');
         }
     }
@@ -57,11 +59,11 @@ 
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
+            } else{
                 return cb()->redirectBack("Username and or password is wrong!");
             }
 
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(getAdminLoginURL(),$e->getMessage(),'warning');
         }
     }

src/helpers/Module.php

Spacing +41 added lines, -41 removed lines

@@ -26,9 +26,9 @@ 
         $this->controller = class_basename($routeArray['controller']);
         $this->controller_class = new ("\App\Http\Controllers\\".$this->controller)();
 
-        $this->module = cb()->find("cb_modules",["controller"=>$this->controller]);
-        $this->menu = cb()->find("cb_menus",["cb_modules_id"=>$this->module->id]);
-        $this->menu = (!$this->menu)?cb()->find("cb_menus",["type"=>"path","path"=>request()->segment(2)]):$this->menu;
+        $this->module = cb()->find("cb_modules", ["controller"=>$this->controller]);
+        $this->menu = cb()->find("cb_menus", ["cb_modules_id"=>$this->module->id]);
+        $this->menu = (!$this->menu) ?cb()->find("cb_menus", ["type"=>"path", "path"=>request()->segment(2)]) : $this->menu;
         $this->privilege = DB::table("cb_role_privileges")
             ->where("cb_menus_id", $this->menu->id)
             ->where("cb_roles_id", cb()->session()->roleId())
@@ -45,7 +45,7 @@ 
 
     public function getPageTitle()
     {
-        return $this->controller_class->getData("page_title")?:env('APP_NAME');
+        return $this->controller_class->getData("page_title") ?: env('APP_NAME');
     }
 
     public function getTable()
@@ -55,113 +55,113 @@ 
 
     public function getIcon()
     {
-        return $this->controller_class->getData('icon')?:"fa fa-bars";
+        return $this->controller_class->getData('icon') ?: "fa fa-bars";
     }
 
     public function canBrowse() {
-        if($this->privilege) {
-            if($this->privilege->can_browse) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_browse) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canCreate() {
-        if($this->privilege) {
-            if($this->privilege->can_create) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_create) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canRead() {
-        if($this->privilege) {
-            if($this->privilege->can_read) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_read) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canUpdate() {
-        if($this->privilege) {
-            if($this->privilege->can_update) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_update) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canDelete() {
-        if($this->privilege) {
-            if($this->privilege->can_delete) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_delete) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function addURL()
     {
-        if(method_exists($this->controller_class, 'getAdd')) {
+        if (method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else {
             return null;
         }
     }
 
     public function addSaveURL()
     {
-        if(method_exists($this->controller_class, 'postAddSave')) {
+        if (method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else {
             return null;
         }
     }
 
     public function editURL($id = null)
     {
-        if(method_exists($this->controller_class, 'getEdit')) {
-            return action($this->controller.'@getEdit',['id'=>$id]);
-        }else{
+        if (method_exists($this->controller_class, 'getEdit')) {
+            return action($this->controller.'@getEdit', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
     public function editSaveURL($id = null)
     {
-        if(method_exists($this->controller_class, 'postEditSave')) {
-            return action($this->controller.'@postEditSave',['id'=>$id]);
-        }else{
+        if (method_exists($this->controller_class, 'postEditSave')) {
+            return action($this->controller.'@postEditSave', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
-    public function detailURL($id=null)
+    public function detailURL($id = null)
     {
-        if(method_exists($this->controller_class, 'getDetail')) {
-            return action($this->controller.'@getDetail',['id'=>$id]);
-        }else{
+        if (method_exists($this->controller_class, 'getDetail')) {
+            return action($this->controller.'@getDetail', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
-    public function deleteURL($id=null)
+    public function deleteURL($id = null)
     {
-        if(method_exists($this->controller_class, 'getDelete')) {
-            return action($this->controller.'@getDelete',['id'=>$id]);
-        }else{
+        if (method_exists($this->controller_class, 'getDelete')) {
+            return action($this->controller.'@getDelete', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
     public function url($path = null)
     {
-        if(method_exists($this->controller_class, 'getIndex')) {
-            return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        if (method_exists($this->controller_class, 'getIndex')) {
+            return trim(action($this->controller.'@getIndex').'/'.$path, '/');
+        } else {
             return null;
         }
     }

Braces +37 added lines, -22 removed lines

@@ -60,45 +60,60 @@ 
 
     public function canBrowse() {
         if($this->privilege) {
-            if($this->privilege->can_browse) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_browse) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canCreate() {
         if($this->privilege) {
-            if($this->privilege->can_create) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_create) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canRead() {
         if($this->privilege) {
-            if($this->privilege->can_read) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_read) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canUpdate() {
         if($this->privilege) {
-            if($this->privilege->can_update) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_update) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canDelete() {
         if($this->privilege) {
-            if($this->privilege->can_delete) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_delete) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
@@ -107,7 +122,7 @@ 
     {
         if(method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else{
             return null;
         }
     }
@@ -116,7 +131,7 @@ 
     {
         if(method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else{
             return null;
         }
     }
@@ -125,7 +140,7 @@ 
     {
         if(method_exists($this->controller_class, 'getEdit')) {
             return action($this->controller.'@getEdit',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -134,7 +149,7 @@ 
     {
         if(method_exists($this->controller_class, 'postEditSave')) {
             return action($this->controller.'@postEditSave',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -143,7 +158,7 @@ 
     {
         if(method_exists($this->controller_class, 'getDetail')) {
             return action($this->controller.'@getDetail',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -152,7 +167,7 @@ 
     {
         if(method_exists($this->controller_class, 'getDelete')) {
             return action($this->controller.'@getDelete',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -161,7 +176,7 @@ 
     {
         if(method_exists($this->controller_class, 'getIndex')) {
             return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        } else{
             return null;
         }
     }

src/helpers/UserSession.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php 
 namespace crocodicstudio\crudbooster\helpers;
 
-class UserSession  {
+class UserSession {
 
     public function user()
     {
@@ -21,14 +21,14 @@ 
     public function photo()
     {
         $user = $this->user();
-        return ($user->photo)?asset($user->photo):asset(dummyPhoto());
+        return ($user->photo) ?asset($user->photo) : asset(dummyPhoto());
     }
 
     public function roleName()
     {
         $user = $this->user();
         $role = cb()->find("cb_roles", $user->roles_id);
-        if($role) return $role->name;
+        if ($role) return $role->name;
         else return null;
     }
 

Braces +5 added lines, -2 removed lines

@@ -28,8 +28,11 @@
     {
         $user = $this->user();
         $role = cb()->find("cb_roles", $user->roles_id);
-        if($role) return $role->name;
-        else return null;
+        if($role) {
+            return $role->name;
+        } else {
+            return null;
+        }
     }
 
     public function roleId()

src/helpers/Helper.php

Indentation +45 added lines, -45 removed lines

@@ -118,49 +118,49 @@ 
 }
 
 if(!function_exists('assetThumbnail')) {
-	function assetThumbnail($path) {
-		$path = str_replace('uploads/','uploads_thumbnail/',$path);
-		return asset($path);
-	}
+    function assetThumbnail($path) {
+        $path = str_replace('uploads/','uploads_thumbnail/',$path);
+        return asset($path);
+    }
 }
 
 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)) {
-	        return asset($newLocation);
-	    }else{
-	        $img = Image::make(storage_path($path))->fit($width,$height);
-	        $img->save(storage_path($newLocation),$quality);
-	        return asset($newLocation);
-	    }
-	}
+    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)) {
+            return asset($newLocation);
+        }else{
+            $img = Image::make(storage_path($path))->fit($width,$height);
+            $img->save(storage_path($newLocation),$quality);
+            return asset($newLocation);
+        }
+    }
 }
 
 if(!function_exists('extract_unit')) {	
-	/*
+    /*
 	Credits: Bit Repository
 	URL: http://www.bitrepository.com/extract-content-between-two-delimiters-with-php.html
 	*/
-	function extract_unit($string, $start, $end)
-	{
-	$pos = stripos($string, $start);
-	$str = substr($string, $pos);
-	$str_two = substr($str, strlen($start));
-	$second_pos = stripos($str_two, $end);
-	$str_three = substr($str_two, 0, $second_pos);
-	$unit = trim($str_three); // remove whitespaces
-	return $unit;
-	}
+    function extract_unit($string, $start, $end)
+    {
+    $pos = stripos($string, $start);
+    $str = substr($string, $pos);
+    $str_two = substr($str, strlen($start));
+    $second_pos = stripos($str_two, $end);
+    $str_three = substr($str_two, 0, $second_pos);
+    $unit = trim($str_three); // remove whitespaces
+    return $unit;
+    }
 }
 
 
 if(!function_exists('now')) {
-	function now() {		
-		return date('Y-m-d H:i:s');
-	}
+    function now() {		
+        return date('Y-m-d H:i:s');
+    }
 }
 
 /* 
@@ -324,22 +324,22 @@ 
 }
 
 if(!function_exists('rrmdir')) {
-	/*
+    /*
 	* http://stackoverflow.com/questions/3338123/how-do-i-recursively-delete-a-directory-and-its-entire-contents-files-sub-dir
 	*/
-	function rrmdir($dir) { 
-	   if (is_dir($dir)) { 
-	     $objects = scandir($dir); 
-	     foreach ($objects as $object) { 
-	       if ($object != "." && $object != "..") { 
-	         if (is_dir($dir."/".$object))
-	           rrmdir($dir."/".$object);
-	         else
-	           unlink($dir."/".$object); 
-	       } 
-	     }
-	     rmdir($dir); 
-	   } 
-	 }
+    function rrmdir($dir) { 
+        if (is_dir($dir)) { 
+            $objects = scandir($dir); 
+            foreach ($objects as $object) { 
+            if ($object != "." && $object != "..") { 
+                if (is_dir($dir."/".$object))
+                rrmdir($dir."/".$object);
+                else
+                unlink($dir."/".$object); 
+            } 
+            }
+            rmdir($dir); 
+        } 
+        }
 }
 

Spacing +56 added lines, -56 removed lines

@@ -9,13 +9,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
      */
@@ -24,7 +24,7 @@ 
     }
 }
 
-if(!function_exists('cbHook'))
+if (!function_exists('cbHook'))
 {
     /**
      * @return crocodicstudio\crudbooster\hooks\CBHook
@@ -35,7 +35,7 @@ 
     }
 }
 
-if(!function_exists('getTypeHook'))
+if (!function_exists('getTypeHook'))
 {
     /**
      * @param string $type
@@ -47,7 +47,7 @@ 
     }
 }
 
-if(!function_exists('getPrimaryKey'))
+if (!function_exists('getPrimaryKey'))
 {
     function getPrimaryKey($table_name)
     {
@@ -55,7 +55,7 @@ 
     }
 }
 
-if(!function_exists('cb'))
+if (!function_exists('cb'))
 {
     function cb()
     {
@@ -63,25 +63,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();
@@ -89,57 +89,57 @@ 
     }
 }
 
-if(!function_exists('getAdminLoginURL')) {
+if (!function_exists('getAdminLoginURL')) {
     function getAdminLoginURL()
     {
         return url(config('crudbooster.ADMIN_LOGIN_PATH'));
     }
 }
 
-if(!function_exists('getAdminPath')) {
-    function getAdminURL($path=null)
+if (!function_exists('getAdminPath')) {
+    function getAdminURL($path = null)
     {
-        return trim(url(config('crudbooster.ADMIN_PATH').'/'.$path),'/');
+        return trim(url(config('crudbooster.ADMIN_PATH').'/'.$path), '/');
     }
 }
 
-if(!function_exists('getAdminPath')) {
-    function getAdminPath($path=null)
+if (!function_exists('getAdminPath')) {
+    function getAdminPath($path = null)
     {
         return config('crudbooster.ADMIN_PATH');
     }
 }
 
-if(!function_exists('dummyPhoto')) {
+if (!function_exists('dummyPhoto')) {
     function dummyPhoto()
     {
         return config('crudbooster.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
@@ -157,7 +157,7 @@ 
 }
 
 
-if(!function_exists('now')) {
+if (!function_exists('now')) {
 	function now() {		
 		return date('Y-m-d H:i:s');
 	}
@@ -171,13 +171,13 @@ 
 |
 */
 
-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 = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
@@ -188,25 +188,25 @@ 
     }
 }
 
-if(!function_exists('getSetting')) {
+if (!function_exists('getSetting')) {
     function getSetting($key, $default = null)
     {
-        if(file_exists(storage_path('.cbconfig'))) {
+        if (file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
-        if(isset($settings[$key])) {
-            return $settings[$key]?:$default;
-        }else{
+        if (isset($settings[$key])) {
+            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');
@@ -237,7 +237,7 @@ 
             }
         }
 
-        if (! $full) {
+        if (!$full) {
             $string = array_slice($string, 0, 1);
         }
 
@@ -245,22 +245,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)
     {
@@ -272,7 +272,7 @@ 
     }
 }
 
-if(!function_exists("requestAll")) {
+if (!function_exists("requestAll")) {
     function requestAll() {
         $all = array_map_r("sanitizeXSS", request()->all());
         return $all;
@@ -281,22 +281,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) {
@@ -305,25 +305,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
 	*/

Braces +18 added lines, -15 removed lines

@@ -131,7 +131,7 @@ 
 	    $newLocation = $pathWithoutName.'/w_'.$width.'_h_'.$height.'_'.$basename;
 	    if(Storage::exists($newLocation)) {
 	        return asset($newLocation);
-	    }else{
+	    } else{
 	        $img = Image::make(storage_path($path))->fit($width,$height);
 	        $img->save(storage_path($newLocation),$quality);
 	        return asset($newLocation);
@@ -177,7 +177,7 @@ 
         if(file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = unserialize($settings);
-        }else{
+        } else{
             $settings = [];
         }
 
@@ -194,13 +194,13 @@ 
         if(file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = unserialize($settings);
-        }else{
+        } else{
             $settings = [];
         }
 
         if(isset($settings[$key])) {
             return $settings[$key]?:$default;
-        }else{
+        } else{
             return $default;
         }
     }
@@ -286,7 +286,7 @@ 
         $url = request($name);
         if(filter_var($url, FILTER_VALIDATE_URL)) {
             return $url;
-        }else{
+        } else{
             return request()->url();
         }
     }
@@ -298,14 +298,14 @@ 
             $response = request($name);
             if(is_string($response)) {
                 $response = sanitizeXSS($response);
-            }elseif (is_array($response)) {
+            } elseif (is_array($response)) {
                 array_walk_recursive($response, function(&$response) {
                     $response = sanitizeXSS($response);
                 });
             }
 
             return $response;
-        }else{
+        } else{
             return Request::get($name);
         }
     }
@@ -315,11 +315,13 @@ 
     function min_var_export($input) {
         if(is_array($input)) {
             $buffer = [];
-            foreach($input as $key => $value)
-                $buffer[] = var_export($key, true)."=>".min_var_export($value);
+            foreach($input as $key => $value) {
+                            $buffer[] = var_export($key, true)."=>".min_var_export($value);
+            }
             return "[".implode(",",$buffer)."]";
-        } else
-            return var_export($input, true);
+        } else {
+                    return var_export($input, true);
+        }
     }
 }
 
@@ -332,10 +334,11 @@ 
 	     $objects = scandir($dir); 
 	     foreach ($objects as $object) { 
 	       if ($object != "." && $object != "..") { 
-	         if (is_dir($dir."/".$object))
-	           rrmdir($dir."/".$object);
-	         else
-	           unlink($dir."/".$object); 
+	         if (is_dir($dir."/".$object)) {
+	         	           rrmdir($dir."/".$object);
+	         } else {
+	         	           unlink($dir."/".$object);
+	         }
 	       } 
 	     }
 	     rmdir($dir); 

src/helpers/ModuleGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         $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
         $template = str_replace("{permalink}", '"'.$this->table.'"', $template);
@@ -51,7 +51,7 @@ 
         //Replace scaffolding
         $fields = DB::getSchemaBuilder()->getColumnListing();
         $scaffold = "";
-        foreach($fields as $field) {
+        foreach ($fields as $field) {
             $scaffold .= '$this->addText("'.$field.'");'."\n";
         }
         $template = str_replace("{scaffolding}", $scaffold, $template);
@@ -62,7 +62,7 @@ 
 
         //Save to database
         $module = [];
-        $module['name'] = ($this->name)?:ucwords(str_replace("_"," ",$this->table));
+        $module['name'] = ($this->name) ?: ucwords(str_replace("_", " ", $this->table));
         $module['icon'] = $this->icon;
         $module['table_name'] = $this->table;
         $module['controller'] = $filename;

src/helpers/MailHelper.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     }
 
     public function send() {
-        Mail::send("crudbooster::emails.blank", ['content' => $this->content], function ($message) {
+        Mail::send("crudbooster::emails.blank", ['content' => $this->content], function($message) {
             $message->priority(1);
             $message->to($this->to_email);
             $message->from($this->sender_email, $this->sender_name);

src/helpers/SidebarMenus.php

Spacing +15 added lines, -15 removed lines

@@ -21,7 +21,7 @@ 
     private function assignToModel($menu) {
         $model = new SidebarModel();
         $model->setId($menu->id);
-        if($menu->type == "url") {
+        if ($menu->type == "url") {
             $model->setUrl($menu->path);
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
@@ -45,22 +45,22 @@ 
 
     private function loadData($parent_id = null) {
         $menus = DB::table("cb_menus");
-        if($parent_id) {
-            $menus->where("parent_cb_menus_id",$parent_id);
-        }else{
+        if ($parent_id) {
+            $menus->where("parent_cb_menus_id", $parent_id);
+        } else {
             $menus->whereNull("parent_cb_menus_id");
         }
-        return $menus->orderBy("sort_number","asc")->get();
+        return $menus->orderBy("sort_number", "asc")->get();
     }
 
     private function rolePrivilege($cb_roles_id, $cb_menus_id) {
-        return cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id]);
+        return cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id]);
     }
 
-    private function checkPrivilege($roles_id,$menu) {
-        if($roles_id) {
+    private function checkPrivilege($roles_id, $menu) {
+        if ($roles_id) {
             $privilege = $this->rolePrivilege($roles_id, $menu->id);
-            if(!$privilege->can_browse) {
+            if (!$privilege->can_browse) {
                 return false;
             }
         }
@@ -72,23 +72,23 @@ 
         $roles_id = cb()->session()->roleId();
         $menus = $this->loadData();
         $result = [];
-        foreach($menus as $menu) {
+        foreach ($menus as $menu) {
 
-            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
+            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
 
             $sidebarModel = $this->assignToModel($menu);
-            if($menus2 = $this->loadData($menu->id)) {
+            if ($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 foreach ($menus2 as $menu2) {
 
-                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
+                    if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
 
                     $sidebarModel2 = $this->assignToModel($menu2);
-                    if($menus3 = $this->loadData($menu2->id)) {
+                    if ($menus3 = $this->loadData($menu2->id)) {
                         $sub2 = [];
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
 
                             $sidebarModel3 = $this->assignToModel($menu3);
                             $sub2[] = $sidebarModel3;

Braces +12 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
             $model->setBasepath(basename($model->getUrl()));
-        }elseif ($menu->type == "module") {
+        } elseif ($menu->type == "module") {
             $module = cb()->find("cb_modules", $menu->cb_modules_id);
             $controllerClass = new ('\App\Http\Controllers\\'.$module->controller)();
             /** @var CBController $controllerClass */
@@ -34,7 +34,7 @@ 
             $model->setIcon($module->icon);
             $model->setName($module->name);
             $model->setBasepath(basename($model->getUrl()));
-        }elseif ($menu->type == "path") {
+        } elseif ($menu->type == "path") {
             $model->setUrl(cb()->getAdminUrl($menu->path));
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
@@ -47,7 +47,7 @@ 
         $menus = DB::table("cb_menus");
         if($parent_id) {
             $menus->where("parent_cb_menus_id",$parent_id);
-        }else{
+        } else{
             $menus->whereNull("parent_cb_menus_id");
         }
         return $menus->orderBy("sort_number","asc")->get();
@@ -74,21 +74,27 @@ 
         $result = [];
         foreach($menus as $menu) {
 
-            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
+            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) {
+                continue;
+            }
 
             $sidebarModel = $this->assignToModel($menu);
             if($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 foreach ($menus2 as $menu2) {
 
-                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
+                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) {
+                        continue;
+                    }
 
                     $sidebarModel2 = $this->assignToModel($menu2);
                     if($menus3 = $this->loadData($menu2->id)) {
                         $sub2 = [];
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) {
+                                continue;
+                            }
 
                             $sidebarModel3 = $this->assignToModel($menu3);
                             $sub2[] = $sidebarModel3;