crocodic-studio / crudbooster

src/routes.php

Spacing +34 added lines, -34 removed lines

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

src/controllers/AdminAuthController.php

Indentation +3 added lines, -3 removed lines

@@ -132,9 +132,9 @@
 
                 // Update Login At
                 cb()->update("users", auth()->id(), [
-                   "login_at"=>now()->format("Y-m-d H:i:s"),
-                   "ip_address"=>request()->ip(),
-                   "user_agent"=>request()->userAgent()
+                    "login_at"=>now()->format("Y-m-d H:i:s"),
+                    "ip_address"=>request()->ip(),
+                    "user_agent"=>request()->userAgent()
                 ]);
 
                 // When login user success, clear suspend attempt

Spacing +22 added lines, -22 removed lines

@@ -20,32 +20,32 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if (!auth()->guest()) return redirect(cb()->getAdminUrl());
 
         cbHook()->hookGetLogin();
 
         $data = [];
-        $data['no1'] = rand(1,10);
-        $data['no2'] = rand(1,10);
-        Session::put("captcha_result", $data['no1']+$data['no2']);
+        $data['no1'] = rand(1, 10);
+        $data['no2'] = rand(1, 10);
+        Session::put("captcha_result", $data['no1'] + $data['no2']);
 
         $themeView = getThemePath("login");
-        $loginView = str_replace(".blade.php", "", getSetting('login_page_view',$themeView));
-        return view($loginView, $data );
+        $loginView = str_replace(".blade.php", "", getSetting('login_page_view', $themeView));
+        return view($loginView, $data);
     }
 
     private function loginNotification() {
-        if($isLoginNotification = getSetting("LOGIN_NOTIFICATION")) {
+        if ($isLoginNotification = getSetting("LOGIN_NOTIFICATION")) {
             $user = auth()->user();
-            if($user->ip_address && $user->user_agent) {
+            if ($user->ip_address && $user->user_agent) {
 
-                if( request()->ip() != $user->ip_address || request()->userAgent() != $user->user_agent) {
+                if (request()->ip() != $user->ip_address || request()->userAgent() != $user->user_agent) {
                     $code = Str::random(5);
                     session(["login_verification_code"=>$code]);
                     $mail = new MailHelper();
                     $mail->to($user->email);
-                    $mail->sender("noreply@".$_SERVER['SERVER_NAME'],cb()->getAppName());
-                    $mail->content("Please verify that it's you?","
+                    $mail->sender("noreply@".$_SERVER['SERVER_NAME'], cb()->getAppName());
+                    $mail->content("Please verify that it's you?", "
                     Hi $user->name,<br/><br>
                     
                     Your sign in attempt seems a little different than usual. This could be because you are signing in from a different device or a different location.<br/>
@@ -86,9 +86,9 @@ 
         try {
             cb()->validation(["code"]);
 
-            if(session()->has("login_verification_code")) {
+            if (session()->has("login_verification_code")) {
                 $sessCode = session("login_verification_code");
-                if(request("code") == $sessCode) {
+                if (request("code") == $sessCode) {
                     // Update Login At
                     cb()->update("users", auth()->id(), [
                         "login_at"=>now()->format("Y-m-d H:i:s"),
@@ -105,7 +105,7 @@ 
                 }
             }
 
-            return cb()->redirectBack("The code is invalid!","warning");
+            return cb()->redirectBack("The code is invalid!", "warning");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -114,20 +114,20 @@ 
 
     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)) {
 
                 // Check if login notification is enabled
-                if($this->loginNotification()) {
-                    return cb()->redirect(route("AdminAuthControllerGetLoginVerification"),"We have sent you a code verification, please enter to this box");
+                if ($this->loginNotification()) {
+                    return cb()->redirect(route("AdminAuthControllerGetLoginVerification"), "We have sent you a code verification, please enter to this box");
                 }
 
                 // Update Login At
@@ -145,10 +145,10 @@ 
                 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');
         }
     }
 

src/controllers/DeveloperPluginStoreController.php

Spacing +47 added lines, -47 removed lines

@@ -30,14 +30,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() {
@@ -52,13 +52,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']);
         }
     }
 
@@ -75,15 +75,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]);
         }
     }
 
@@ -91,11 +91,11 @@ 
     {
         $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))) {
 
-                if(isset($pluginData['source']) && $pluginData['source'] == 'composer') {
-                    if(isset($pluginData['package'])) {
+                if (isset($pluginData['source']) && $pluginData['source'] == 'composer') {
+                    if (isset($pluginData['package'])) {
                         ComposerHelper::composerRemove($pluginData['package']);
                     }
                 }
@@ -103,24 +103,24 @@ 
                 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']);
         }
     }
 
-    private function recursiveCopy($src,$dst) {
+    private function recursiveCopy($src, $dst) {
         $dir = opendir($src);
         @mkdir($dst);
-        while(false !== ( $file = readdir($dir)) ) {
-            if (( $file != '.' ) && ( $file != '..' )) {
-                if ( is_dir($src . '/' . $file) ) {
-                    $this->recursiveCopy($src . '/' . $file,$dst . '/' . $file);
+        while (false !== ($file = readdir($dir))) {
+            if (($file != '.') && ($file != '..')) {
+                if (is_dir($src.'/'.$file)) {
+                    $this->recursiveCopy($src.'/'.$file, $dst.'/'.$file);
                 }
                 else {
-                    copy($src . '/' . $file,$dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -129,24 +129,24 @@ 
 
     public function getInstall($key)
     {
-        ini_set("memory_limit","192M");
+        ini_set("memory_limit", "192M");
         set_time_limit(500);
 
         $pluginData = $this->fetchPluginData();
 
         try {
-            if(isset($pluginData[$key])) {
+            if (isset($pluginData[$key])) {
                 $plugin = $pluginData[$key];
 
-                if(isset($plugin['source']) && $plugin['source'] == "composer") {
+                if (isset($plugin['source']) && $plugin['source'] == "composer") {
 
-                    if(isset($plugin['package']) && isset($plugin['service_provider'])) {
+                    if (isset($plugin['package']) && isset($plugin['service_provider'])) {
                         // Make a composer
                         $output = ComposerHelper::composerRequire($plugin['package'], $plugin['service_provider']);
 
-                        return response()->json(['status'=>true,'message'=>$output]);
+                        return response()->json(['status'=>true, 'message'=>$output]);
                     } else {
-                        return response()->json(['status'=>true,'message'=>'Installation is failed, there is no package and or service provider']);
+                        return response()->json(['status'=>true, 'message'=>'Installation is failed, there is no package and or service provider']);
                     }
 
                 } else {
@@ -165,16 +165,16 @@ 
                         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));
 
                         // Read Plugin JSON
                         $pluginJson = json_decode(file_get_contents(app_path("CBPlugins/".$key."/plugin.json")), true);
 
                         // Check if has asset
-                        if($pluginJson && $pluginJson['asset']) {
+                        if ($pluginJson && $pluginJson['asset']) {
                             // Check destination folder is ready
-                            if(file_exists(public_path("cb_asset/".$key))) {
+                            if (file_exists(public_path("cb_asset/".$key))) {
                                 rrmdir(public_path("cb_asset/".$key));
                             }
 
@@ -185,31 +185,31 @@ 
                             $this->recursiveCopy(app_path("CBPlugins/".$key."/".$pluginJson['asset']), public_path("cb_asset/".$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']);
             }
         } catch (\Exception $e) {
-            return response()->json(['status'=>false,'message'=>'Something went wrong!']);
+            return response()->json(['status'=>false, 'message'=>'Something went wrong!']);
         }
     }
 
     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;
         }
 
         $result = [];
 
         try {
-            $no_cache = ($cache)?0:1;
+            $no_cache = ($cache) ? 0 : 1;
             $opts = [
                 "http" => [
                     "method" => "GET",
@@ -218,17 +218,17 @@ 
                                 "No-Cache: ".$no_cache
                 ]
             ];
-            Log::debug("Headers: ".print_r($opts,true));
+            Log::debug("Headers: ".print_r($opts, true));
             $context = stream_context_create($opts);
             $data = file_get_contents(base64_decode("aHR0cDovL2NydWRib29zdGVyLmNvbS9hcGkvcGx1Z2luP2FjY2Vzc190b2tlbj1iVmMvWm5wWU5TWnJNVlpZT0hFNVUydHFjU1U9"), false, $context);
             Log::debug("Plugin API : ".$data);
-            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 +7 added lines, -6 removed lines

@@ -103,10 +103,10 @@ 
                 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']);
         }
     }
@@ -118,8 +118,7 @@ 
             if (( $file != '.' ) && ( $file != '..' )) {
                 if ( is_dir($src . '/' . $file) ) {
                     $this->recursiveCopy($src . '/' . $file,$dst . '/' . $file);
-                }
-                else {
+                } else {
                     copy($src . '/' . $file,$dst . '/' . $file);
                 }
             }
@@ -165,7 +164,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));
 
                         // Read Plugin JSON
@@ -192,7 +193,7 @@ 
                     }
                 }
 
-            }else{
+            } else{
                 return response()->json(['status'=>false,'message'=>'Failed to install/update, plugin key is not found']);
             }
         } catch (\Exception $e) {

src/database/migrations/2016_08_07_152421_modify_users.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
      */
     public function up()
     {
-        Schema::table('users', function (Blueprint $table) {
+        Schema::table('users', function(Blueprint $table) {
             $table->string('photo')->nullable();
             $table->integer('cb_roles_id');
             $table->ipAddress("ip_address")->nullable();
@@ -28,8 +28,8 @@ 
      */
     public function down()
     {
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn(["photo","cb_roles_id","ip_address","user_agent","login_at"]);
+        Schema::table('users', function(Blueprint $table) {
+            $table->dropColumn(["photo", "cb_roles_id", "ip_address", "user_agent", "login_at"]);
         });
     }
 }

src/helpers/ComposerHelper.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
         $process->setInput("Y");
         $process->setWorkingDirectory(base_path())->run();
 
-        Artisan::call("vendor:publish",["--provider"=>$serviceProvider]);
+        Artisan::call("vendor:publish", ["--provider"=>$serviceProvider]);
 
         return $process->getOutput();
     }