Completed
Pull Request — develop (#57)
by Tony
12:28 queued 04:26
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 1 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 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/Console/Commands/AddUser.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -56,16 +56,14 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     }
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
@@ -76,8 +76,7 @@  discard block
 block discarded – undo
76 76
                 DbConfig::updateOrCreate(['config_name' => $k], ['config_value' => $v]);
77 77
                 Cache::tags(self::$cache_tag)->put($k, $v, $this->cache_time);
78 78
             }
79
-        }
80
-        else {
79
+        } else {
81 80
             DbConfig::updateOrCreate(['config_name' => $key], ['config_value' => $value]);
82 81
             Cache::tags(self::$cache_tag)->put($key, $value, $this->cache_time);
83 82
         }
@@ -106,8 +105,7 @@  discard block
 block discarded – undo
106 105
             $currentPath = array_merge($path, array($key));
107 106
             if (is_array($val)) {
108 107
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
109
-            }
110
-            else {
108
+            } else {
111 109
                 $result[$prefix . join('.', $currentPath)] = $val;
112 110
             }
113 111
         }
@@ -130,8 +128,7 @@  discard block
 block discarded – undo
130 128
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
131 129
                 // return a bare value if we are getting one item
132 130
                 return $db_data->first()->config_value;
133
-            }
134
-            elseif (count($db_data) >= 1) {
131
+            } elseif (count($db_data) >= 1) {
135 132
                 // convert collection to an array and merge with the config fallback
136 133
                 $result = self::collectionToArray($db_data, $key);
137 134
                 $config = Config::get('config.' . $key, $default);
@@ -139,8 +136,7 @@  discard block
 block discarded – undo
139 136
                     $result = array_replace_recursive($config, $result);
140 137
                 }
141 138
                 return $result;
142
-            }
143
-            else {
139
+            } else {
144 140
                 // fallback to the config or return the default value
145 141
                 return Config::get('config.' . $key, $default);
146 142
             }
Please login to merge, or discard this patch.