murrant / librenmsv2

app/Http/Controllers/UserController.php

Doc Comments +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     /**
      * Update a notifications status.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update($id, $action)
     {
@@ -55,7 +55,7 @@ 
     /**
      * Create a new notification
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function create(Request $request)
     {

app/Http/Controllers/UserPortController.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
      * @param AdminOnlyRequest $request
      * @param $user_id
      * @param $port_id
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(AdminOnlyRequest $request, $user_id)
     {
@@ -69,7 +69,7 @@ 
      * @param AdminOnlyRequest $request
      * @param $user_id
      * @param $port_id
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(AdminOnlyRequest $request, $user_id, $port_id)
     {

app/Http/Controllers/UserDeviceController.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
      * @param AdminOnlyRequest $request
      * @param $user_id
      * @param $port_id
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(AdminOnlyRequest $request, $user_id)
     {
@@ -69,7 +69,7 @@ 
      * @param AdminOnlyRequest $request
      * @param $user_id
      * @param $port_id
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(AdminOnlyRequest $request, $user_id, $port_id)
     {

app/Http/Controllers/Widgets/WidgetDataController.php

Braces +8 added lines, -4 removed lines

@@ -82,7 +82,8 @@ 
         $uptime = Settings::get('uptime_warning', 84600);
         if ($request->user()->hasGlobalRead()) {
             $devices = Device::where('ignore', '=', 0)->get();
-        } else {
+        }
+        else {
             $devices = User::find($request->user()->user_id)->devices()->where('ignore', '=', 0)->get();
         }
         $count = ['warn' => 0, 'up' => 0, 'down' => 0];
@@ -90,10 +91,12 @@ 
             if ($device->status == 1) {
                 if (($device->uptime < $uptime) && ($device->uptime != '0')) {
                     $count['warn']++;
-                } else {
+                }
+                else {
                     $count['up']++;
                 }
-            } else {
+            }
+            else {
                 $count['down']++;
             }
         }
@@ -122,7 +125,8 @@ 
             $count['ports']['down'] = Port::isDown()->count();
             $count['ports']['ignored'] = Port::isIgnored()->count();
             $count['ports']['disabled'] = Port::isDisabled()->count();
-        } else {
+        }
+        else {
             $user = User::find($request->user()->user_id);
 
             $count['devices']['total'] = $user->devices()->count();

app/Http/Controllers/DeviceGroupController.php

Doc Comments +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function store(Request $request)
     {
@@ -70,7 +70,7 @@ 
      * Display the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function show($id)
     {
@@ -94,7 +94,7 @@ 
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(Request $request, $id)
     {
@@ -108,7 +108,7 @@ 
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function destroy($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/Models/DeviceGroup.php

Doc Comments +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
      * Convert a v1 device group pattern to v2 style
      *
      * @param $pattern
-     * @return array
+     * @return string
      */
     private function convertV1Pattern($pattern)
     {

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/QueryBuilderFilter.php

Doc Comments +3 added lines

@@ -38,6 +38,9 @@
         return json_encode(self::generateMacroFilter('alert.macros.rule', self::generateTableFilter()));
     }
 
+    /**
+     * @param string $setting
+     */
     private static function generateMacroFilter($setting, $filter = [])
     {
         foreach (Settings::get($setting, []) as $key => $value) {