Completed
Pull Request — develop (#46)
by Tony
10:18
created
app/Api/Controllers/APIController.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/DeviceController.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/Api/Controllers/PortController.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.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,6 @@
 block discarded – undo
6 6
 use App\User;
7 7
 use App\Port;
8 8
 use App\Api\Transformers\PortTransformer;
9
-
10 9
 use Illuminate\Http\Request;
11 10
 use Dingo\Api\Routing\Helpers;
12 11
 use Illuminate\Support\Facades\Input;
Please login to merge, or discard this patch.
app/Http/Controllers/NotificationController.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.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use Illuminate\Contracts\Auth\Guard;
6 6
 use Dingo\Api\Http;
7 7
 use Dingo\Api\Routing\Helpers;
8
-use Illuminate\Http\Request;
9 8
 
10 9
 class SetViewVariable
11 10
 {
Please login to merge, or discard this patch.
app/Api/Controllers/NotificationController.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use Dingo\Api\Http;
6 6
 use Dingo\Api\Routing\Helpers;
7 7
 use App\Notification;
8
-use App\NotificationAttrib;
9 8
 use Illuminate\Http\Request;
10 9
 
11 10
 class NotificationController extends Controller
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,8 +26,7 @@  discard block
 block discarded – undo
26 26
         if ($type === 'archive')
27 27
         {
28 28
             $notifications = Notification::IsArchived($request)->get();
29
-        }
30
-        else {
29
+        } else {
31 30
             $notifications = Notification::IsUnread()->get();
32 31
         }
33 32
         return $notifications;
@@ -44,15 +43,13 @@  discard block
 block discarded – undo
44 43
 
45 44
         if ($action == 'read') {
46 45
            $result = $notification->markRead($enable);
47
-        }
48
-        elseif ($action == 'sticky') {
46
+        } elseif ($action == 'sticky') {
49 47
            $result = $notification->markSticky(false);
50 48
         }
51 49
 
52 50
         if ($result === false) {
53 51
             return $this->response->errorInternal();
54
-        }
55
-        else {
52
+        } else {
56 53
             return $this->response->array(array('statusText'=>'OK'));
57 54
         }
58 55
     }
Please login to merge, or discard this patch.
app/Notification.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.