@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function map(Router $router) |
| 39 | 39 | { |
| 40 | - $router->group(['namespace' => $this->namespace], function ($router) { |
|
| 40 | + $router->group(['namespace' => $this->namespace], function($router) { |
|
| 41 | 41 | require app_path('Http/routes.php'); |
| 42 | 42 | }); |
| 43 | 43 | } |
@@ -17,8 +17,7 @@ |
||
| 17 | 17 | public function list_devices(Request $request) { |
| 18 | 18 | if ($request->user()->level >= 10 || $request->user()->level == 5) { |
| 19 | 19 | return Devices::all(); |
| 20 | - } |
|
| 21 | - else { |
|
| 20 | + } else { |
|
| 22 | 21 | return User::find($request->user()->user_id)->devices()->get(); |
| 23 | 22 | } |
| 24 | 23 | } |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | $stats['ports'] = \App\Port::all()->count(); |
| 36 | 36 | $stats['syslog'] = \App\Syslog::all()->count(); |
| 37 | 37 | $stats['eventlog'] = \App\Eventlog::all()->count(); |
| 38 | - $stats['apps'] = DB::table('applications')->count();; |
|
| 38 | + $stats['apps'] = DB::table('applications')->count(); ; |
|
| 39 | 39 | $stats['services'] = DB::table('services')->count(); |
| 40 | 40 | $stats['storage'] = DB::table('storage')->count(); |
| 41 | 41 | $stats['diskio'] = DB::table('ucd_diskio')->count(); |
@@ -19,8 +19,7 @@ discard block |
||
| 19 | 19 | public function list_devices(Request $request) { |
| 20 | 20 | if ($request->user()->level >= 10 || $request->user()->level == 5) { |
| 21 | 21 | return Device::all(); |
| 22 | - } |
|
| 23 | - else { |
|
| 22 | + } else { |
|
| 24 | 23 | return User::find($request->user()->user_id)->devices()->get(); |
| 25 | 24 | } |
| 26 | 25 | } |
@@ -31,8 +30,7 @@ discard block |
||
| 31 | 30 | public function list_ports(Request $request) { |
| 32 | 31 | if ($request->user()->level >= 10 || $request->user()->level == 5) { |
| 33 | 32 | return Port::all(); |
| 34 | - } |
|
| 35 | - else { |
|
| 33 | + } else { |
|
| 36 | 34 | return User::find($request->user()->user_id)->ports()->get(); |
| 37 | 35 | } |
| 38 | 36 | } |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | } |
| 68 | 68 | else { |
| 69 | 69 | $user = User::find($request->user()->user_id); |
| 70 | - $device = $user->devices()->find($id); |
|
| 70 | + $device = $user->devices()->find($id); |
|
| 71 | 71 | } |
| 72 | 72 | // morph the data as required |
| 73 | 73 | if ($request->query('displayFormat') == 'link') { |
@@ -19,8 +19,7 @@ discard block |
||
| 19 | 19 | public function list_devices(Request $request) { |
| 20 | 20 | if ($request->user()->level >= 10 || $request->user()->level == 5) { |
| 21 | 21 | return Device::all(); |
| 22 | - } |
|
| 23 | - else { |
|
| 22 | + } else { |
|
| 24 | 23 | return User::find($request->user()->user_id)->devices()->get(); |
| 25 | 24 | } |
| 26 | 25 | } |
@@ -31,8 +30,7 @@ discard block |
||
| 31 | 30 | public function list_ports(Request $request) { |
| 32 | 31 | if ($request->user()->level >= 10 || $request->user()->level == 5) { |
| 33 | 32 | return Port::all(); |
| 34 | - } |
|
| 35 | - else { |
|
| 33 | + } else { |
|
| 36 | 34 | return User::find($request->user()->user_id)->ports()->get(); |
| 37 | 35 | } |
| 38 | 36 | } |
@@ -17,8 +17,7 @@ |
||
| 17 | 17 | public function list_devices(Request $request) { |
| 18 | 18 | if ($request->user()->level >= 10 || $request->user()->level == 5) { |
| 19 | 19 | return Devices::all(); |
| 20 | - } |
|
| 21 | - else { |
|
| 20 | + } else { |
|
| 22 | 21 | return User::find($request->user()->user_id)->devices()->get(); |
| 23 | 22 | } |
| 24 | 23 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | $notification = Notification::find($id); |
| 41 | 41 | $enable = strpos($action, 'un') === false; |
| 42 | - if(!$enable) { |
|
| 42 | + if (!$enable) { |
|
| 43 | 43 | $action = substr($action, 2); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $notification = new Notification; |
| 69 | 69 | $notification->title = $request->title; |
| 70 | 70 | $notification->body = $request->body; |
| 71 | - $notification->checksum = hash('sha512',$request->user()->user_id.'.LOCAL.'.$request->title); |
|
| 71 | + $notification->checksum = hash('sha512', $request->user()->user_id.'.LOCAL.'.$request->title); |
|
| 72 | 72 | $notification->source = $request->user()->user_id; |
| 73 | 73 | if ($notification->save()) |
| 74 | 74 | { |
@@ -27,8 +27,7 @@ discard block |
||
| 27 | 27 | if ($type === 'archive') |
| 28 | 28 | { |
| 29 | 29 | $notifications = Notification::IsArchived($request)->get(); |
| 30 | - } |
|
| 31 | - else { |
|
| 30 | + } else { |
|
| 32 | 31 | $notifications = Notification::IsUnread()->get(); |
| 33 | 32 | } |
| 34 | 33 | return $notifications; |
@@ -45,15 +44,13 @@ discard block |
||
| 45 | 44 | |
| 46 | 45 | if ($action == 'read') { |
| 47 | 46 | $result = $notification->markRead($enable); |
| 48 | - } |
|
| 49 | - elseif ($action == 'sticky') { |
|
| 47 | + } elseif ($action == 'sticky') { |
|
| 50 | 48 | $result = $notification->markSticky(false); |
| 51 | 49 | } |
| 52 | 50 | |
| 53 | 51 | if ($result === false) { |
| 54 | 52 | return $this->response->errorInternal(); |
| 55 | - } |
|
| 56 | - else { |
|
| 53 | + } else { |
|
| 57 | 54 | return $this->response->array(array('statusText' => 'OK')); |
| 58 | 55 | } |
| 59 | 56 | } |
@@ -73,8 +70,7 @@ discard block |
||
| 73 | 70 | if ($notification->save()) |
| 74 | 71 | { |
| 75 | 72 | return $this->response->array(array('statusText' => 'OK')); |
| 76 | - } |
|
| 77 | - else { |
|
| 73 | + } else { |
|
| 78 | 74 | return $this->response->errorInternal(); |
| 79 | 75 | } |
| 80 | 76 | } |
@@ -17,8 +17,7 @@ |
||
| 17 | 17 | public function list_devices(Request $request) { |
| 18 | 18 | if ($request->user()->level >= 10 || $request->user()->level == 5) { |
| 19 | 19 | return Devices::all(); |
| 20 | - } |
|
| 21 | - else { |
|
| 20 | + } else { |
|
| 22 | 21 | return User::find($request->user()->user_id)->devices()->get(); |
| 23 | 22 | } |
| 24 | 23 | } |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | |
| 71 | 71 | public function scopeLimit($query) |
| 72 | 72 | { |
| 73 | - return $query->select('notifications.*','key', 'users.username'); |
|
| 73 | + return $query->select('notifications.*', 'key', 'users.username'); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | public function scopeSource($query) |
@@ -17,8 +17,7 @@ |
||
| 17 | 17 | public function list_devices(Request $request) { |
| 18 | 18 | if ($request->user()->level >= 10 || $request->user()->level == 5) { |
| 19 | 19 | return Devices::all(); |
| 20 | - } |
|
| 21 | - else { |
|
| 20 | + } else { |
|
| 22 | 21 | return User::find($request->user()->user_id)->devices()->get(); |
| 23 | 22 | } |
| 24 | 23 | } |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | // set username |
| 50 | 50 | $user->username = $this->argument('username'); |
| 51 | 51 | if (User::where('username', $user->username)->exists()) { |
| 52 | - $this->error('User ' . $user->username . ' exists.'); |
|
| 52 | + $this->error('User '.$user->username.' exists.'); |
|
| 53 | 53 | return; |
| 54 | 54 | } |
| 55 | 55 | |
@@ -88,10 +88,10 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | // save user |
| 90 | 90 | if ($user->save()) { |
| 91 | - $this->info('User ' . $user->username . ' created.'); |
|
| 91 | + $this->info('User '.$user->username.' created.'); |
|
| 92 | 92 | } |
| 93 | 93 | else { |
| 94 | - $this->error('Failed to create user ' . $user->username); |
|
| 94 | + $this->error('Failed to create user '.$user->username); |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | } |
@@ -56,16 +56,14 @@ discard block |
||
| 56 | 56 | // set realname |
| 57 | 57 | if ($this->option('realname')) { |
| 58 | 58 | $user->realname = $this->option('realname'); |
| 59 | - } |
|
| 60 | - else { |
|
| 59 | + } else { |
|
| 61 | 60 | $user->realname = $this->ask('Real Name'); |
| 62 | 61 | } |
| 63 | 62 | |
| 64 | 63 | // set email |
| 65 | 64 | if ($this->option('email')) { |
| 66 | 65 | $user->email = $this->option('email'); |
| 67 | - } |
|
| 68 | - else { |
|
| 66 | + } else { |
|
| 69 | 67 | $user->email = $this->ask('Email'); |
| 70 | 68 | } |
| 71 | 69 | |
@@ -81,16 +79,14 @@ discard block |
||
| 81 | 79 | // set password |
| 82 | 80 | if ($this->argument('password')) { |
| 83 | 81 | $this->password = bcrypt($this->argument('password')); |
| 84 | - } |
|
| 85 | - else { |
|
| 82 | + } else { |
|
| 86 | 83 | $user->password = bcrypt($this->secret('Password')); |
| 87 | 84 | } |
| 88 | 85 | |
| 89 | 86 | // save user |
| 90 | 87 | if ($user->save()) { |
| 91 | 88 | $this->info('User ' . $user->username . ' created.'); |
| 92 | - } |
|
| 93 | - else { |
|
| 89 | + } else { |
|
| 94 | 90 | $this->error('Failed to create user ' . $user->username); |
| 95 | 91 | } |
| 96 | 92 | } |