@@ -10,7 +10,7 @@ |
||
| 10 | 10 | @endforeach |
| 11 | 11 | |
| 12 | 12 | <?php |
| 13 | - if(cb()->getCurrentMethod()=="getEdit") { |
|
| 13 | + if (cb()->getCurrentMethod() == "getEdit") { |
|
| 14 | 14 | /** @var $row object */ |
| 15 | 15 | columnSingleton()->valueAssignment($row); |
| 16 | 16 | } |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | public function getIndex() { |
| 28 | 28 | $data = []; |
| 29 | 29 | $data['result'] = DB::table("users") |
| 30 | - ->join("cb_roles","cb_roles.id","=","cb_roles_id") |
|
| 31 | - ->select("users.*","cb_roles.name as cb_roles_name") |
|
| 30 | + ->join("cb_roles", "cb_roles.id", "=", "cb_roles_id") |
|
| 31 | + ->select("users.*", "cb_roles.name as cb_roles_name") |
|
| 32 | 32 | ->get(); |
| 33 | - return view($this->view.'.index',$data); |
|
| 33 | + return view($this->view.'.index', $data); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | public function getAdd() { |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | public function postAddSave() { |
| 43 | 43 | try { |
| 44 | - cb()->validation(['name', 'email','password','cb_roles_id']); |
|
| 44 | + cb()->validation(['name', 'email', 'password', 'cb_roles_id']); |
|
| 45 | 45 | |
| 46 | 46 | $user = []; |
| 47 | 47 | $user['name'] = request('name'); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $user['cb_roles_id'] = request('cb_roles_id'); |
| 51 | 51 | DB::table('users')->insert($user); |
| 52 | 52 | |
| 53 | - return cb()->redirect(route("DeveloperUsersControllerGetIndex"),"New user has been created!","success"); |
|
| 53 | + return cb()->redirect(route("DeveloperUsersControllerGetIndex"), "New user has been created!", "success"); |
|
| 54 | 54 | |
| 55 | 55 | } catch (CBValidationException $e) { |
| 56 | 56 | return cb()->redirectBack($e->getMessage()); |
@@ -66,16 +66,16 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | public function postEditSave($id) { |
| 68 | 68 | try { |
| 69 | - cb()->validation(['name', 'email','cb_roles_id']); |
|
| 69 | + cb()->validation(['name', 'email', 'cb_roles_id']); |
|
| 70 | 70 | |
| 71 | 71 | $user = []; |
| 72 | 72 | $user['name'] = request('name'); |
| 73 | 73 | $user['email'] = request('email'); |
| 74 | - if(request('password')) $user['password'] = Hash::make(request('password')); |
|
| 74 | + if (request('password')) $user['password'] = Hash::make(request('password')); |
|
| 75 | 75 | $user['cb_roles_id'] = request('cb_roles_id'); |
| 76 | - DB::table('users')->where('id',$id)->update($user); |
|
| 76 | + DB::table('users')->where('id', $id)->update($user); |
|
| 77 | 77 | |
| 78 | - return cb()->redirect(route("DeveloperUsersControllerGetIndex"),"The user has been updated!","success"); |
|
| 78 | + return cb()->redirect(route("DeveloperUsersControllerGetIndex"), "The user has been updated!", "success"); |
|
| 79 | 79 | |
| 80 | 80 | } catch (CBValidationException $e) { |
| 81 | 81 | return cb()->redirectBack($e->getMessage()); |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | public function getDelete($id) { |
| 86 | - DB::table("users")->where("id",$id)->delete(); |
|
| 87 | - return cb()->redirectBack("The user has been deleted!","success"); |
|
| 86 | + DB::table("users")->where("id", $id)->delete(); |
|
| 87 | + return cb()->redirectBack("The user has been deleted!", "success"); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | } |
| 91 | 91 | \ No newline at end of file |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | public function getIndex() { |
| 16 | 16 | $data = []; |
| 17 | 17 | $data['page_title'] = "Dashboard"; |
| 18 | - return view('crudbooster::dev_layouts.modules.dashboard',$data); |
|
| 18 | + return view('crudbooster::dev_layouts.modules.dashboard', $data); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | |
@@ -20,9 +20,9 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | public function indexRender($row, $column) |
| 22 | 22 | { |
| 23 | - if($column->getFormat()) { |
|
| 23 | + if ($column->getFormat()) { |
|
| 24 | 24 | return date($column->getFormat(), strtotime($row->{$column->getField()})); |
| 25 | - }else{ |
|
| 25 | + } else { |
|
| 26 | 26 | return $row->{$column->getField()}; |
| 27 | 27 | } |
| 28 | 28 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('cb_menus', function (Blueprint $table) { |
|
| 15 | + Schema::create('cb_menus', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments("id"); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->string("icon")->nullable(); |
@@ -20,9 +20,9 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | public function indexRender($row, $column) |
| 22 | 22 | { |
| 23 | - if($column->getFormat()) { |
|
| 23 | + if ($column->getFormat()) { |
|
| 24 | 24 | return date($column->getFormat(), strtotime($row->{$column->getField()})); |
| 25 | - }else{ |
|
| 25 | + } else { |
|
| 26 | 26 | return $row->{$column->getField()}; |
| 27 | 27 | } |
| 28 | 28 | } |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace crocodicstudio\crudbooster\helpers; |
| 3 | 3 | |
| 4 | -class UserSession { |
|
| 4 | +class UserSession { |
|
| 5 | 5 | |
| 6 | 6 | public function user() |
| 7 | 7 | { |
@@ -21,14 +21,14 @@ discard block |
||
| 21 | 21 | public function photo() |
| 22 | 22 | { |
| 23 | 23 | $user = $this->user(); |
| 24 | - return ($user->photo)?asset($user->photo):asset(dummyPhoto()); |
|
| 24 | + return ($user->photo) ?asset($user->photo) : asset(dummyPhoto()); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function roleName() |
| 28 | 28 | { |
| 29 | 29 | $user = $this->user(); |
| 30 | 30 | $role = cb()->find("cb_roles", $user->cb_roles_id); |
| 31 | - if($role) return $role->name; |
|
| 31 | + if ($role) return $role->name; |
|
| 32 | 32 | else return null; |
| 33 | 33 | } |
| 34 | 34 | |
@@ -11,11 +11,11 @@ discard block |
||
| 11 | 11 | public function getIndex() { |
| 12 | 12 | $data = []; |
| 13 | 13 | $data['page_title'] = 'Profile'; |
| 14 | - return view('crudbooster::profile',$data); |
|
| 14 | + return view('crudbooster::profile', $data); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | public function postUpdate() { |
| 18 | - validator(request()->all(),[ |
|
| 18 | + validator(request()->all(), [ |
|
| 19 | 19 | 'name'=>'required|max:255|min:3', |
| 20 | 20 | 'email'=>'required|email', |
| 21 | 21 | 'photo'=>'image', |
@@ -26,19 +26,19 @@ discard block |
||
| 26 | 26 | $data = []; |
| 27 | 27 | $data['name'] = request('name'); |
| 28 | 28 | $data['email'] = request('email'); |
| 29 | - if(request('password')) { |
|
| 29 | + if (request('password')) { |
|
| 30 | 30 | $data['password'] = Hash::make(request('password')); |
| 31 | 31 | } |
| 32 | - if(request()->hasFile('photo')) { |
|
| 32 | + if (request()->hasFile('photo')) { |
|
| 33 | 33 | $data['photo'] = cb()->uploadFile('photo', true, 200, 200); |
| 34 | 34 | } |
| 35 | 35 | DB::table("users")->where("id", auth()->id())->update($data); |
| 36 | - }catch (\Exception $e) { |
|
| 36 | + } catch (\Exception $e) { |
|
| 37 | 37 | Log::error($e); |
| 38 | - return cb()->redirectBack("Something went wrong!","warning"); |
|
| 38 | + return cb()->redirectBack("Something went wrong!", "warning"); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - return cb()->redirectBack("The profile data has been updated!","success"); |
|
| 41 | + return cb()->redirectBack("The profile data has been updated!", "success"); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | private function assignToModel($menu) { |
| 23 | 23 | $model = new SidebarModel(); |
| 24 | 24 | $model->setId($menu->id); |
| 25 | - if($menu->type == "url") { |
|
| 25 | + if ($menu->type == "url") { |
|
| 26 | 26 | $model->setUrl($menu->path); |
| 27 | 27 | $model->setIcon($menu->icon); |
| 28 | 28 | $model->setName($menu->name); |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl())); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - if(request()->is($model->getBasepath()."*")) { |
|
| 46 | + if (request()->is($model->getBasepath()."*")) { |
|
| 47 | 47 | $model->setIsActive(true); |
| 48 | - }else{ |
|
| 48 | + } else { |
|
| 49 | 49 | $model->setIsActive(false); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -54,22 +54,22 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | private function loadData($parent_id = null) { |
| 56 | 56 | $menus = DB::table("cb_menus"); |
| 57 | - if($parent_id) { |
|
| 58 | - $menus->where("parent_cb_menus_id",$parent_id); |
|
| 59 | - }else{ |
|
| 57 | + if ($parent_id) { |
|
| 58 | + $menus->where("parent_cb_menus_id", $parent_id); |
|
| 59 | + } else { |
|
| 60 | 60 | $menus->whereNull("parent_cb_menus_id"); |
| 61 | 61 | } |
| 62 | - return $menus->orderBy("sort_number","asc")->get(); |
|
| 62 | + return $menus->orderBy("sort_number", "asc")->get(); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | private function rolePrivilege($cb_roles_id, $cb_menus_id) { |
| 66 | - return cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id]); |
|
| 66 | + return cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id]); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - private function checkPrivilege($roles_id,$menu) { |
|
| 70 | - if($roles_id) { |
|
| 69 | + private function checkPrivilege($roles_id, $menu) { |
|
| 70 | + if ($roles_id) { |
|
| 71 | 71 | $privilege = $this->rolePrivilege($roles_id, $menu->id); |
| 72 | - if($privilege && !$privilege->can_browse) { |
|
| 72 | + if ($privilege && !$privilege->can_browse) { |
|
| 73 | 73 | return false; |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -78,36 +78,36 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | public function all($withPrivilege = true) { |
| 81 | - $roles_id = ($withPrivilege)?cb()->session()->roleId():null; |
|
| 81 | + $roles_id = ($withPrivilege) ?cb()->session()->roleId() : null; |
|
| 82 | 82 | $menus = $this->loadData(); |
| 83 | 83 | $result = []; |
| 84 | 84 | $menus_active = false; |
| 85 | - foreach($menus as $menu) { |
|
| 85 | + foreach ($menus as $menu) { |
|
| 86 | 86 | |
| 87 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
| 87 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
| 88 | 88 | |
| 89 | 89 | $sidebarModel = $this->assignToModel($menu); |
| 90 | - if($sidebarModel->getisActive()) $menus_active = true; |
|
| 91 | - if($menus2 = $this->loadData($menu->id)) { |
|
| 90 | + if ($sidebarModel->getisActive()) $menus_active = true; |
|
| 91 | + if ($menus2 = $this->loadData($menu->id)) { |
|
| 92 | 92 | $sub1 = []; |
| 93 | 93 | $menus2_active = false; |
| 94 | 94 | foreach ($menus2 as $menu2) { |
| 95 | 95 | |
| 96 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
| 96 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
| 97 | 97 | |
| 98 | 98 | $sidebarModel2 = $this->assignToModel($menu2); |
| 99 | - if($sidebarModel2->getisActive()) $menus2_active = true; |
|
| 99 | + if ($sidebarModel2->getisActive()) $menus2_active = true; |
|
| 100 | 100 | |
| 101 | - if($menus3 = $this->loadData($menu2->id)) { |
|
| 101 | + if ($menus3 = $this->loadData($menu2->id)) { |
|
| 102 | 102 | $sub2 = []; |
| 103 | 103 | $menus3_active = false; |
| 104 | 104 | foreach ($menus3 as $menu3) { |
| 105 | 105 | |
| 106 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
| 106 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
| 107 | 107 | |
| 108 | 108 | $sidebarModel3 = $this->assignToModel($menu3); |
| 109 | 109 | |
| 110 | - if($sidebarModel3->getisActive()) { |
|
| 110 | + if ($sidebarModel3->getisActive()) { |
|
| 111 | 111 | $menus3_active = true; |
| 112 | 112 | } |
| 113 | 113 | |