murrant / librenmsv2

app/Facades/Settings.php

Indentation +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /**
- * Settings.php
- *
- * @package    LibreNMS
- * @author     Tony Murray <murraytony@gmail.com>
- * @copyright  2016 Tony Murray
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
- */
+     * Settings.php
+     *
+     * @package    LibreNMS
+     * @author     Tony Murray <murraytony@gmail.com>
+     * @copyright  2016 Tony Murray
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
+     */
 namespace App\Facades;
 use Illuminate\Support\Facades\Facade;
 

app/Api/Controllers/PortController.php

Braces +2 added lines, -4 removed lines

@@ -26,8 +26,7 @@ 
     {
         if (Auth::user()->hasGlobalRead()) {
             $ports = Port::all();
-        }
-        else {
+        } else {
             $ports = Auth::user()->ports()->get();
         }
 
@@ -70,8 +69,7 @@ 
     {
         if ($request->user()->hasGlobalRead()) {
             return Port::find($id);
-        }
-        else {
+        } else {
             $user = User::find($request->user()->user_id);
             return $user->ports()->find($id);
         }

app/Api/Controllers/APIController.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
         $versions['db_schema'] = DB::select('SELECT `version` FROM `dbSchema` LIMIT 1')[0]->version;
         $versions['php']       = phpversion();
         $versions['db_driver'] = strtoupper(DB::connection()->getDriverName());
-	if ($versions['db_driver'] == 'SQLITE') {
+    if ($versions['db_driver'] == 'SQLITE') {
             $versions['db_version'] = DB::select('SELECT sqlite_version() AS version')[0]->version;
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
         $versions['db_driver'] = strtoupper(DB::connection()->getDriverName());
 	if ($versions['db_driver'] == 'SQLITE') {
             $versions['db_version'] = DB::select('SELECT sqlite_version() AS version')[0]->version;
-        }
-        else {
+        } else {
             $versions['db_version'] = DB::select('SELECT version() AS version')[0]->version;
         }
         return $versions;

app/Api/Controllers/DeviceController.php

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
         // fetch devices from the database
         if ($request->user()->hasGlobalRead()) {
             $devices = Device::all();
-        }
-        else {
+        } else {
             $devices = User::find($request->user()->user_id)->devices()->get();
         }
         // morph the data as required
@@ -64,8 +63,7 @@ 
     {
         if ($request->user()->hasGlobalRead()) {
             $device = Device::find($id);
-        }
-        else {
+        } else {
             $user = User::find($request->user()->user_id);
             $device =  $user->devices()->find($id);
         }

app/Api/Controllers/NotificationController.php

Indentation +2 added lines, -2 removed lines

@@ -44,10 +44,10 @@
         }
 
         if ($action == 'read') {
-           $result = $notification->markRead($enable);
+            $result = $notification->markRead($enable);
         }
         elseif ($action == 'sticky') {
-           $result = $notification->markSticky(false);
+            $result = $notification->markSticky(false);
         }
 
         if ($result === false) {

Braces +4 added lines, -8 removed lines

@@ -27,8 +27,7 @@ 
         if ($type === 'archive')
         {
             $notifications = Notification::IsArchived($request)->get();
-        }
-        else {
+        } else {
             $notifications = Notification::IsUnread()->get();
         }
         return $notifications;
@@ -45,15 +44,13 @@ 
 
         if ($action == 'read') {
            $result = $notification->markRead($enable);
-        }
-        elseif ($action == 'sticky') {
+        } elseif ($action == 'sticky') {
            $result = $notification->markSticky(false);
         }
 
         if ($result === false) {
             return $this->response->errorInternal();
-        }
-        else {
+        } else {
             return $this->response->array(array('statusText' => 'OK'));
         }
     }
@@ -73,8 +70,7 @@ 
         if ($notification->save())
         {
             return $this->response->array(array('statusText' => 'OK'));
-        }
-        else {
+        } else {
             return $this->response->errorInternal();
         }
     }

app/Models/Notification.php

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
             $read->value            = 1;
 
             return $this->attribs()->save($read);
-        }
-        else {
+        } else {
             return $this->attribs()->where('key', $name)->delete();
         }
     }

app/Settings.php

Indentation +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /**
- * Settings.php
- *
- * @package    LibreNMS
- * @author     Tony Murray <murraytony@gmail.com>
- * @copyright  2016 Tony Murray
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
- */
+     * Settings.php
+     *
+     * @package    LibreNMS
+     * @author     Tony Murray <murraytony@gmail.com>
+     * @copyright  2016 Tony Murray
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
+     */
 namespace App;
 
 

Braces +6 added lines, -12 removed lines

@@ -70,19 +70,16 @@ 
                     if (is_string($k) && !str_contains($k, '.') && DbConfig::exactKey($key)->exists() && DbConfig::key($key)->count() == 1) {
                         // check that we aren't trying to set an array onto an existing value only setting
                         throw new \Exception("Attempting to set array value to existing non-array value at the key '" . $key . "'");
-                    }
-                    else {
+                    } else {
                         // we are not at the leaf yet, add this chunk to the key and recurse
                         $this->set($key . '.' . $k, $v);
                     }
-                }
-                else {
+                } else {
                     // a leaf, recurse one last time
                     $this->set($k, $v);
                 }
             }
-        }
-        else {
+        } else {
             // make sure we can save this
             if ($this->isReadOnly($key)) {
                 throw new \Exception("The setting '" . $key . "' is read only");
@@ -122,16 +119,14 @@ 
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
                 // return a value if we are getting one item
                 return $db_data->first()->config_value;
-            }
-            elseif (count($db_data) >= 1) {
+            } elseif (count($db_data) >= 1) {
                 // convert the collection to an array
                 $result = self::collectionToArray($db_data, $key);
 
                 // if we have config_data, merge them
                 if (isset($config_data)) {
                     return array_replace_recursive($result, $config_data);
-                }
-                else {
+                } else {
                     return $result;
                 }
             }
@@ -227,8 +222,7 @@ 
         if (is_null($key)) {
             // Clear all cache
             Cache::tags(self::$cache_tag)->flush();
-        }
-        else {
+        } else {
             // Clear specific path
             $path = [];
             foreach (explode('.', $key) as $element) {

app/Console/Commands/AddUser.php

Braces +4 added lines, -8 removed lines

@@ -56,16 +56,14 @@ 
         // set realname
         if ($this->option('realname')) {
             $user->realname = $this->option('realname');
-        }
-        else {
+        } else {
             $user->realname = $this->ask('Real Name');
         }
 
         // set email
         if ($this->option('email')) {
             $user->email = $this->option('email');
-        }
-        else {
+        } else {
             $user->email = $this->ask('Email');
         }
 
@@ -81,16 +79,14 @@ 
         // set password
         if ($this->argument('password')) {
             $user->password = bcrypt($this->argument('password'));
-        }
-        else {
+        } else {
             $user->password = bcrypt($this->secret('Password'));
         }
 
         // save user
         if ($user->save()) {
             $this->info('User ' . $user->username . ' created.');
-        }
-        else {
+        } else {
             $this->error('Failed to create user ' . $user->username);
         }
     }

app/Providers/SettingsServiceProvider.php

Indentation +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /**
- * SettingsServiceProvider.php
- *
- * @package    LibreNMS
- * @author     Tony Murray <murraytony@gmail.com>
- * @copyright  2016 Tony Murray
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
- */
+     * SettingsServiceProvider.php
+     *
+     * @package    LibreNMS
+     * @author     Tony Murray <murraytony@gmail.com>
+     * @copyright  2016 Tony Murray
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
+     */
 
 namespace App\Providers;