murrant / librenmsv2

app/Http/Middleware/Authenticate.php

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
         if (Auth::guard($guard)->guest()) {
             if ($request->ajax() || $request->wantsJson()) {
                 return response('Unauthorized.', 401);
-            } else {
+            }
+            else {
                 return redirect()->guest('login');
             }
         }

app/Models/DbConfig.php

Braces +2 added lines, -1 removed lines

@@ -102,7 +102,8 @@
             } catch(\Exception $e) {
                 if(starts_with($e->getMessage(), 'unserialize():')) {
                     return $value;
-                } else {
+                }
+                else {
                     throw $e;
                 }
             }

app/Http/Requests/UpdateUserRequest.php

Indentation +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     {
         if ($this->input('password')) {
             $rules = ['password'              => 'required|min:5|max:255',
-                      'password_confirmation' => 'required|same:password',
+                        'password_confirmation' => 'required|same:password',
             ];
             if (!Auth::user()->isAdmin()) {
                 $rules['current_password'] = 'required|password:user_id';

Braces +2 added lines, -1 removed lines

@@ -195,7 +195,8 @@
         $user = \Auth::user();
         if (!is_null($user) && $user->isAdmin()) {
             return false;
-        } else {
+        }
+        else {
             return 'auth';
         }
     }

app/Http/Controllers/SettingsController.php

Braces +2 added lines, -1 removed lines

@@ -76,7 +76,8 @@
         if ($type == 'settings-value') {
             Settings::set($key, Input::get('value'));
             return response('OK', 200);
-        } elseif ($type == 'settings-array') {
+        }
+        elseif ($type == 'settings-array') {
             $new = Input::get('value');
             $current = Settings::get($key);
 

app/Http/Controllers/DeviceGroupController.php

Braces +2 added lines, -1 removed lines

@@ -195,7 +195,8 @@
         $user = \Auth::user();
         if (!is_null($user) && $user->isAdmin()) {
             return false;
-        } else {
+        }
+        else {
             return 'auth';
         }
     }

app/Models/DeviceGroup.php

Braces +20 added lines, -10 removed lines

@@ -123,7 +123,8 @@ 
                     // can't build sql
                     return [];
                 }
-            } else {
+            }
+            else {
                 $params = $this->params;
             }
         }
@@ -134,7 +135,8 @@ 
         $query = null;
         if (count($tables) == 1) {
             $query = DB::table($tables[0])->select('device_id')->distinct();
-        } else {
+        }
+        else {
             $query = DB::table('devices')->select('devices.device_id')->distinct();
 
             foreach ($tables as $table) {
@@ -150,7 +152,8 @@ 
         // match the device ids
         if (is_null($params)) {
             return $query->whereRaw($statement)->pluck('device_id');
-        } else {
+        }
+        else {
             return $query->whereRaw($statement, $params)->pluck('device_id');
         }
     }
@@ -178,7 +181,8 @@ 
         if (str_contains($pattern, 'macros.')) {
             if (++$x < 30) {
                 $pattern = self::applyGroupMacros($pattern, $x);
-            } else {
+            }
+            else {
                 return false;
             }
         }
@@ -309,7 +313,8 @@ 
             if (starts_with($cur, '%')) {
                 // table and column or macro
                 $out .= substr($cur, 1).' ';
-            } elseif (substr($cur, -1) == '~') {
+            }
+            elseif (substr($cur, -1) == '~') {
                 // like operator
                 $content = $parts[++$i]; // grab the content so we can format it
 
@@ -320,14 +325,18 @@ 
 
                 $out .= "LIKE('".$this->convertRegexToLike($content)."') ";
 
-            } elseif ($cur == '&&') {
+            }
+            elseif ($cur == '&&') {
                 $out .= 'AND ';
-            } elseif ($cur == '||') {
+            }
+            elseif ($cur == '||') {
                 $out .= 'OR ';
-            } elseif (in_array($cur, $ops)) {
+            }
+            elseif (in_array($cur, $ops)) {
                 // pass-through operators
                 $out .= $cur.' ';
-            } else {
+            }
+            else {
                 // user supplied input
                 $out .= "'".trim($cur, '"\'')."' "; // TODO: remove trim, only needed with invalid input
             }
@@ -360,7 +369,8 @@ 
         // add ends appropriately
         if ($startAnchor && !$endAnchor) {
             $pattern .= '%';
-        } elseif (!$startAnchor && $endAnchor) {
+        }
+        elseif (!$startAnchor && $endAnchor) {
             $pattern = '%'.$pattern;
         }
 

app/DataTables/General/EventlogDataTable.php

Braces +2 added lines, -1 removed lines

@@ -195,7 +195,8 @@
         $user = \Auth::user();
         if (!is_null($user) && $user->isAdmin()) {
             return false;
-        } else {
+        }
+        else {
             return 'auth';
         }
     }

app/Data/RRDXport.php

Braces +2 added lines, -1 removed lines

@@ -64,7 +64,8 @@
 
         if ($format == 'json') {
             return $this->jsonSerialize();
-        } elseif ($format == 'csv') {
+        }
+        elseif ($format == 'csv') {
             return $this->csvSerialize();
         }
         return null;  // shouldn't get here

app/Graphs/Graph.php

Braces +6 added lines, -3 removed lines

@@ -52,7 +52,8 @@ 
         $this->request = $request;
         if (is_null($input)) {
             $this->input = json_decode($request->{'input'});
-        } else {
+        }
+        else {
             $this->input = $input;
         }
         $this->device = $this->fetchDevice();
@@ -72,10 +73,12 @@ 
         if ($sourceName === 'rrd') {
             if ($format == 'png') {
                 $source = $this->createRRDGraph();
-            } else {
+            }
+            else {
                 $source = $this->createRRDXport();
             }
-        } else {
+        }
+        else {
             throw new UnknownDataSourceException("Source type $source is not supported");
         }