librenms / librenmsv2

app/Providers/RouteServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     public function map(Router $router)
     {
-        $router->group(['namespace' => $this->namespace], function ($router) {
+        $router->group(['namespace' => $this->namespace], function($router) {
             require app_path('Http/routes.php');
         });
     }

app/Api/Controllers/APIController.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
     public function list_devices(Request $request) {
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
             return Devices::all();
-        }
-        else {
+        } else {
             return User::find($request->user()->user_id)->devices()->get();
         }
     }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         $stats['ports']      = \App\Port::all()->count();
         $stats['syslog']     = \App\Syslog::all()->count();
         $stats['eventlog']   = \App\Eventlog::all()->count();
-        $stats['apps']       = DB::table('applications')->count();;
+        $stats['apps']       = DB::table('applications')->count(); ;
         $stats['services']   = DB::table('services')->count();
         $stats['storage']    = DB::table('storage')->count();
         $stats['diskio']     = DB::table('ucd_diskio')->count();

app/Api/Controllers/DeviceController.php

Braces +2 added lines, -4 removed lines

@@ -19,8 +19,7 @@ 
     public function list_devices(Request $request) {
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
             return Device::all();
-        }
-        else {
+        } else {
             return User::find($request->user()->user_id)->devices()->get();
         }
     }
@@ -31,8 +30,7 @@ 
     public function list_ports(Request $request) {
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
             return Port::all();
-        }
-        else {
+        } else {
             return User::find($request->user()->user_id)->ports()->get();
         }
     }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         }
         else {
             $user = User::find($request->user()->user_id);
-            $device =  $user->devices()->find($id);
+            $device = $user->devices()->find($id);
         }
         // morph the data as required
         if ($request->query('displayFormat') == 'link') {

app/Api/Controllers/PortController.php

Braces +2 added lines, -4 removed lines

@@ -19,8 +19,7 @@ 
     public function list_devices(Request $request) {
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
             return Device::all();
-        }
-        else {
+        } else {
             return User::find($request->user()->user_id)->devices()->get();
         }
     }
@@ -31,8 +30,7 @@ 
     public function list_ports(Request $request) {
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
             return Port::all();
-        }
-        else {
+        } else {
             return User::find($request->user()->user_id)->ports()->get();
         }
     }

app/Http/Controllers/NotificationController.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
     public function list_devices(Request $request) {
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
             return Devices::all();
-        }
-        else {
+        } else {
             return User::find($request->user()->user_id)->devices()->get();
         }
     }

app/Api/Controllers/NotificationController.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 
         $notification = Notification::find($id);
         $enable = strpos($action, 'un') === false;
-        if(!$enable) {
+        if (!$enable) {
             $action = substr($action, 2);
         }
 
@@ -68,7 +68,7 @@ 
         $notification = new Notification;
         $notification->title    = $request->title;
         $notification->body     = $request->body;
-        $notification->checksum = hash('sha512',$request->user()->user_id.'.LOCAL.'.$request->title);
+        $notification->checksum = hash('sha512', $request->user()->user_id.'.LOCAL.'.$request->title);
         $notification->source   = $request->user()->user_id;
         if ($notification->save())
         {

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/Http/Controllers/UserController.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
     public function list_devices(Request $request) {
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
             return Devices::all();
-        }
-        else {
+        } else {
             return User::find($request->user()->user_id)->devices()->get();
         }
     }

app/Models/Notification.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
     public function scopeLimit($query)
     {
-        return $query->select('notifications.*','key', 'users.username');
+        return $query->select('notifications.*', 'key', 'users.username');
     }
 
     public function scopeSource($query)

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
     public function list_devices(Request $request) {
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
             return Devices::all();
-        }
-        else {
+        } else {
             return User::find($request->user()->user_id)->devices()->get();
         }
     }

app/Settings/Settings.php

Spacing +7 added lines, -7 removed lines

@@ -64,13 +64,13 @@ 
             $value = $this->database->get($key, $default);
             if (is_array($value)) {
                 $value = self::pathToArray($value, $key);
-                $config = Config::get('config.' . $key, $default);
+                $config = Config::get('config.'.$key, $default);
                 if (!is_null($config)) {
                     $value = array_replace_recursive($config, $value);
                 }
             }
             elseif (is_null($value)) {
-                $value = Config::get('config.' . $key);
+                $value = Config::get('config.'.$key);
             }
 
 //FIXME: insert cache
@@ -101,7 +101,7 @@ 
         return array_replace_recursive($config_settings, $db_settings);
     }
 
-    protected static function pathToArray($data, $prefix="")
+    protected static function pathToArray($data, $prefix = "")
     {
         $tree = array();
         foreach ($data as $key => $value) {
@@ -120,15 +120,15 @@ 
         return $tree;
     }
 
-    protected static function arrayToPath($array, $prefix="")
+    protected static function arrayToPath($array, $prefix = "")
     {
         return self::recursive_keys($array, $prefix);
     }
 
-    private static function recursive_keys(array $array, $prefix="", array $path = array())
+    private static function recursive_keys(array $array, $prefix = "", array $path = array())
     {
         if ($prefix != "") {
-            $prefix = trim($prefix, '.') . '.';
+            $prefix = trim($prefix, '.').'.';
         }
         $result = array();
         foreach ($array as $key => $val) {
@@ -137,7 +137,7 @@ 
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
             }
             else {
-                $result[$prefix . join('.', $currentPath)] = $val;
+                $result[$prefix.join('.', $currentPath)] = $val;
             }
         }
         return $result;

Braces +3 added lines, -6 removed lines

@@ -49,8 +49,7 @@ 
                 $this->database->set($k, $v);
 //            Cache::put($key, $v);
             }
-        }
-        else {
+        } else {
             $this->database->set($key, $value);
         }
 //            Cache::put($key, $v);
@@ -68,8 +67,7 @@ 
                 if (!is_null($config)) {
                     $value = array_replace_recursive($config, $value);
                 }
-            }
-            elseif (is_null($value)) {
+            } elseif (is_null($value)) {
                 $value = Config::get('config.' . $key);
             }
 
@@ -135,8 +133,7 @@ 
             $currentPath = array_merge($path, array($key));
             if (is_array($val)) {
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
-            }
-            else {
+            } else {
                 $result[$prefix . join('.', $currentPath)] = $val;
             }
         }