@@ -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 | } |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | $versions['db_schema'] = DB::select('SELECT `version` FROM `dbSchema` LIMIT 1')[0]->version; |
| 17 | 17 | $versions['php'] = phpversion(); |
| 18 | 18 | $versions['db_driver'] = strtoupper(DB::connection()->getDriverName()); |
| 19 | - if ($versions['db_driver'] == 'SQLITE') { |
|
| 19 | + if ($versions['db_driver'] == 'SQLITE') { |
|
| 20 | 20 | $versions['db_version'] = DB::select('SELECT sqlite_version() AS version')[0]->version; |
| 21 | 21 | } |
| 22 | 22 | else { |
@@ -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 | } |
@@ -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 | } |
@@ -43,10 +43,10 @@ |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | if ($action == 'read') { |
| 46 | - $result = $notification->markRead($enable); |
|
| 46 | + $result = $notification->markRead($enable); |
|
| 47 | 47 | } |
| 48 | 48 | elseif ($action == 'sticky') { |
| 49 | - $result = $notification->markSticky(false); |
|
| 49 | + $result = $notification->markSticky(false); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | if ($result === false) { |
@@ -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 | } |
@@ -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 | } |
@@ -15,13 +15,13 @@ |
||
| 15 | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | 16 | */ |
| 17 | 17 | /** |
| 18 | - * Settings.php |
|
| 19 | - * |
|
| 20 | - * @package LibreNMS |
|
| 21 | - * @author Tony Murray <[email protected]> |
|
| 22 | - * @copyright 2016 Tony Murray |
|
| 23 | - * @license @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later |
|
| 24 | - */ |
|
| 18 | + * Settings.php |
|
| 19 | + * |
|
| 20 | + * @package LibreNMS |
|
| 21 | + * @author Tony Murray <[email protected]> |
|
| 22 | + * @copyright 2016 Tony Murray |
|
| 23 | + * @license @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later |
|
| 24 | + */ |
|
| 25 | 25 | namespace App\Settings; |
| 26 | 26 | |
| 27 | 27 | |
@@ -15,13 +15,13 @@ |
||
| 15 | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | 16 | */ |
| 17 | 17 | /** |
| 18 | - * Settings.php |
|
| 19 | - * |
|
| 20 | - * @package LibreNMS |
|
| 21 | - * @author Tony Murray <[email protected]> |
|
| 22 | - * @copyright 2016 Tony Murray |
|
| 23 | - * @license @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later |
|
| 24 | - */ |
|
| 18 | + * Settings.php |
|
| 19 | + * |
|
| 20 | + * @package LibreNMS |
|
| 21 | + * @author Tony Murray <[email protected]> |
|
| 22 | + * @copyright 2016 Tony Murray |
|
| 23 | + * @license @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later |
|
| 24 | + */ |
|
| 25 | 25 | namespace App\Settings; |
| 26 | 26 | |
| 27 | 27 | |
@@ -76,8 +76,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |