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

Apply fixes from StyleCI (#364)

Browse source
This commit is contained in:
Dane Everitt 2017-03-31 20:48:35 -04:00 • committed by GitHub
parent fe6a19096f
commit 451dd7ebc8
4 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal

22
app/Http/Middleware/VerifyReCaptcha.php
View file

@ -3,8 +3,7 @@
namespace Pterodactyl\Http\Middleware;
use Closure;
use Alert;
use \Pterodactyl\Events\Auth\FailedCaptcha;
use Pterodactyl\Events\Auth\FailedCaptcha;
class VerifyReCaptcha
{
@ -17,8 +16,10 @@ class VerifyReCaptcha
*/
public function handle($request, Closure $next)
{
if (!config('recaptcha.enabled')) return $next($request);
if (! config('recaptcha.enabled')) {
return $next($request);
}
$response_domain = null;
if ($request->has('g-recaptcha-response')) {
@ -40,20 +41,21 @@ class VerifyReCaptcha
// Compare the domain received by google with the app url
$domain_verified = false;
if (config('recaptcha.verify_domain')) {
$matches;
preg_match('/^(?:https?:\/\/)?((?:www\.)?[^:\/\n]+)/', config('app.url'), $matches);
$domain = $matches[1];
$domain_verified = $response_domain === $domain;
$matches;
preg_match('/^(?:https?:\/\/)?((?:www\.)?[^:\/\n]+)/', config('app.url'), $matches);
$domain = $matches[1];
$domain_verified = $response_domain === $domain;
}
if ($result->success && (!config('recaptcha.verify_domain') || $domain_verified)) {
if ($result->success && (! config('recaptcha.verify_domain') || $domain_verified)) {
return $next($request);
}
}
}
// Emit an event and return to the previous view with an error (only the captcha error will be shown!)
event(new FailedCaptcha($request->ip(), $response_domain));
return back()->withErrors(['g-recaptcha-response' => trans('strings.captcha_invalid')])->withInput();
}
}