StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into patch-1

Browse source
This commit is contained in:
Dane Everitt 2018-12-02 13:01:31 -08:00 • committed by GitHub
commit d6e9770937
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 818 additions and 433 deletions
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');
$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'),
self::ALLOWED_QUEUE_DRIVERS,
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.
event(new FailedPasswordReset($request->ip(), $request->input('email')));
return $this->sendResetLinkResponse(Password::RESET_LINK_SENT);
return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
}
}

2
app/Http/Controllers/Auth/LoginController.php
View file

@ -242,6 +242,6 @@ class LoginController extends Controller
*/
private function fireFailedLoginEvent(Authenticatable $user = null, array $credentials = [])
{
event(new Failed($user, $credentials));
event(new Failed(config('auth.defaults.guard'), $user, $credentials));
}
}

6
app/Http/Controllers/Auth/ResetPasswordController.php
View file

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