kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Updated tests and views

Browse Source
This commit is contained in:
James Cole
2018-01-05 07:54:10 +01:00
parent d3cad66b69
commit c329ffa545
5 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,11 @@ namespace FireflyIII\Http\Controllers\Auth;
use FireflyConfig;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\User;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Password;
/**
* Class ForgotPasswordController
@@ -46,6 +49,50 @@ class ForgotPasswordController extends Controller
use SendsPasswordResetEmails;
/**
* Create a new controller instance.
*/
public function __construct()
{
parent::__construct();
$this->middleware('guest');
}
/**
* Send a reset link to the given user.
*
* @param \Illuminate\Http\Request $request
*
* @param UserRepositoryInterface $repository
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
*/
public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
{
$this->validateEmail($request);
// verify if the user is not a demo user. If so, we give him back an error.
$user = User::where('email', $request->get('email'))->first();
if (!is_null($user) && $repository->hasRole($user, 'demo')) {
return back()->withErrors(['email' => trans('firefly.cannot_reset_demo_user')]);
}
// We will send the password reset link to this user. Once we have attempted
// to send the link, we will examine the response then see the message we
// need to show to the user. Finally, we'll send out a proper response.
$response = $this->broker()->sendResetLink(
$request->only('email')
);
if ($response == Password::RESET_LINK_SENT) {
return back()->with('status', trans($response));
}
return back()->withErrors(['email' => trans($response)]); // @codeCoverageIgnore
}
/**
* @codeCoverageIgnore
* Display the form to request a password reset link.
*
* @return \Illuminate\Http\Response
@@ -62,13 +109,4 @@ class ForgotPasswordController extends Controller
return view('auth.passwords.email')->with(compact('allowRegistration'));
}
/**
* Create a new controller instance.
*/
public function __construct()
{
parent::__construct();
$this->middleware('guest');
}
}

12
app/Http/Controllers/DebugController.php
View File

@@ -108,6 +108,8 @@ class DebugController extends Controller
}
/**
* Some common combinations.
*
* @param int $value
*
* @return string
@@ -115,13 +117,19 @@ class DebugController extends Controller
protected function errorReporting(int $value): string
{
$array = [
-1 => 'ALL errors',
-1 => 'ALL errors',
E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED => 'E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED',
E_ALL => 'E_ALL',
E_ALL & ~E_DEPRECATED & ~E_STRICT => 'E_ALL & ~E_DEPRECATED & ~E_STRICT',
E_ALL & ~E_NOTICE => 'E_ALL & ~E_NOTICE',
E_ALL & ~E_NOTICE & ~E_STRICT => 'E_ALL & ~E_NOTICE & ~E_STRICT',
E_COMPILE_ERROR | E_RECOVERABLE_ERROR | E_ERROR | E_CORE_ERROR => 'E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR',
];
if (isset($array[$value])) {
return $array[$value];
}
return strval($value);
return strval($value); // @codeCoverageIgnore
}
/**