diff --git a/Changelog b/Changelog
index 066e3415c..543762c5b 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
2018-03-29 DariusIII
+ * Chg: Update themes and use ForgottenPasswordController
* Chg: Remove login/register pages, use Login/Register controllers completely
2018-03-28 DariusIII
* Chg: Update laravel/framework to version 5.6.14
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 6a247fefd..4b52379d7 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -3,7 +3,12 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
+use App\Mail\ForgottenPassword;
+use App\Mail\PasswordReset;
+use App\Models\Settings;
+use App\Models\User;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use Illuminate\Support\Facades\Mail;
class ForgotPasswordController extends Controller
{
@@ -29,4 +34,93 @@ class ForgotPasswordController extends Controller
{
$this->middleware('guest');
}
+
+ public function showLinkRequestForm()
+ {
+ $action = request()->input('action') ?? 'view';
+
+ $email = $rssToken = $sent = $confirmed = '';
+
+ switch ($action) {
+ case 'reset':
+ if (! request()->has('guid')) {
+ app('smarty.view')->assign('error', 'No reset code provided.');
+ break;
+ }
+
+ $ret = User::getByPassResetGuid(request()->input('guid'));
+ if (! $ret) {
+ app('smarty.view')->assign('error', 'Bad reset code provided.');
+ break;
+ }
+
+ //
+ // reset the password, inform the user, send out the email
+ //
+ User::updatePassResetGuid($ret['id'], '');
+ $newpass = User::generatePassword();
+ User::updatePassword($ret['id'], $newpass);
+
+ $to = $ret['email'];
+ $onscreen = 'Your password has been reset to '.$newpass.' and sent to your e-mail address.';
+ Mail::to($to)->send(new PasswordReset($ret['id'], $newpass));
+ app('smarty.view')->assign('notice', $onscreen);
+ $confirmed = true;
+ break;
+
+ break;
+ case 'submit':
+ $email = request()->input('email') ?? '';
+ $rssToken = request()->input('apikey') ?? '';
+ if (empty($email) && empty($rssToken)) {
+ app('smarty.view')->assign('error', 'Missing parameter(email and/or apikey to send password reset');
+ } else {
+ //
+ // Check users exists and send an email
+ //
+ $ret = ! empty($rssToken) ? User::getByRssToken($rssToken) : User::getByEmail($email);
+ if ($ret === null) {
+ app('smarty.view')->assign('error', 'The email or apikey are not recognised.');
+ $sent = true;
+ break;
+ }
+ //
+ // Generate a forgottenpassword guid, store it in the user table
+ //
+ $guid = md5(uniqid('', false));
+ User::updatePassResetGuid($ret['id'], $guid);
+ //
+ // Send the email
+ //
+ $resetLink = request()->server('SERVER_NAME').'/forgottenpassword?action=reset&guid='.$guid;
+ //Mail::to($ret['email'])->send(new ForgottenPassword($resetLink));
+ $sent = true;
+ break;
+ }
+ break;
+ }
+ $theme = Settings::settingValue('site.main.style');
+
+ $title = 'Forgotten Password';
+ $meta_title = 'Forgotten Password';
+ $meta_keywords = 'forgotten,password,signup,registration';
+ $meta_description = 'Forgotten Password';
+
+ $content = app('smarty.view')->fetch($theme.'/forgottenpassword.tpl');
+
+ app('smarty.view')->assign(
+ [
+ 'content' => $content,
+ 'title' => $title,
+ 'meta_title' => $meta_title,
+ 'meta_keywords' => $meta_keywords,
+ 'meta_description' => $meta_description,
+ 'email' => $email,
+ 'apikey' => $rssToken,
+ 'confirmed' => $confirmed,
+ 'sent' => $sent,
+ ]
+ );
+ app('smarty.view')->display($theme.'/basepage.tpl');
+ }
}
diff --git a/public/index.php b/public/index.php
index 149d43326..8ae7d11f7 100644
--- a/public/index.php
+++ b/public/index.php
@@ -37,7 +37,6 @@ switch ($page->page) {
case 'content':
case 'details':
case 'filelist':
- case 'forgottenpassword':
case 'forum':
case 'forumpost':
case 'games':
diff --git a/resources/views/themes/Charisma/forum.tpl b/resources/views/themes/Charisma/forum.tpl
index 5b1689fd4..aa5e36fe3 100755
--- a/resources/views/themes/Charisma/forum.tpl
+++ b/resources/views/themes/Charisma/forum.tpl
@@ -1,4 +1,4 @@
-{if $page->title !=''}{$page->title}{else}Forum{/if}
+{if $title !=''}{$title}{else}Forum{/if}
{if $results|@count > 0}
