Completed
Pull Request — develop (#57)
by Tony
06:31
created
app/Providers/RouteServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
app/Api/Controllers/APIController.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.
app/Api/Controllers/DeviceController.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
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') {
Please login to merge, or discard this patch.
app/Api/Controllers/PortController.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
app/Http/Controllers/NotificationController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
app/Api/Controllers/NotificationController.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
         {
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -27,8 +27,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
app/Http/Controllers/UserController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
app/Models/Notification.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
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)
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
app/Settings/DatabaseRepository.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         }
46 46
         elseif (count($results) == 1) {
47 47
             $entry = $results->first();
48
-            if($entry->config_name != $key) { //FIXME: better test
48
+            if ($entry->config_name != $key) { //FIXME: better test
49 49
                 // trim the prefix
50 50
                 $local_key = substr($entry->config_name, strlen($key) + 1);
51 51
                 return [$local_key => $entry->config_value];
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,8 +42,7 @@  discard block
 block discarded – undo
42 42
         $results = DbConfig::key($key)->get(['config_name', 'config_value']);
43 43
         if (count($results) > 1) {
44 44
             return $this->collectionToArray($results);
45
-        }
46
-        elseif (count($results) == 1) {
45
+        } elseif (count($results) == 1) {
47 46
             $entry = $results->first();
48 47
             if($entry->config_name != $key) { //FIXME: better test
49 48
                 // trim the prefix
@@ -53,8 +52,7 @@  discard block
 block discarded – undo
53 52
 
54 53
             $value = $entry->config_value;
55 54
             return is_null($value) ? $default : $value;
56
-        }
57
-        else {
55
+        } else {
58 56
             return $default;
59 57
         }
60 58
     }
Please login to merge, or discard this patch.