librenms / librenmsv2

app/DataTables/DeviceDataTable.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 
 namespace App\DataTables;
 
-use App\Models\DeviceGroup;
 use App\Models\Device;
 
 class DeviceDataTable extends BaseDataTable

app/Http/Controllers/DeviceController.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\DataTables\DeviceDataTable;
-use App\DataTables\DeviceGroupDataTable;
 use App\Models\DeviceGroup;
 use Dingo\Api\Http;
 use Dingo\Api\Routing\Helpers;

app/Http/Controllers/DeviceGroupController.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\Api\Controllers;
 
 use DB;
-use App\Http\Requests;
 use Illuminate\Http\Request;
 
 class ApiController extends Controller

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 +16 added lines, -8 removed lines

@@ -97,7 +97,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) {
@@ -136,7 +137,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
 
@@ -147,14 +149,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
             }
@@ -185,7 +191,8 @@ 
         // add ends appropriately
         if ($startAnchor && !$endAnchor) {
             $pattern .= '%';
-        } elseif (!$startAnchor && $endAnchor) {
+        }
+        elseif (!$startAnchor && $endAnchor) {
             $pattern = '%'.$pattern;
         }
 
@@ -220,7 +227,8 @@ 
         if (str_contains($pattern, 'macros.')) {
             if (++$x < 30) {
                 $pattern = self::applyGroupMacros($pattern, $x);
-            } else {
+            }
+            else {
                 return false;
             }
         }