crocodic-studio / crudbooster

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

Spacing +1 added lines, -1 removed lines

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

src/types/image/Hook.php

Spacing +3 added lines, -3 removed lines

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

src/types/file/Hook.php

Spacing +2 added lines, -2 removed lines

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

src/controllers/DeveloperPluginStoreController.php

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) {

Spacing +38 added lines, -38 removed lines

@@ -31,25 +31,25 @@ 
 
     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 getUninstall($key)
     {
         $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']);
                     }
                 }
@@ -57,24 +57,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);
                 }
             }
         }
@@ -83,26 +83,26 @@ 
 
     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']);
 
                         Artisan::call("migrate");
 
-                        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 {
@@ -121,16 +121,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));
                             }
 
@@ -144,31 +144,31 @@ 
                         //Migrate
                         Artisan::call("migrate");
 
-                        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",
@@ -181,13 +181,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();

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();
     }

src/controllers/DeveloperMenusController.php

Braces +4 added lines, -4 removed lines

@@ -55,9 +55,9 @@ 
             $menu['type'] = request('type');
             if(request('type') == 'module') {
                 $menu['cb_modules_id'] = request('cb_modules_id');
-            }elseif (request('type') == 'url') {
+            } elseif (request('type') == 'url') {
                 $menu['path'] = request('url_value');
-            }elseif (request('type') == 'path') {
+            } elseif (request('type') == 'path') {
                 $menu['path'] = request('path_value');
             } elseif (request("type") == "empty") {
                 $menu['path'] = "javascript:void(0);";
@@ -84,9 +84,9 @@ 
             $menu['type'] = request('type');
             if(request('type') == 'module') {
                 $menu['cb_modules_id'] = request('cb_modules_id');
-            }elseif (request('type') == 'url') {
+            } elseif (request('type') == 'url') {
                 $menu['path'] = request('url_value');
-            }elseif (request('type') == 'path') {
+            } elseif (request('type') == 'path') {
                 $menu['path'] = request('path_value');
             } elseif (request("type") == "empty") {
                 $menu['path'] = "javascript:void(0);";

Spacing +22 added lines, -22 removed lines

@@ -25,14 +25,14 @@ 
 
     public function getIndex() {
         $data = [];
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function getAdd() {
         $data = [];
         $data['form_title'] = "Add Menu";
         $data['form_url'] = route('DeveloperMenusControllerPostAddSave');
-        $data['modules'] = DB::table("cb_modules")->orderBy("name","asc")->get();
+        $data['modules'] = DB::table("cb_modules")->orderBy("name", "asc")->get();
         return view($this->view.".form", $data);
     }
 
@@ -40,7 +40,7 @@ 
         $data = [];
         $data['form_title'] = "Edit Menu";
         $data['form_url'] = cb()->getDeveloperUrl("menus/edit-save/".$id);
-        $data['modules'] = DB::table("cb_modules")->orderBy("name","asc")->get();
+        $data['modules'] = DB::table("cb_modules")->orderBy("name", "asc")->get();
         $data['row'] = cb()->find("cb_menus", $id);
         return view($this->view.".form", $data);
     }
@@ -53,7 +53,7 @@ 
             $menu['name'] = request('name');
             $menu['icon'] = request('icon');
             $menu['type'] = request('type');
-            if(request('type') == 'module') {
+            if (request('type') == 'module') {
                 $menu['cb_modules_id'] = request('cb_modules_id');
             }elseif (request('type') == 'url') {
                 $menu['path'] = request('url_value');
@@ -67,7 +67,7 @@ 
 
             CacheHelper::forgetGroup("sidebar_menu");
 
-            return cb()->redirect(route("DeveloperMenusControllerGetIndex"),"The menu has been added!","success");
+            return cb()->redirect(route("DeveloperMenusControllerGetIndex"), "The menu has been added!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -82,7 +82,7 @@ 
             $menu['name'] = request('name');
             $menu['icon'] = request('icon');
             $menu['type'] = request('type');
-            if(request('type') == 'module') {
+            if (request('type') == 'module') {
                 $menu['cb_modules_id'] = request('cb_modules_id');
             }elseif (request('type') == 'url') {
                 $menu['path'] = request('url_value');
@@ -91,11 +91,11 @@ 
             } elseif (request("type") == "empty") {
                 $menu['path'] = "javascript:void(0);";
             }
-            DB::table("cb_menus")->where("id",$id)->update($menu);
+            DB::table("cb_menus")->where("id", $id)->update($menu);
 
             CacheHelper::forgetGroup("sidebar_menu");
 
-            return cb()->redirect(route("DeveloperMenusControllerGetIndex"),"The menu has been saved!","success");
+            return cb()->redirect(route("DeveloperMenusControllerGetIndex"), "The menu has been saved!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -108,20 +108,20 @@ 
 
             $menus = request('menus');
             $menus = json_decode($menus, true);
-            if($menus) {
+            if ($menus) {
                 $menus = $menus[0];
-                if($menus) {
-                    foreach($menus as $i=>$menu) {
+                if ($menus) {
+                    foreach ($menus as $i=>$menu) {
                         $id = $menu['id'];
-                        cb()->update("cb_menus",$id,["sort_number"=>$i,'parent_cb_menus_id'=>null]);
-                        if($menu['children'][0]) {
-                            foreach($menu['children'][0] as $ii=>$sub) {
+                        cb()->update("cb_menus", $id, ["sort_number"=>$i, 'parent_cb_menus_id'=>null]);
+                        if ($menu['children'][0]) {
+                            foreach ($menu['children'][0] as $ii=>$sub) {
                                 $id = $sub['id'];
-                                cb()->update("cb_menus",$id,["sort_number"=>$ii,"parent_cb_menus_id"=>$menu['id']]);
-                                if($sub['children'][0]) {
-                                    foreach($sub['children'][0] as $iii=>$subsub) {
+                                cb()->update("cb_menus", $id, ["sort_number"=>$ii, "parent_cb_menus_id"=>$menu['id']]);
+                                if ($sub['children'][0]) {
+                                    foreach ($sub['children'][0] as $iii=>$subsub) {
                                         $id = $subsub['id'];
-                                        cb()->update("cb_menus",$id,["sort_number"=>$iii,"parent_cb_menus_id"=>$sub['id']]);
+                                        cb()->update("cb_menus", $id, ["sort_number"=>$iii, "parent_cb_menus_id"=>$sub['id']]);
                                     }
                                 }
                             }
@@ -132,20 +132,20 @@ 
 
             CacheHelper::forgetGroup("sidebar_menu");
 
-            return response()->json(['api_status'=>1,'api_message'=>'success']);
+            return response()->json(['api_status'=>1, 'api_message'=>'success']);
 
         } catch (CBValidationException $e) {
-            return response()->json(['api_status'=>0,'api_message'=>$e->getMessage()]);
+            return response()->json(['api_status'=>0, 'api_message'=>$e->getMessage()]);
         }
     }
 
     public function getDelete($id) {
-        DB::table("cb_menus")->where("id",$id)->delete();
+        DB::table("cb_menus")->where("id", $id)->delete();
         DB::table("cb_role_privileges")->where("cb_menus_id", $id)->delete();
 
         CacheHelper::forgetGroup("sidebar_menu");
 
-        return cb()->redirectBack("The menu has been deleted!","success");
+        return cb()->redirectBack("The menu has been deleted!", "success");
     }
 
 }
\ No newline at end of file

src/CRUDBoosterServiceProvider.php

Spacing +12 added lines, -12 removed lines

@@ -25,13 +25,13 @@ 
         // Register views
         $this->loadViewsFrom(__DIR__.'/views', 'crudbooster');
         $this->loadViewsFrom(__DIR__.'/types', 'types');
-        $this->loadTranslationsFrom(__DIR__."/localization","cb");
+        $this->loadTranslationsFrom(__DIR__."/localization", "cb");
 
         // Publish the files
-        $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')],'cb_config');
-        $this->publishes([__DIR__.'/database' => base_path('database')],'cb_migration');
-        $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')],'cb_hook');
-        $this->publishes([__DIR__ . '/assets' =>public_path('cb_asset')],'cb_asset');
+        $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')], 'cb_config');
+        $this->publishes([__DIR__.'/database' => base_path('database')], 'cb_migration');
+        $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')], 'cb_hook');
+        $this->publishes([__DIR__.'/assets' =>public_path('cb_asset')], 'cb_asset');
 
         // Override Local FileSystem
         Config::set("filesystems.disks.local.root", cbConfig("LOCAL_FILESYSTEM_PATH", public_path("storage")));
@@ -53,7 +53,7 @@ 
         require __DIR__.'/helpers/Helper.php';
 
         // Singletons
-        $this->app->singleton('crudbooster', function ()
+        $this->app->singleton('crudbooster', function()
         {
             return true;
         });
@@ -76,7 +76,7 @@ 
         }
 
         // Merging configuration
-        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php','crudbooster');
+        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php', 'crudbooster');
 
         // Register additional library
         $this->app->register('Intervention\Image\ImageServiceProvider');
@@ -84,17 +84,17 @@ 
 
     private function registerPlugin()
     {
-        if(file_exists(app_path("CBPlugins"))) {
+        if (file_exists(app_path("CBPlugins"))) {
             $views = scandir(app_path("CBPlugins"));
-            foreach($views as $view) {
-                if($view != "." && $view != "..") {
+            foreach ($views as $view) {
+                if ($view != "." && $view != "..") {
                     $basename = basename($view);
 
                     // register migrations
                     $this->loadMigrationsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Migrations"));
 
                     // register view
-                    $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"),$basename);
+                    $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"), $basename);
 
                     // register route
                     require app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Routes".DIRECTORY_SEPARATOR."Route.php");
@@ -107,7 +107,7 @@ 
 
     private function registerTypeRoutes() {
         $routes = rglob(__DIR__.DIRECTORY_SEPARATOR."types".DIRECTORY_SEPARATOR."Route.php");
-        foreach($routes as $route) {
+        foreach ($routes as $route) {
             require $route;
         }
     }

src/helpers/Module.php

Spacing +46 added lines, -46 removed lines

@@ -26,17 +26,17 @@ 
         try {
             $routeArray = request()->route()->getAction();
             $this->controller = class_basename($routeArray['controller']);
-            $this->controller = strtok($this->controller,"@");
+            $this->controller = strtok($this->controller, "@");
 
             $className = "\\".$routeArray["namespace"]."\\".$this->controller;
-            if(class_exists($className)) {
-                $this->module = cb()->find("cb_modules",["controller"=>$this->controller]);
-                if($this->module) {
+            if (class_exists($className)) {
+                $this->module = cb()->find("cb_modules", ["controller"=>$this->controller]);
+                if ($this->module) {
                     $this->controller_class = new $className();
-                    $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;
-                    if($this->menu) {
-                        $this->privilege = cb()->find("cb_role_privileges",[
+                    $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;
+                    if ($this->menu) {
+                        $this->privilege = cb()->find("cb_role_privileges", [
                             "cb_menus_id"=>$this->menu->id,
                             "cb_roles_id"=>cb()->session()->roleId()
                         ]);
@@ -57,9 +57,9 @@ 
     }
 
     public function getData($key) {
-        if($this->controller_class) {
+        if ($this->controller_class) {
             $value = $this->controller_class->getData($key);
-            if(isset($value)) {
+            if (isset($value)) {
                 return $value;
             }
         }
@@ -70,128 +70,128 @@ 
      * @return CBController
      */
     public function getController() {
-        return ($this->controller_class)?$this->controller_class:null;
+        return ($this->controller_class) ? $this->controller_class : null;
     }
 
     public function getPageTitle()
     {
-        return ($this->controller_class)?$this->controller_class->getData("page_title")?:cb()->getAppName():null;
+        return ($this->controller_class) ? $this->controller_class->getData("page_title") ?: cb()->getAppName() : null;
     }
 
     public function getTable()
     {
-        return ($this->controller_class)?$this->controller_class->getData("table"):null;
+        return ($this->controller_class) ? $this->controller_class->getData("table") : null;
     }
 
     public function getPageIcon()
     {
-        return ($this->controller_class)?$this->controller_class->getData('page_icon')?:"fa fa-bars":null;
+        return ($this->controller_class) ? $this->controller_class->getData('page_icon') ?: "fa fa-bars" : null;
     }
 
     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($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else {
             return null;
         }
     }
 
     public function addSaveURL()
     {
-        if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else {
             return null;
         }
     }
 
     public function editURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
             return action($this->controller.'@getEdit')."/".$id;
-        }else{
+        } else {
             return null;
         }
     }
 
     public function editSaveURL($id = null)
     {
-        if(method_exists($this->controller_class, 'postEditSave')) {
+        if (method_exists($this->controller_class, 'postEditSave')) {
             return action($this->controller.'@postEditSave')."/".$id;
-        }else{
+        } else {
             return null;
         }
     }
 
-    public function detailURL($id=null)
+    public function detailURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
             return action($this->controller.'@getDetail')."/".$id;
-        }else{
+        } else {
             return null;
         }
     }
 
-    public function deleteURL($id=null)
+    public function deleteURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
             return action($this->controller.'@getDelete')."/".$id;
-        }else{
+        } else {
             return null;
         }
     }
 
     public function url($path = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
-            return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
+            return trim(action($this->controller.'@getIndex').'/'.$path, '/');
+        } else {
             return null;
         }
     }

Braces +37 added lines, -22 removed lines

@@ -90,45 +90,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;
         }
     }
@@ -137,7 +152,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else{
             return null;
         }
     }
@@ -146,7 +161,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else{
             return null;
         }
     }
@@ -155,7 +170,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
             return action($this->controller.'@getEdit')."/".$id;
-        }else{
+        } else{
             return null;
         }
     }
@@ -164,7 +179,7 @@ 
     {
         if(method_exists($this->controller_class, 'postEditSave')) {
             return action($this->controller.'@postEditSave')."/".$id;
-        }else{
+        } else{
             return null;
         }
     }
@@ -173,7 +188,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
             return action($this->controller.'@getDetail')."/".$id;
-        }else{
+        } else{
             return null;
         }
     }
@@ -182,7 +197,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
             return action($this->controller.'@getDelete')."/".$id;
-        }else{
+        } else{
             return null;
         }
     }
@@ -191,7 +206,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
             return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        } else{
             return null;
         }
     }