@@ -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; |
@@ -44,10 +44,10 @@ |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | if ($action == 'read') { |
| 47 | - $result = $notification->markRead($enable); |
|
| 47 | + $result = $notification->markRead($enable); |
|
| 48 | 48 | } |
| 49 | 49 | elseif ($action == 'sticky') { |
| 50 | - $result = $notification->markSticky(false); |
|
| 50 | + $result = $notification->markSticky(false); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | 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 | { |
@@ -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 | { |
@@ -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 | { |
@@ -25,8 +25,6 @@ |
||
| 25 | 25 | |
| 26 | 26 | namespace App\Http\Controllers; |
| 27 | 27 | |
| 28 | -use App\Http\Requests; |
|
| 29 | -use App\Models\DbConfig; |
|
| 30 | 28 | use Illuminate\Http\Request; |
| 31 | 29 | use Input; |
| 32 | 30 | use Settings; |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | $type = Input::get('type'); |
| 73 | 73 | if ($type == 'settings-value' || $type == 'settings-array') { |
| 74 | 74 | $key = Input::get('key'); |
| 75 | - if(Settings::isReadOnly($key)) { |
|
| 75 | + if (Settings::isReadOnly($key)) { |
|
| 76 | 76 | return response('Read only setting', 422); |
| 77 | 77 | } |
| 78 | 78 | Settings::set($key, Input::get('value')); |
@@ -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 | { |
@@ -220,7 +220,7 @@ |
||
| 220 | 220 | * Clear the settings cache. |
| 221 | 221 | * If path is set, only clear the path and it's parents. |
| 222 | 222 | * |
| 223 | - * @param null $key The path to clear. |
|
| 223 | + * @param string $key The path to clear. |
|
| 224 | 224 | */ |
| 225 | 225 | public function flush($key = null) |
| 226 | 226 | { |
@@ -69,11 +69,11 @@ discard block |
||
| 69 | 69 | if (!empty($key)) { |
| 70 | 70 | if (is_string($k) && !str_contains($k, '.') && DbConfig::exactKey($key)->exists() && DbConfig::key($key)->count() == 1) { |
| 71 | 71 | // check that we aren't trying to set an array onto an existing value only setting |
| 72 | - throw new \Exception("Attempting to set array value to existing non-array value at the key '" . $key . "'"); |
|
| 72 | + throw new \Exception("Attempting to set array value to existing non-array value at the key '".$key."'"); |
|
| 73 | 73 | } |
| 74 | 74 | else { |
| 75 | 75 | // we are not at the leaf yet, add this chunk to the key and recurse |
| 76 | - $this->set($key . '.' . $k, $v); |
|
| 76 | + $this->set($key.'.'.$k, $v); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | else { |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | else { |
| 86 | 86 | // make sure we can save this |
| 87 | 87 | if ($this->isReadOnly($key)) { |
| 88 | - throw new \Exception("The setting '" . $key . "' is read only"); |
|
| 88 | + throw new \Exception("The setting '".$key."' is read only"); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // flush the cache and save the value in db and cache |
@@ -106,10 +106,10 @@ discard block |
||
| 106 | 106 | public function get($key, $default = null) |
| 107 | 107 | { |
| 108 | 108 | // return value from cache or fetch it and return it |
| 109 | - return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function () use ($key, $default) { |
|
| 109 | + return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function() use ($key, $default) { |
|
| 110 | 110 | // fetch the value from config.php first |
| 111 | - if (Config::has('config.' . $key)) { |
|
| 112 | - $config_data = Config::get('config.' . $key, $default); |
|
| 111 | + if (Config::has('config.'.$key)) { |
|
| 112 | + $config_data = Config::get('config.'.$key, $default); |
|
| 113 | 113 | if (!is_array($config_data)) { |
| 114 | 114 | // return the value from config.php if it is a value |
| 115 | 115 | return $config_data; |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | */ |
| 176 | 176 | public function has($key) |
| 177 | 177 | { |
| 178 | - return (Cache::tags(self::$cache_tag)->has($key) || Config::has('config.' . $key) || DbConfig::key($key)->exists()); |
|
| 178 | + return (Cache::tags(self::$cache_tag)->has($key) || Config::has('config.'.$key) || DbConfig::key($key)->exists()); |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | /** |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | */ |
| 187 | 187 | public function isReadOnly($key) |
| 188 | 188 | { |
| 189 | - return Config::has('config.' . $key); |
|
| 189 | + return Config::has('config.'.$key); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | /** |
@@ -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\Models\Port::all()->count(); |
| 36 | 36 | $stats['syslog'] = \App\Models\Syslog::all()->count(); |
| 37 | 37 | $stats['eventlog'] = \App\Models\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(); |
@@ -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 | } |