murrant / 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();
         }
     }

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 {

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();
         }
     }

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/Api/Controllers/NotificationController.php

Indentation +2 added lines, -2 removed lines

@@ -43,10 +43,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) {

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();
         }
     }

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Api\Controllers;
 
 use App\Models\Notification;
-use App\Models\NotificationAttrib;
-use App\Models\User;
 use Dingo\Api\Http;
 use Dingo\Api\Routing\Helpers;
 use Illuminate\Http\Request;

app/Api/Transformers/PortTransformer.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Include Device
      *
-     * @return League\Fractal\ItemResource
+     * @return Fractal\Resource\Item
      */
     public function includeDevice(Port $port)
     {

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

Doc Comments +3 added lines

@@ -42,6 +42,9 @@
         $this->setAttrib('sticky', $enabled);
     }
 
+    /**
+     * @param string $name
+     */
     private function setAttrib($name, $enabled) {
         if ($enabled === true) {
             $read = new NotificationAttrib;

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();
         }
     }