Completed
Pull Request — develop (#57)
by Tony
06:32
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 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
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.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,6 @@
 block discarded – undo
3 3
 namespace App\Api\Controllers;
4 4
 
5 5
 use App\Models\Notification;
6
-use App\Models\NotificationAttrib;
7
-use App\Models\User;
8 6
 use Dingo\Api\Http;
9 7
 use Dingo\Api\Routing\Helpers;
10 8
 use Illuminate\Http\Request;
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 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/Http/Controllers/SettingsController.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,6 @@
 block discarded – undo
17 17
 
18 18
 namespace App\Http\Controllers;
19 19
 
20
-use App\Http\Requests;
21
-use App\Models\DbConfig;
22 20
 use Illuminate\Http\Request;
23 21
 use Settings;
24 22
 
Please login to merge, or discard this patch.
app/Settings.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -50,8 +50,7 @@  discard block
 block discarded – undo
50 50
                 DbConfig::updateOrCreate(['config_name' => $k], ['config_value' => $v]);
51 51
                 Cache::put($k, $v, $this->cache_time);
52 52
             }
53
-        }
54
-        else {
53
+        } else {
55 54
             DbConfig::updateOrCreate(['config_name' => $key], ['config_value' => $value]);
56 55
             Cache::put($key, $value, $this->cache_time);
57 56
         }
@@ -68,16 +67,14 @@  discard block
 block discarded – undo
68 67
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
69 68
                 // return a bare value if we are getting one item
70 69
                 return $db_data->first()->config_value;
71
-            }
72
-            elseif (count($db_data) >= 1) {
70
+            } elseif (count($db_data) >= 1) {
73 71
                 $result = self::collectionToArray($db_data, $key);
74 72
                 $config = Config::get('config.' . $key, $default);
75 73
                 if (!is_null($config)) {
76 74
                     $result = array_replace_recursive($config, $result);
77 75
                 }
78 76
                 return $result;
79
-            }
80
-            else {
77
+            } else {
81 78
                 return Config::get('config.' . $key, $default);
82 79
             }
83 80
 
@@ -166,8 +163,7 @@  discard block
 block discarded – undo
166 163
             $currentPath = array_merge($path, array($key));
167 164
             if (is_array($val)) {
168 165
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
169
-            }
170
-            else {
166
+            } else {
171 167
                 $result[$prefix . join('.', $currentPath)] = $val;
172 168
             }
173 169
         }
Please login to merge, or discard this patch.