Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/api-key-changes' into feature/api-v1

Browse source
This commit is contained in:
Dane Everitt 2017-11-26 13:27:39 -06:00
commit fb7d8a9626
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Middleware/API/AuthenticateIPAccess.php
View file

@ -28,8 +28,9 @@ class AuthenticateIPAccess
return $next($request); return $next($request);
} }
$find = new IP($request->ip());
foreach ($model->allowed_ips as $ip) { foreach ($model->allowed_ips as $ip) {
if (Range::parse($ip)->contains(new IP($request->ip()))) { if (Range::parse($ip)->contains($find)) {
return $next($request); return $next($request);
} }
} }

2
resources/lang/en/base.php
View file

@ -33,7 +33,7 @@ return [
'header_sub' => 'Manage your API access keys.', 'header_sub' => 'Manage your API access keys.',
'list' => 'API Keys', 'list' => 'API Keys',
'create_new' => 'Create New API key', 'create_new' => 'Create New API key',
'keypair_created' => 'An API Key-Pair has been generated and is listed below.', 'keypair_created' => 'An API key has been successfully generated and is listed below.',
], ],
'new' => [ 'new' => [
'header' => 'New API Key', 'header' => 'New API Key',