crocodic-studio / crudbooster

src/routes.php

Spacing +23 added lines, -23 removed lines

@@ -1,46 +1,46 @@ 
 <?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()->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()->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 () {
+Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function() {
     cb()->routeGet('uploads/{one?}/{two?}/{three?}/{four?}/{five?}', "FileController@getPreview");
 });
 
 // Routing without any middleware with admin prefix
-Route::group(['middleware' => ['web'], 'prefix' => cbConfig('ADMIN_PATH'), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
+Route::group(['middleware' => ['web'], 'prefix' => cbConfig('ADMIN_PATH'), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
     cb()->routeGet('logout', "AdminAuthController@getLogout");
 
-    if(!env("CB_DISABLE_LOGIN")) {
+    if (!env("CB_DISABLE_LOGIN")) {
         cb()->routePost('login', "AdminAuthController@postLogin");
         cb()->routeGet('login', "AdminAuthController@getLogin");
     }
 });
 
 // Routing package controllers
-cb()->routeGroupBackend(function () {
+cb()->routeGroupBackend(function() {
     cb()->routeController('profile', '\crocodicstudio\crudbooster\controllers\AdminProfileController');
 });
 
@@ -49,24 +49,24 @@ 
     'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBBackend::class],
     'prefix' => cbConfig('ADMIN_PATH'),
     'namespace' => 'App\Http\Controllers',
-], function () {
+], function() {
 
     if (Request::is(cbConfig('ADMIN_PATH'))) {
-        if($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) {
+        if ($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) {
             cb()->routeGet("/", $dashboard);
-        }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);
         }
     }

src/controllers/DeveloperMailController.php

Spacing +2 added lines, -2 removed lines

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

src/controllers/AdminProfileController.php

Spacing +7 added lines, -7 removed lines

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

Braces +1 added lines, -1 removed lines

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

src/controllers/DeveloperSecurityController.php

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
 
     public function getIndex() {
         $data = [];
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function postSave()
@@ -38,15 +38,15 @@ 
             "CB_AUTO_REDIRECT_TO_LOGIN"=>request("CB_AUTO_REDIRECT_TO_LOGIN")
         ]);
 
-        if(request("htaccess_ServerSignature")) {
+        if (request("htaccess_ServerSignature")) {
             putHtaccess("ServerSignature Off");
         }
 
-        if(request("htaccess_IndexIgnore")) {
+        if (request("htaccess_IndexIgnore")) {
             putHtaccess("IndexIgnore *");
         }
 
-        if(request("htaccess_dotAccess")) {
+        if (request("htaccess_dotAccess")) {
 putHtaccess("
 <FilesMatch \"^\.\">
 Order allow,deny
@@ -54,11 +54,11 @@ 
 </FilesMatch>");
         }
 
-        if(request("htaccess_preventVendor")) {
+        if (request("htaccess_preventVendor")) {
             putHtaccess("RewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]");
         }
 
 
-        return cb()->redirectBack("Security has been updated!","success");
+        return cb()->redirectBack("Security has been updated!", "success");
     }
 }
\ No newline at end of file

src/controllers/DeveloperAuthController.php

Spacing +6 added lines, -6 removed lines

@@ -19,25 +19,25 @@
     }
 
     public function postLoginDeveloper() {
-        try{
+        try {
             cb()->validation([
                 'username'=>'required',
                 'password'=>'required'
             ]);
 
-            if(request('username') == getSetting('developer_username')
+            if (request('username') == getSetting('developer_username')
                 && request('password') == getSetting("developer_password")) {
 
                 session(['developer'=>getSetting('developer_username')]);
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
-                return cb()->redirectBack( cbLang("password_and_username_is_wrong"));
+            } else {
+                return cb()->redirectBack(cbLang("password_and_username_is_wrong"));
             }
 
-        }catch (CBValidationException $e) {
-            return cb()->redirect(cb()->getLoginUrl(),$e->getMessage(),'warning');
+        } catch (CBValidationException $e) {
+            return cb()->redirect(cb()->getLoginUrl(), $e->getMessage(), 'warning');
         }
     }
 

Braces +2 added lines, -2 removed lines

@@ -32,11 +32,11 @@
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
+            } else{
                 return cb()->redirectBack( cbLang("password_and_username_is_wrong"));
             }
 
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(cb()->getLoginUrl(),$e->getMessage(),'warning');
         }
     }

src/controllers/AdminAuthController.php

Spacing +9 added lines, -9 removed lines

@@ -18,11 +18,11 @@ 
     {
         $key = md5(request()->ip().request()->userAgent());
 
-        if(Cache::has("loginSuspended".$key)) {
+        if (Cache::has("loginSuspended".$key)) {
             return true;
         }
 
-        if(env("CB_AUTO_SUSPEND_LOGIN") && Cache::get("loginFailed".$key) >= env("CB_AUTO_SUSPEND_LOGIN")) {
+        if (env("CB_AUTO_SUSPEND_LOGIN") && Cache::get("loginFailed".$key) >= env("CB_AUTO_SUSPEND_LOGIN")) {
             Cache::put("loginSuspended".$key, true, 30);
             Cache::forget("loginFailed".$key);
             return true;
@@ -33,7 +33,7 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if (!auth()->guest()) return redirect(cb()->getAdminUrl());
 
         cbHook()->hookGetLogin();
 
@@ -42,24 +42,24 @@ 
 
     public function postLogin()
     {
-        try{
-            if($this->isSuspendedLogin()) throw new CBValidationException(cbLang("you_have_been_suspended"));
+        try {
+            if ($this->isSuspendedLogin()) throw new CBValidationException(cbLang("you_have_been_suspended"));
 
             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(cb()->getAdminUrl());
             } else {
                 $this->incrementFailedLogin();
-                return redirect(cb()->getLoginUrl())->with(['message'=>cbLang('password_and_username_is_wrong'),'message_type'=>'warning']);
+                return redirect(cb()->getLoginUrl())->with(['message'=>cbLang('password_and_username_is_wrong'), 'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
-            return cb()->redirect(cb()->getAdminUrl("login"),$e->getMessage(),'warning');
+        } catch (CBValidationException $e) {
+            return cb()->redirect(cb()->getAdminUrl("login"), $e->getMessage(), 'warning');
         }
     }
 

Braces +7 added lines, -3 removed lines

@@ -33,7 +33,9 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if(!auth()->guest()) {
+            return redirect(cb()->getAdminUrl());
+        }
 
         cbHook()->hookGetLogin();
 
@@ -43,7 +45,9 @@ 
     public function postLogin()
     {
         try{
-            if($this->isSuspendedLogin()) throw new CBValidationException(cbLang("you_have_been_suspended"));
+            if($this->isSuspendedLogin()) {
+                throw new CBValidationException(cbLang("you_have_been_suspended"));
+            }
 
             cb()->validation([
                 'email'=>'required|email',
@@ -58,7 +62,7 @@ 
                 $this->incrementFailedLogin();
                 return redirect(cb()->getLoginUrl())->with(['message'=>cbLang('password_and_username_is_wrong'),'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(cb()->getAdminUrl("login"),$e->getMessage(),'warning');
         }
     }

src/controllers/DeveloperPluginStoreController.php

Spacing +29 added lines, -29 removed lines

@@ -28,14 +28,14 @@ 
 
     public function getIndex() {
 
-        if(request("refresh")) {
-            $this->fetchPluginData(false );
-            return cb()->redirectBack("Plugin list has been refreshed!","success");
+        if (request("refresh")) {
+            $this->fetchPluginData(false);
+            return cb()->redirectBack("Plugin list has been refreshed!", "success");
         }
 
         $data = [];
         $data['result'] = $this->fetchPluginData();
-        return view($this->view.'.index',$data);
+        return view($this->view.'.index', $data);
     }
 
     public function postLoginAccount() {
@@ -50,13 +50,13 @@ 
         ]);
         $response = $curl->send();
 
-        if($respArray = json_decode($response, true)) {
-            if($respArray['status'] && isset($respArray['token'])) {
+        if ($respArray = json_decode($response, true)) {
+            if ($respArray['status'] && isset($respArray['token'])) {
                 session(['account_token'=>$respArray['token']]);
             }
-            return response()->make($response,200,["Content-Type"=>"application/json"]);
+            return response()->make($response, 200, ["Content-Type"=>"application/json"]);
         } else {
-            return response()->json(['status'=>false,'message'=>'failed']);
+            return response()->json(['status'=>false, 'message'=>'failed']);
         }
     }
 
@@ -73,15 +73,15 @@ 
         ]);
         $response = $curl->send();
 
-        if($respArray = json_decode($response, true)) {
-            if($respArray['status']) {
+        if ($respArray = json_decode($response, true)) {
+            if ($respArray['status']) {
                 $form = base64_decode($respArray['payment']);
-                return response()->json(['status'=>true,'form'=>$form]);
+                return response()->json(['status'=>true, 'form'=>$form]);
             } else {
                 return response()->json($respArray);
             }
         } else {
-            return response()->json(['status'=>false,'message'=>'failed','raw'=>$response]);
+            return response()->json(['status'=>false, 'message'=>'failed', 'raw'=>$response]);
         }
     }
 
@@ -89,15 +89,15 @@ 
     {
         $pluginData = $this->fetchPluginData();
 
-        if(isset($pluginData[$key])) {
-            if(file_exists(app_path("CBPlugins/".$key))) {
+        if (isset($pluginData[$key])) {
+            if (file_exists(app_path("CBPlugins/".$key))) {
                 rrmdir(app_path("CBPlugins/".$key));
                 return response()->json(['status'=>true, 'message'=>'Plugin has been uninstalled!']);
-            }else{
-                return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin is not found']);
+            } else {
+                return response()->json(['status'=>false, 'message'=>'Failed to uninstall, plugin is not found']);
             }
-        }else {
-            return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin key is not found']);
+        } else {
+            return response()->json(['status'=>false, 'message'=>'Failed to uninstall, plugin key is not found']);
         }
     }
 
@@ -105,7 +105,7 @@ 
     {
         $pluginData = $this->fetchPluginData();
 
-        if(isset($pluginData[$key])) {
+        if (isset($pluginData[$key])) {
             $plugin = $pluginData[$key];
 
             // Create temp file of zip plugin
@@ -123,22 +123,22 @@ 
                 fclose($temp);
 
                 // Rename
-                if(file_exists(app_path("CBPlugins/".$key))) rrmdir(app_path("CBPlugins/".$key));
+                if (file_exists(app_path("CBPlugins/".$key))) rrmdir(app_path("CBPlugins/".$key));
                 rename(app_path("CBPlugins/".$dirName), app_path("CBPlugins/".$key));
 
-                return response()->json(['status'=>true,'message'=>'Install / update plugin has been succesfull!']);
+                return response()->json(['status'=>true, 'message'=>'Install / update plugin has been succesfull!']);
 
             } else {
-                return response()->json(['status'=>false,'message'=>"Failed to install/update, can't open the plugin archive"]);
+                return response()->json(['status'=>false, 'message'=>"Failed to install/update, can't open the plugin archive"]);
             }
-        }else{
-            return response()->json(['status'=>false,'message'=>'Failed to install/update, plugin key is not found']);
+        } else {
+            return response()->json(['status'=>false, 'message'=>'Failed to install/update, plugin key is not found']);
         }
     }
 
     private function fetchPluginData($cache = true)
     {
-        if($cache === true && $data = Cache::get("plugin_store_data")) {
+        if ($cache === true && $data = Cache::get("plugin_store_data")) {
             return $data;
         }
 
@@ -155,13 +155,13 @@ 
             $context = stream_context_create($opts);
             $data = file_get_contents(base64_decode("aHR0cDovL2NydWRib29zdGVyLmNvbS9hcGkvcGx1Z2luP2FjY2Vzc190b2tlbj1iVmMvWm5wWU5TWnJNVlpZT0hFNVUydHFjU1U9"), false, $context);
 
-            if($data) {
+            if ($data) {
                 $data = json_decode($data, true);
-                if($data['status']==true) {
+                if ($data['status'] == true) {
 
-                    foreach($data['data'] as $item) {
+                    foreach ($data['data'] as $item) {
                         $key = $item['key'];
-                        $result[ $key ] = $item;
+                        $result[$key] = $item;
                     }
 
                     $result = collect($result)->sortBy("name")->all();

Braces +6 added lines, -4 removed lines

@@ -93,10 +93,10 @@ 
             if(file_exists(app_path("CBPlugins/".$key))) {
                 rrmdir(app_path("CBPlugins/".$key));
                 return response()->json(['status'=>true, 'message'=>'Plugin has been uninstalled!']);
-            }else{
+            } else{
                 return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin is not found']);
             }
-        }else {
+        } else {
             return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin key is not found']);
         }
     }
@@ -123,7 +123,9 @@ 
                 fclose($temp);
 
                 // Rename
-                if(file_exists(app_path("CBPlugins/".$key))) rrmdir(app_path("CBPlugins/".$key));
+                if(file_exists(app_path("CBPlugins/".$key))) {
+                    rrmdir(app_path("CBPlugins/".$key));
+                }
                 rename(app_path("CBPlugins/".$dirName), app_path("CBPlugins/".$key));
 
                 return response()->json(['status'=>true,'message'=>'Install / update plugin has been succesfull!']);
@@ -131,7 +133,7 @@ 
             } else {
                 return response()->json(['status'=>false,'message'=>"Failed to install/update, can't open the plugin archive"]);
             }
-        }else{
+        } else{
             return response()->json(['status'=>false,'message'=>'Failed to install/update, plugin key is not found']);
         }
     }

src/helpers/Helper.php

Indentation +26 added lines, -26 removed lines

@@ -220,20 +220,20 @@ 
 }
 
 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;
+    }
 }
 
 /* 
@@ -407,22 +407,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 +53 added lines, -53 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!function_exists("putHtaccess")) {
+if (!function_exists("putHtaccess")) {
     function putHtaccess($stringToPut)
     {
         file_put_contents(base_path(".htaccess"), "\n".$stringToPut, FILE_APPEND);
@@ -8,13 +8,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;
             }
         }
@@ -23,7 +23,7 @@ 
     }
 }
 
-if(!function_exists("setEnvironmentValue")) {
+if (!function_exists("setEnvironmentValue")) {
     function setEnvironmentValue(array $values)
     {
         $envFile = app()->environmentFilePath();
@@ -54,7 +54,7 @@ 
 }
 
 
-if(!function_exists("cbLang")) {
+if (!function_exists("cbLang")) {
     /**
      * @param string $key
      * @param array $replace
@@ -66,17 +66,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 = [
@@ -123,13 +123,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
      */
@@ -138,7 +138,7 @@ 
     }
 }
 
-if(!function_exists('cbHook'))
+if (!function_exists('cbHook'))
 {
     /**
      * @return crocodicstudio\crudbooster\hooks\CBHook
@@ -150,7 +150,7 @@ 
     }
 }
 
-if(!function_exists('getTypeHook'))
+if (!function_exists('getTypeHook'))
 {
     /**
      * @param string $type
@@ -163,7 +163,7 @@ 
     }
 }
 
-if(!function_exists('getPrimaryKey'))
+if (!function_exists('getPrimaryKey'))
 {
     function getPrimaryKey($table_name)
     {
@@ -171,7 +171,7 @@ 
     }
 }
 
-if(!function_exists('cb'))
+if (!function_exists('cb'))
 {
     function cb()
     {
@@ -179,25 +179,25 @@ 
     }
 }
 
-if(!function_exists('cbAsset')) {
+if (!function_exists('cbAsset')) {
     function cbAsset($path, $secure = null) {
         return asset("cb_asset/".$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();
@@ -205,21 +205,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 cbConfig("DUMMY_PHOTO");
     }
 }
 
-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
@@ -244,14 +244,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 = [];
         }
 
@@ -265,31 +265,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');
@@ -320,7 +320,7 @@ 
             }
         }
 
-        if (! $full) {
+        if (!$full) {
             $string = array_slice($string, 0, 1);
         }
 
@@ -328,22 +328,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)
     {
@@ -355,7 +355,7 @@ 
     }
 }
 
-if(!function_exists("requestAll")) {
+if (!function_exists("requestAll")) {
     function requestAll() {
         $all = array_map_r("sanitizeXSS", request()->all());
         return $all;
@@ -364,22 +364,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) {
@@ -388,25 +388,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 +20 added lines, -15 removed lines

@@ -48,7 +48,9 @@ 
         }
 
         $str = substr($str, 0, -1);
-        if (!file_put_contents($envFile, $str)) return false;
+        if (!file_put_contents($envFile, $str)) {
+            return false;
+        }
         return true;
     }
 }
@@ -251,7 +253,7 @@ 
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else{
             $settings = [];
         }
 
@@ -276,14 +278,14 @@ 
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else{
             $settings = [];
         }
 
         if(isset($settings[$key])) {
             \Illuminate\Support\Facades\Cache::forever("setting_".$key, $settings[$key]);
             return $settings[$key]?:$default;
-        }else{
+        } else{
             return $default;
         }
     }
@@ -369,7 +371,7 @@ 
         $url = request($name);
         if(filter_var($url, FILTER_VALIDATE_URL)) {
             return $url;
-        }else{
+        } else{
             return request()->url();
         }
     }
@@ -381,14 +383,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);
         }
     }
@@ -398,11 +400,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);
+        }
     }
 }
 
@@ -415,10 +419,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/CurlHelper.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 
     public function headers(array $headers) {
         $newHeaders = [];
-        foreach($headers as $key=>$val) {
+        foreach ($headers as $key=>$val) {
             $newHeaders[] = $key.": ".$val;
         }
         $this->headers = $newHeaders;
@@ -47,9 +47,9 @@ 
         $err = curl_error($ch);
         curl_close($ch);
 
-        if($err) {
+        if ($err) {
             return $err;
-        }else {
+        } else {
             return $response;
         }
     }

Braces +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
         if($err) {
             return $err;
-        }else {
+        } else {
             return $response;
         }
     }