crocodic-studio / crudbooster

src/controllers/DeveloperUsersController.php

Spacing +11 added lines, -11 removed lines

@@ -27,10 +27,10 @@ 
     public function getIndex() {
         $data = [];
         $data['result'] = DB::table("users")
-            ->join("cb_roles","cb_roles.id","=","cb_roles_id")
-            ->select("users.*","cb_roles.name as cb_roles_name")
+            ->join("cb_roles", "cb_roles.id", "=", "cb_roles_id")
+            ->select("users.*", "cb_roles.name as cb_roles_name")
             ->get();
-        return view($this->view.'.index',$data);
+        return view($this->view.'.index', $data);
     }
 
     public function getAdd() {
@@ -41,7 +41,7 @@ 
 
     public function postAddSave() {
         try {
-            cb()->validation(['name', 'email','password','cb_roles_id']);
+            cb()->validation(['name', 'email', 'password', 'cb_roles_id']);
 
             $user = [];
             $user['name'] = request('name');
@@ -50,7 +50,7 @@ 
             $user['cb_roles_id'] = request('cb_roles_id');
             DB::table('users')->insert($user);
 
-            return cb()->redirect(route("DeveloperUsersControllerGetIndex"),"New user has been created!","success");
+            return cb()->redirect(route("DeveloperUsersControllerGetIndex"), "New user has been created!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -66,16 +66,16 @@ 
 
     public function postEditSave($id) {
         try {
-            cb()->validation(['name', 'email','cb_roles_id']);
+            cb()->validation(['name', 'email', 'cb_roles_id']);
 
             $user = [];
             $user['name'] = request('name');
             $user['email'] = request('email');
-            if(request('password')) $user['password'] = Hash::make(request('password'));
+            if (request('password')) $user['password'] = Hash::make(request('password'));
             $user['cb_roles_id'] = request('cb_roles_id');
-            DB::table('users')->where('id',$id)->update($user);
+            DB::table('users')->where('id', $id)->update($user);
 
-            return cb()->redirect(route("DeveloperUsersControllerGetIndex"),"The user has been updated!","success");
+            return cb()->redirect(route("DeveloperUsersControllerGetIndex"), "The user has been updated!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -83,8 +83,8 @@ 
     }
 
     public function getDelete($id) {
-        DB::table("users")->where("id",$id)->delete();
-        return cb()->redirectBack("The user has been deleted!","success");
+        DB::table("users")->where("id", $id)->delete();
+        return cb()->redirectBack("The user has been deleted!", "success");
     }
 
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -71,7 +71,9 @@
             $user = [];
             $user['name'] = request('name');
             $user['email'] = request('email');
-            if(request('password')) $user['password'] = Hash::make(request('password'));
+            if(request('password')) {
+                $user['password'] = Hash::make(request('password'));
+            }
             $user['cb_roles_id'] = request('cb_roles_id');
             DB::table('users')->where('id',$id)->update($user);
 

src/controllers/DeveloperMenusController.php

Braces +4 added lines, -4 removed lines

@@ -54,9 +54,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');
             }
 
@@ -79,9 +79,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');
             }
             DB::table("cb_menus")->where("id",$id)->update($menu);

Spacing +23 added lines, -23 removed lines

@@ -25,22 +25,22 @@ 
 
     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);
     }
 
     public function getEdit($id) {
         $data = [];
         $data['form_title'] = "Edit Menu";
-        $data['form_url'] = route('DeveloperMenusControllerPostEditSave',['id'=>$id]);
-        $data['modules'] = DB::table("cb_modules")->orderBy("name","asc")->get();
+        $data['form_url'] = route('DeveloperMenusControllerPostEditSave', ['id'=>$id]);
+        $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');
@@ -65,7 +65,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());
@@ -80,18 +80,18 @@ 
             $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');
             }elseif (request('type') == 'path') {
                 $menu['path'] = request('path_value');
             }
-            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());
@@ -104,20 +104,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']]);
                                     }
                                 }
                             }
@@ -128,20 +128,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/helpers/Module.php

Braces +37 added lines, -22 removed lines

@@ -76,45 +76,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;
         }
     }
@@ -123,7 +138,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else{
             return null;
         }
     }
@@ -132,7 +147,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else{
             return null;
         }
     }
@@ -141,7 +156,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
             return action($this->controller.'@getEdit',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -150,7 +165,7 @@ 
     {
         if(method_exists($this->controller_class, 'postEditSave')) {
             return action($this->controller.'@postEditSave',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -159,7 +174,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
             return action($this->controller.'@getDetail',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -168,7 +183,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
             return action($this->controller.'@getDelete',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -177,7 +192,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
             return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        } else{
             return null;
         }
     }

Indentation +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
                     $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()
+                            "cb_menus_id"=>$this->menu->id,
+                            "cb_roles_id"=>cb()->session()->roleId()
                         ]);
                     }
                 }

Spacing +50 added lines, -50 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')) {
-            return action($this->controller.'@getEdit',['id'=>$id]);
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
+            return action($this->controller.'@getEdit', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
     public function editSaveURL($id = null)
     {
-        if(method_exists($this->controller_class, 'postEditSave')) {
-            return action($this->controller.'@postEditSave',['id'=>$id]);
-        }else{
+        if (method_exists($this->controller_class, 'postEditSave')) {
+            return action($this->controller.'@postEditSave', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
-    public function detailURL($id=null)
+    public function detailURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
-            return action($this->controller.'@getDetail',['id'=>$id]);
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
+            return action($this->controller.'@getDetail', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
-    public function deleteURL($id=null)
+    public function deleteURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
-            return action($this->controller.'@getDelete',['id'=>$id]);
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
+            return action($this->controller.'@getDelete', ['id'=>$id]);
+        } 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;
         }
     }

src/types/datetime/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
      */
     public function indexRender($row, $column)
     {
-        if($column->getFormat()) {
+        if ($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else {
             return $row->{$column->getField()};
         }
     }

Braces +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
         if($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else{
             return $row->{$column->getField()};
         }
     }

src/types/radio/Radio.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $data = DB::table($table);
         if($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
-        }elseif ($SQLCondition && is_string($SQLCondition)) {
+        } elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
         }
         $data = $data->get();

Spacing +3 added lines, -3 removed lines

@@ -35,13 +35,13 @@ 
      */
     public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) {
 
-        if(strpos($table,"App\Models")!==false) {
+        if (strpos($table, "App\Models") !== false) {
             $table = new $table();
             $table = $table::$tableName;
         }
 
         $data = DB::table($table);
-        if($SQLCondition && is_callable($SQLCondition)) {
+        if ($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
         }elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
@@ -49,7 +49,7 @@ 
         $data = $data->get();
         $options = [];
         foreach ($data as $d) {
-            $options[ $d->$key_field ] = $d->$display_field;
+            $options[$d->$key_field] = $d->$display_field;
         }
         $this->options($options);
     }

src/database/migrations/2016_08_07_152421_table_menus.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function up()
     {
-        Schema::create('cb_menus', function (Blueprint $table) {
+        Schema::create('cb_menus', function(Blueprint $table) {
             $table->increments("id");
             $table->string('name');
             $table->string("icon")->nullable();

src/types/checkbox/Checkbox.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $data = DB::table($table);
         if($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
-        }elseif ($SQLCondition && is_string($SQLCondition)) {
+        } elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
         }
         $data = $data->get();

Spacing +3 added lines, -3 removed lines

@@ -40,13 +40,13 @@ 
      * @param $SQLCondition string|callable
      */
     public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) {
-        if(strpos($table,"App\Models")!==false) {
+        if (strpos($table, "App\Models") !== false) {
             $table = new $table();
             $table = $table::$tableName;
         }
 
         $data = DB::table($table);
-        if($SQLCondition && is_callable($SQLCondition)) {
+        if ($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
         }elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
@@ -54,7 +54,7 @@ 
         $data = $data->get();
         $options = [];
         foreach ($data as $d) {
-            $options[ $d->$key_field ] = $d->$display_field;
+            $options[$d->$key_field] = $d->$display_field;
         }
         $this->options($options);
     }

src/types/date/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
      */
     public function indexRender($row, $column)
     {
-        if($column->getFormat()) {
+        if ($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else {
             return $row->{$column->getField()};
         }
     }

Braces +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
         if($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else{
             return $row->{$column->getField()};
         }
     }

src/helpers/UserSession.php

Spacing +3 added lines, -3 removed lines

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

Braces +5 added lines, -2 removed lines

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