Wrong help text shown

2 files changed, 89 insertions, 2 deletions

diff --git a/app/Http/Controllers/HelpTextController.php b/app/Http/Controllers/HelpTextController.php
index 42d727a519..f80cdcf3f8 100644
--- a/app/Http/Controllers/HelpTextController.php
+++ b/app/Http/Controllers/HelpTextController.php
@@ -219,12 +219,12 @@ class HelpTextController extends AbstractBaseController
 
             case 'RESN':
                 $title = I18N::translate('Restriction');
-                $text  = view('help/romanized');
+                $text  = view('help/restriction');
                 break;
 
             case 'ROMN':
                 $title = I18N::translate('Romanized');
-                $text  = view('help/restriction');
+                $text  = view('help/romanized');
                 break;
 
             case '_HEB':
diff --git a/app/Http/RequestHandlers/HelpText.php b/app/Http/RequestHandlers/HelpText.php
new file mode 100644
index 0000000000..a5fb0de5bb
--- /dev/null
+++ b/app/Http/RequestHandlers/HelpText.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2019 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+declare(strict_types=1);
+
+namespace Fisharebest\Webtrees\Http\RequestHandlers;
+
+use Fisharebest\Webtrees\Http\Controllers\AbstractBaseController;
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Site;
+use Fisharebest\Webtrees\User;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * Show a login form.
+ */
+class LoginPage extends AbstractBaseController
+{
+    /**
+     * @param ServerRequestInterface $request
+     *
+     * @return ResponseInterface
+     */
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        $tree = $request->getAttribute('tree');
+        $user = $request->getAttribute('user');
+
+        // Already logged in?
+        if ($user instanceof User) {
+            $ged = $tree !== null ? $tree->name() : '';
+
+            return redirect(route('user-page', ['ged' => $ged]));
+        }
+
+        $error    = $request->getQueryParams()['error'] ?? '';
+        $url      = $request->getQueryParams()['url'] ?? '';
+        $username = $request->getQueryParams()['username'] ?? '';
+
+        $title = I18N::translate('Sign in');
+
+        switch (Site::getPreference('WELCOME_TEXT_AUTH_MODE')) {
+            case 1:
+            default:
+                $welcome = I18N::translate('Anyone with a user account can access this website.');
+                break;
+            case 2:
+                $welcome = I18N::translate('You need to be an authorized user to access this website.');
+                break;
+            case 3:
+                $welcome = I18N::translate('You need to be a family member to access this website.');
+                break;
+            case 4:
+                $welcome = Site::getPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE);
+                break;
+        }
+
+        if (Site::getPreference('USE_REGISTRATION_MODULE') === '1') {
+            $welcome .= ' ' . I18N::translate('You can apply for an account using the link below.');
+        }
+
+        $can_register = Site::getPreference('USE_REGISTRATION_MODULE') === '1';
+
+        return $this->viewResponse('login-page', [
+            'can_register' => $can_register,
+            'error'        => $error,
+            'title'        => $title,
+            'url'          => $url,
+            'username'     => $username,
+            'welcome'      => $welcome,
+        ]);
+    }
+}