diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/AzpChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/AzpChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/NameChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/NameChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/OwnerChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/OwnerChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/ScpChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/ScpChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Header/TypeChecker.php b/app/Library/Socialite/EveOnline/Checker/Header/TypeChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/AzpChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/AzpChecker.php new file mode 100644 index 000000000..2bde1f043 --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/AzpChecker.php @@ -0,0 +1,50 @@ +client_id = $client_id; + } + + /** + * {@inheritdoc} + */ + public function checkClaim($value) : void { + if(!is_string($value)) { + throw new InvalidClaimException('"azp" must a string.', self::NAME, $value); + } + + if ($value !== $this->client_id) + throw new InvalidClaimException('"azp" must match the originating application.', self::NAME, $value); + } + + /** + * {@inheritdoc} + */ + public function supportedClaim(): string { + return self::NAME; + } +} + +?> \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/NameChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/NameChecker.php new file mode 100644 index 000000000..c316f0d1d --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/NameChecker.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/OwnerChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/OwnerChecker.php new file mode 100644 index 000000000..cd026a22b --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/OwnerChecker.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/ScpChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/ScpChecker.php new file mode 100644 index 000000000..fc3b11989 --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/ScpChecker.php @@ -0,0 +1,54 @@ +scopes = $scopes; + } + + /** + * {@inheritdoc} + */ + public function checkClaim($value): void + { + if (! is_array($value) && ! is_string($value)) + throw new InvalidClaimException('"scp" must be an array of scopes.', self::NAME, $value); + + if (! is_array($value)) + $value = [$value]; + + if (! empty(array_diff($this->scopes, $value))) + throw new InvalidClaimException('"scp" contains scopes which does not match requested ones or miss some requested scopes.', self::NAME, $value); + } + + /** + * {@inheritdoc} + */ + public function supportedClaim(): string + { + return self::NAME; + } +} + +?> \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php new file mode 100644 index 000000000..03744a7fe --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Header/TypeChecker.php b/app/Providers/Socialite/EveOnline/Checker/Header/TypeChecker.php new file mode 100644 index 000000000..fb6f37f2c --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Header/TypeChecker.php @@ -0,0 +1,63 @@ +supported_types = $supported_types; + $this->protected_header = $protected_header; + } + + /** + * {@inheritdoc} + */ + public function checkHeader($value): void + { + if (! is_string($value)) + throw new InvalidHeaderException('"typ" must be a string.', self::HEADER_NAME, $value); + + if (! in_array($value, $this->supported_types, true)) + throw new InvalidHeaderException('Unsupported type.', self::HEADER_NAME, $value); + } + + /** + * {@inheritdoc} + */ + public function supportedHeader(): string + { + return self::HEADER_NAME; + } + + /** + * {@inheritdoc} + */ + public function protectedHeaderOnly(): bool + { + return $this->protected_header; + } +} + +?> \ No newline at end of file diff --git a/resources/views/layouts/admin/sidebarmenu/general.blade.php b/resources/views/layouts/admin/sidebarmenu/general.blade.php index 296df9171..f918611d5 100644 --- a/resources/views/layouts/admin/sidebarmenu/general.blade.php +++ b/resources/views/layouts/admin/sidebarmenu/general.blade.php @@ -27,12 +27,6 @@
Allowed Logins
-Wiki
- -
- Moon Admin
-
-
ESI Scopes
Jump Gate Fuel
- -Moons
-
-
Wiki
-
-
| System | -Name | -Rental Price | -Ally Rental Price | -Renter | -Contact | -Rental End | -Paid? | -Paid Until | -Remove Renter | - - - @foreach($table as $row) -|
|---|---|---|---|---|---|---|---|---|---|---|
| {{ $row['SPM'] }} | -{{ $row['StructureName'] }} | -{{ number_format($row['AlliancePrice'], 0, ".", ",") }} | -{{ number_format($row['OutOfAlliancePrice'], 0, ".", ",") }} | -{{ $row['Renter'] }} | -{{ $row['Contact'] }} | -{{ $row['RentalEnd'] }} | - @if($row['Paid'] == 'Yes') -Yes | - @else -No | - @endif -{{ $row['PaidUntil'] }} | -{{ Form::radio('remove', $row['SPM'], false, ['class' => 'form-control']) }} | -
| Moon Available | -
| Moon Rented | -
| Moon Rent Due | -
| Alliance Use | -
| Region | -System - Planet - Moon | -Corporation | -Requestor | -- - - @foreach($requests as $req) - |
|---|---|---|---|---|
| {{ $req->region }} | -{{ $req->system . " - " . $req->planet . " - " . $req->moon }} | -{{ $req->corporation_name }} | -{{ $req->requestor_name }} | -- {{ Form::hidden('id', $req->id) }} - {{ Form::hidden('system', $req->system) }} - {{ Form::hidden('planet', $req->planet) }} - {{ Form::hidden('moon', $req->moon) }} - {{ Form::select('status', [ - 'Approved' => 'Approved', - 'Denied' => 'Denied', - ], 'Select') }} - {{ Form::submit('Update', ['class' => 'btn btn-primary']) }} - | - - {!! Form::close() !!} -
| System | -Planet | -Moon | -Rental Corp | -Rental End | -Price | -Paid? | - - - @foreach($rentals as $rental) -
|---|---|---|---|---|---|
| {{ $rental['System'] }} | -{{ $rental['Planet'] }} | -{{ $rental['Moon'] }} | -{{ $rental['RentalCorp'] }} | -{{ $rental['RentalEnd'] }} | -{{ $rental['Price'] }} | - -
| Character | -Corp Ticker | -Ore Name | -Quantity | -Date | - - - @foreach($miningLedgers as $ledger) - @if($ledger['structure'] == $value) -
|---|---|---|---|---|
| {{ $ledger['character'] }} | -{{ $ledger['corpTicker'] }} | -{{ $ledger['ore'] }} | -{{ $ledger['quantity'] }} | -{{ $ledger['updated'] }} | -
| Character | -Corp Ticker | -Ore Name | -Quantity | -Date | - - - @foreach($miningLedgers as $ledger) - @if($ledger['structure'] == $value) -
|---|---|---|---|---|
| {{ $ledger['character'] }} | -{{ $ledger['corpTicker'] }} | -{{ $ledger['ore'] }} | -{{ $ledger['quantity'] }} | -{{ $ledger['updated'] }} | -
| System | -Name | -Rental End | - - - @foreach($table as $row) -
|---|---|---|
| {{ $row['SPM'] }} | -{{ $row['StructureName'] }} | -{{ $row['RentalEnd'] }} | -
| Moon Available | -
| Moon Rented | -
| Moon Rent Due | -
| System | -Name | -First Ore | -Second Ore | -Third Ore | -Fourth Ore | -Rental Price | -Moon Worth | -Rental End | - - - @foreach($table as $row) -
|---|---|---|---|---|---|---|---|---|
| {{ $row['SPM'] }} | -{{ $row['StructureName'] }} | -{{ $row['FirstOre'] }} - {{ $row['FirstQuantity'] }} | -{{ $row['SecondOre'] }} - {{ $row['SecondQuantity'] }} | -{{ $row['ThirdOre'] }} - {{ $row['ThirdQuantity'] }} | -{{ $row['FourthOre'] }} - {{ $row['FourthQuantity'] }} | -{{ $row['Price'] }} | -{{ $row['Worth'] }} | -{{ $row['RentalEnd'] }} | -
| Moon Available | -
| Moon Rented | -
| Moon Rent Due | -
| Alliance Use | -
| Contact | -Corporation | -System | -Cost | -Paid Until | -Update | -Remove? | -- - - @foreach($rentals as $rental) - |
|---|---|---|---|---|---|---|---|
| {{ $rental->contact_name }} | -{{ $rental->corporation_name }} | -{{ $rental->system_name }} | -{{ $rental->rental_cost }} | -{{ $rental->paid_until }} | -- {!! Form::open(['action' => 'SystemRentals\RentalAdminController@updateRentalSystem', 'method' => 'POST']) !!} - {{ Form::date('paid_until', \Carbon\Carbon::now()->endOfMonth(), ['class' => 'form-control']) }} - {{ Form::hidden('contact_id', $rental->contact_id) }} - {{ Form::hidden('corporation_id', $rental->corporation_id) }} - {{ Form::hidden('system_id', $rental->system_id) }} - {{ Form::submit('Update', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} - | -- {!! Form::open(['action' => 'SystemRentals\RentalAdminController@removeRentalSystem', 'method' => 'POST']) !!} - {{ Form::radio('remove', 'Yes', false, ['class' => 'form-control']) }} - {{ Form::hidden('contact_id', $rental->contact_id) }} - {{ Form::hidden('corporation_id', $rental->corporation_id) }} - {{ Form::hidden('system_id', $rental->system_id) }} - | -- {{ Form::submit('Remove', ['class' => 'btn btn-danger']) }} - {!! Form::close() !!} - | -
| Corporation | -System | -Structure Size | -Structure Type | -Drop Time | -Requester | -Delete | -- - - @if($reqs != null) - @foreach($reqs as $req) - |
|---|---|---|---|---|---|---|---|
| {{ $req->corporation_name }} | -{{ $req->system }} | -{{ $req->structure_size }} | -{{ $req->structure_type }} | -{{ $req->requested_drop_time }} | -{{ $req->requester }} | - {!! Form::open(['action' => 'Logistics\StructureRequestAdminController@deleteRequest', 'method' => 'POST']) !!} -- {{ Form::hidden('id', $req->id, ['class' => 'form-control']) }} - {{ Form::radio('delete', 'Delete', false, ['class' => 'form-conotrol']) }} - | -- {{ Form::submit('Delete', ['class' => 'btn btn-danger']) }} - | - {!! Form::close() !!} -