dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Initial update

Browse Source
This commit is contained in:
zKoz210 2018-11-26 03:25:18 +03:00
parent b60c672afa
commit 0b4b1a3443
9 changed files with 811 additions and 432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/Environment/AppSettingsCommand.php
View File

@ -132,7 +132,7 @@ class AppSettingsCommand extends Command
); );
$selected = $this->config->get('queue.default', 'redis'); $selected = $this->config->get('queue.default', 'redis');
$this->variables['QUEUE_DRIVER'] = $this->option('queue') ?? $this->choice( $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
trans('command/messages.environment.app.queue_driver'), trans('command/messages.environment.app.queue_driver'),
self::ALLOWED_QUEUE_DRIVERS, self::ALLOWED_QUEUE_DRIVERS,
array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null

2
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@ -27,6 +27,6 @@ class ForgotPasswordController extends Controller
// exist on the system. // exist on the system.
event(new FailedPasswordReset($request->ip(), $request->input('email'))); event(new FailedPasswordReset($request->ip(), $request->input('email')));
return $this->sendResetLinkResponse(Password::RESET_LINK_SENT); return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
} }
} }

4
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@ -2,6 +2,7 @@
namespace Pterodactyl\Http\Controllers\Auth; namespace Pterodactyl\Http\Controllers\Auth;
use Illuminate\Http\Request;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Prologue\Alerts\AlertsMessageBag; use Prologue\Alerts\AlertsMessageBag;
use Illuminate\Contracts\Hashing\Hasher; use Illuminate\Contracts\Hashing\Hasher;
@ -109,10 +110,11 @@ class ResetPasswordController extends Controller
/** /**
* Get the response for a successful password reset. * Get the response for a successful password reset.
* *
* @param \Illuminate\Http\Request $request
* @param string $response * @param string $response
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
*/ */
protected function sendResetResponse($response) protected function sendResetResponse(Request $request, $response)
{ {
if ($this->hasTwoFactor) { if ($this->hasTwoFactor) {
$this->alerts->success('Your password was successfully updated. Please log in to continue.')->flash(); $this->alerts->success('Your password was successfully updated. Please log in to continue.')->flash();

10
composer.json
View File

@ -24,7 +24,7 @@
"hashids/hashids": "^2.0", "hashids/hashids": "^2.0",
"igaster/laravel-theme": "^2.0.6", "igaster/laravel-theme": "^2.0.6",
"laracasts/utilities": "^3.0", "laracasts/utilities": "^3.0",
"laravel/framework": "5.6.*", "laravel/framework": "5.7.*",
"laravel/tinker": "^1.0", "laravel/tinker": "^1.0",
"lord/laroute": "^2.4", "lord/laroute": "^2.4",
"matriphe/iso-639": "^1.2", "matriphe/iso-639": "^1.2",
@ -34,15 +34,15 @@
"prologue/alerts": "^0.4", "prologue/alerts": "^0.4",
"ramsey/uuid": "^3.7", "ramsey/uuid": "^3.7",
"s1lentium/iptools": "^1.1", "s1lentium/iptools": "^1.1",
"sofa/eloquence-base": "v5.6", "sofa/eloquence-base": "v5.6.2",
"sofa/eloquence-validable": "v5.6", "sofa/eloquence-validable": "v5.6",
"spatie/laravel-fractal": "^5.3", "spatie/laravel-fractal": "^5.4",
"webmozart/assert": "^1.2", "webmozart/assert": "^1.2",
"znck/belongs-to-through": "^2.3" "znck/belongs-to-through": "^2.3"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.1", "barryvdh/laravel-debugbar": "^3.2",
"barryvdh/laravel-ide-helper": "^2.4", "barryvdh/laravel-ide-helper": "^2.5",
"codedungeon/phpunit-result-printer": "^0.17.1", "codedungeon/phpunit-result-printer": "^0.17.1",
"filp/whoops": "^2.1", "filp/whoops": "^2.1",
"friendsofphp/php-cs-fixer": "^2.11.1", "friendsofphp/php-cs-fixer": "^2.11.1",

1216
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
config/queue.php
View File

@ -14,7 +14,7 @@ return [
| |
*/ */
'default' => env('QUEUE_DRIVER', 'database'), 'default' => env('QUEUE_CONNECTION', 'database'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

2
phpunit.xml
View File

@ -28,7 +28,7 @@
<env name="DB_CONNECTION" value="testing"/> <env name="DB_CONNECTION" value="testing"/>
<env name="CACHE_DRIVER" value="array"/> <env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/> <env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/> <env name="QUEUE_CONNECTION" value="sync"/>
<env name="MAIL_DRIVER" value="array"/> <env name="MAIL_DRIVER" value="array"/>
</php> </php>
</phpunit> </phpunit>

2
resources/themes/pterodactyl/auth/passwords/reset.blade.php
View File

@ -30,7 +30,7 @@
<form id="resetForm" action="{{ route('auth.reset.post') }}" method="POST"> <form id="resetForm" action="{{ route('auth.reset.post') }}" method="POST">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<div class="pterodactyl-login-input"> <div class="pterodactyl-login-input">
<input type="email" name="email" class="form-control input-lg" value="{{ $email or old('email') }}" required autofocus placeholder="@lang('strings.email')"> <input type="email" name="email" class="form-control input-lg" value="{{ $email ?? old('email') }}" required autofocus placeholder="@lang('strings.email')">
<span class="fa fa-envelope form-control-feedback fa-lg"></span> <span class="fa fa-envelope form-control-feedback fa-lg"></span>
@if ($errors->has('email')) @if ($errors->has('email'))
<span class="help-block text-red small"> <span class="help-block text-red small">

1
storage/framework/cache/.gitignore vendored
View File

@ -1,2 +1,3 @@
* *
!data/
!.gitignore !.gitignore