@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function map(Router $router) |
| 39 | 39 | { |
| 40 | - $router->group(['namespace' => $this->namespace], function ($router) { |
|
| 40 | + $router->group(['namespace' => $this->namespace], function($router) { |
|
| 41 | 41 | require app_path('Http/routes.php'); |
| 42 | 42 | }); |
| 43 | 43 | } |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | } |
| 68 | 68 | else { |
| 69 | 69 | $user = User::find($request->user()->user_id); |
| 70 | - $device = $user->devices()->find($id); |
|
| 70 | + $device = $user->devices()->find($id); |
|
| 71 | 71 | } |
| 72 | 72 | // morph the data as required |
| 73 | 73 | if ($request->query('displayFormat') == 'link') { |
@@ -43,10 +43,10 @@ |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | if ($action == 'read') { |
| 46 | - $result = $notification->markRead($enable); |
|
| 46 | + $result = $notification->markRead($enable); |
|
| 47 | 47 | } |
| 48 | 48 | elseif ($action == 'sticky') { |
| 49 | - $result = $notification->markSticky(false); |
|
| 49 | + $result = $notification->markSticky(false); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | if ($result === false) { |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | $notification = Notification::find($id); |
| 41 | 41 | $enable = strpos($action, 'un') === false; |
| 42 | - if(!$enable) { |
|
| 42 | + if (!$enable) { |
|
| 43 | 43 | $action = substr($action, 2); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $notification = new Notification; |
| 69 | 69 | $notification->title = $request->title; |
| 70 | 70 | $notification->body = $request->body; |
| 71 | - $notification->checksum = hash('sha512',$request->user()->user_id.'.LOCAL.'.$request->title); |
|
| 71 | + $notification->checksum = hash('sha512', $request->user()->user_id.'.LOCAL.'.$request->title); |
|
| 72 | 72 | $notification->source = $request->user()->user_id; |
| 73 | 73 | if ($notification->save()) |
| 74 | 74 | { |
@@ -3,8 +3,6 @@ |
||
| 3 | 3 | namespace App\Api\Controllers; |
| 4 | 4 | |
| 5 | 5 | use App\Models\Notification; |
| 6 | -use App\Models\NotificationAttrib; |
|
| 7 | -use App\Models\User; |
|
| 8 | 6 | use Dingo\Api\Http; |
| 9 | 7 | use Dingo\Api\Routing\Helpers; |
| 10 | 8 | use Illuminate\Http\Request; |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | /** |
| 36 | 36 | * Include Device |
| 37 | 37 | * |
| 38 | - * @return League\Fractal\ItemResource |
|
| 38 | + * @return Fractal\Resource\Item |
|
| 39 | 39 | */ |
| 40 | 40 | public function includeDevice(Port $port) |
| 41 | 41 | { |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | $versions['db_schema'] = DB::select('SELECT `version` FROM `dbSchema` LIMIT 1')[0]->version; |
| 17 | 17 | $versions['php'] = phpversion(); |
| 18 | 18 | $versions['db_driver'] = strtoupper(DB::connection()->getDriverName()); |
| 19 | - if ($versions['db_driver'] == 'SQLITE') { |
|
| 19 | + if ($versions['db_driver'] == 'SQLITE') { |
|
| 20 | 20 | $versions['db_version'] = DB::select('SELECT sqlite_version() AS version')[0]->version; |
| 21 | 21 | } |
| 22 | 22 | else { |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | $stats['ports'] = \App\Port::all()->count(); |
| 36 | 36 | $stats['syslog'] = \App\Syslog::all()->count(); |
| 37 | 37 | $stats['eventlog'] = \App\Eventlog::all()->count(); |
| 38 | - $stats['apps'] = DB::table('applications')->count();; |
|
| 38 | + $stats['apps'] = DB::table('applications')->count(); ; |
|
| 39 | 39 | $stats['services'] = DB::table('services')->count(); |
| 40 | 40 | $stats['storage'] = DB::table('storage')->count(); |
| 41 | 41 | $stats['diskio'] = DB::table('ucd_diskio')->count(); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | /** |
| 45 | 45 | * Update a notifications status. |
| 46 | 46 | * |
| 47 | - * @return \Illuminate\Http\Response |
|
| 47 | + * @return \Illuminate\Http\JsonResponse |
|
| 48 | 48 | */ |
| 49 | 49 | public function update($id, $action) |
| 50 | 50 | { |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | /** |
| 56 | 56 | * Create a new notification |
| 57 | 57 | * |
| 58 | - * @return \Illuminate\Http\Response |
|
| 58 | + * @return \Illuminate\Http\JsonResponse |
|
| 59 | 59 | */ |
| 60 | 60 | public function create(Request $request) |
| 61 | 61 | { |
@@ -42,6 +42,9 @@ |
||
| 42 | 42 | $this->setAttrib('sticky', $enabled); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | + /** |
|
| 46 | + * @param string $name |
|
| 47 | + */ |
|
| 45 | 48 | private function setAttrib($name, $enabled) { |
| 46 | 49 | if ($enabled === true) { |
| 47 | 50 | $read = new NotificationAttrib; |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | |
| 71 | 71 | public function scopeLimit($query) |
| 72 | 72 | { |
| 73 | - return $query->select('notifications.*','key', 'users.username'); |
|
| 73 | + return $query->select('notifications.*', 'key', 'users.username'); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | public function scopeSource($query) |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Test if the User is an admin or demo. |
| 33 | 33 | * |
| 34 | - * @return \Illuminate\Database\Eloquent\Builder |
|
| 34 | + * @return boolean |
|
| 35 | 35 | */ |
| 36 | 36 | public function isAdmin() |
| 37 | 37 | { |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * Test if this user has global read access |
| 43 | 43 | * these users have a level of 5, 10 or 11 (demo). |
| 44 | 44 | * |
| 45 | - * @return \Illuminate\Database\Eloquent\Builder |
|
| 45 | + * @return boolean |
|
| 46 | 46 | */ |
| 47 | 47 | public function hasGlobalRead() |
| 48 | 48 | { |
@@ -15,13 +15,13 @@ |
||
| 15 | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | 16 | */ |
| 17 | 17 | /** |
| 18 | - * Settings.php |
|
| 19 | - * |
|
| 20 | - * @package LibreNMS |
|
| 21 | - * @author Tony Murray <[email protected]> |
|
| 22 | - * @copyright 2016 Tony Murray |
|
| 23 | - * @license @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later |
|
| 24 | - */ |
|
| 18 | + * Settings.php |
|
| 19 | + * |
|
| 20 | + * @package LibreNMS |
|
| 21 | + * @author Tony Murray <[email protected]> |
|
| 22 | + * @copyright 2016 Tony Murray |
|
| 23 | + * @license @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later |
|
| 24 | + */ |
|
| 25 | 25 | namespace App\Settings; |
| 26 | 26 | |
| 27 | 27 | |