1.3.0

2021-11-11 14:25:26 +01:00
parent 1737a2f592
commit 25d47f7528
32 changed files with 633 additions and 121 deletions
--- a/core/Views/Account/AcceptInvite.class.php
+++ b/core/Views/Account/AcceptInvite.class.php
@@ -73,13 +73,13 @@ class AcceptInvite extends AccountView {
          <div class=\"input-group-append\">
            <span class=\"input-group-text\"><i class=\"fas fa-key\"></i></span>
          </div>
-          <input type=\"password\" name='password' id='password' class=\"form-control\" placeholder=\"Password\">
+          <input type=\"password\" autocomplete='new-password' name='password' id='password' class=\"form-control\" placeholder=\"Password\">
        </div>
        <div class=\"input-group mt-3\">
          <div class=\"input-group-append\">
            <span class=\"input-group-text\"><i class=\"fas fa-key\"></i></span>
          </div>
-          <input type=\"password\" name='confirmPassword' id='confirmPassword' class=\"form-control\" placeholder=\"Confirm Password\">
+          <input type=\"password\" autocomplete='new-password' name='confirmPassword' id='confirmPassword' class=\"form-control\" placeholder=\"Confirm Password\">
        </div>
        <div class=\"input-group mt-3\">
          <button type=\"button\" class=\"btn btn-success\" id='btnAcceptInvite'>Submit</button>
--- a/core/Views/Account/AccountView.class.php
+++ b/core/Views/Account/AccountView.class.php
@@ -34,14 +34,14 @@ abstract class AccountView extends View {

    $html .= "<div class=\"container mt-5\">
        <div class=\"row\">
-          <div class=\"col-md-4 py-5 bg-primary text-white text-center\" style='border-top-left-radius:.4em;border-bottom-left-radius:.4em'>
+          <div class=\"col-md-3 py-5 bg-primary text-white text-center\" style='border-top-left-radius:.4em;border-bottom-left-radius:.4em;margin-left: auto'>
            <div class=\"card-body\">
              $icon
              <h2 class=\"py-3\">$this->title</h2>
              <p>$this->description</p>
            </div>
          </div>
-          <div class=\"col-md-8 pt-5 pb-2 border border-info\" style='border-top-right-radius:.4em;border-bottom-right-radius:.4em'>
+          <div class=\"col-md-5 pt-5 pb-2 border border-info\" style='border-top-right-radius:.4em;border-bottom-right-radius:.4em;margin-right:auto'>
            $content
            <div class='alert mt-2' style='display:none' id='alertMessage'></div>
          </div>
--- a/core/Views/Account/ConfirmEmail.class.php
+++ b/core/Views/Account/ConfirmEmail.class.php
@@ -5,42 +5,51 @@ namespace Views\Account;


 use Elements\Document;
+use Elements\Script;

 class ConfirmEmail extends AccountView {

-  private bool $success;
-  private string $message;
-
  public function __construct(Document $document, $loadView = true) {
    parent::__construct($document, $loadView);
    $this->title = "Confirm Email";
+    $this->description = "Request a password reset, once you got the e-mail address, you can choose a new password";
    $this->icon = "user-check";
-    $this->success = false;
-    $this->message = "No content";
  }

  public function loadView() {
    parent::loadView();
-
-    if (isset($_GET["token"]) && is_string($_GET["token"]) && !empty($_GET["token"])) {
-      $req = new \Api\User\ConfirmEmail($this->getDocument()->getUser());
-      $this->success = $req->execute(array("token" => $_GET["token"]));
-      if ($this->success) {
-        $this->message = "Your e-mail address was successfully confirmed, you may now log in";
-      } else {
-        $this->message = "Error confirming e-mail address: " . $req->getLastError();
-      }
-    } else {
-      $this->success = false;
-      $this->message = "The link you visited is no longer valid";
-    }
+    $this->getDocument()->getHead()->addScript(Script::MIME_TEXT_JAVASCRIPT, "", '
+      $(document).ready(function() {
+         var token = jsCore.getParameter("token");
+         if (token) {
+           jsCore.apiCall("/user/confirmEmail", { token: token }, (res) => {
+              $("#confirm-status").removeClass("alert-info");
+              if (!res.success) {
+                  $("#confirm-status").addClass("alert-danger");
+                  $("#confirm-status").text("Error confirming e-mail address: " + res.msg);
+              } else {
+                  $("#confirm-status").addClass("alert-success");
+                  $("#confirm-status").text("Your e-mail address was successfully confirmed, you may now log in.");
+              }
+          });
+        } else {
+          $("#confirm-status").removeClass("alert-info");
+          $("#confirm-status").addClass("alert-danger");
+          $("#confirm-status").text("The link you visited is no longer valid");
+        }
+      });'
+    );
  }

  protected function getAccountContent() {
-    if ($this->success) {
-      return $this->createSuccessText($this->message);
-    } else {
-      return $this->createErrorText($this->message);
-    }
+
+    $spinner = $this->createIcon("spinner");
+    $html = "<noscript><div class=\"alert alert-danger\">Javascript is required</div></noscript>
+             <div class=\"alert alert-info\" id=\"confirm-status\">
+                Confirming email… $spinner
+             </div>";
+
+    $html .= "<a href='/login'><button class='btn btn-primary' style='position: absolute; bottom: 10px' type='button'>Proceed to Login</button></a>";
+    return $html;
  }
 }
--- a/core/Views/Account/Register.class.php
+++ b/core/Views/Account/Register.class.php
@@ -16,7 +16,14 @@ class Register extends AccountView {

  public function getAccountContent() {

-    $settings = $this->getDocument()->getUser()->getConfiguration()->getSettings();
+    $user = $this->getDocument()->getUser();
+    if ($user->isLoggedIn()) {
+      header(302);
+      header("Location: /");
+      die("You are already logged in.");
+    }
+
+    $settings = $user->getConfiguration()->getSettings();
    if (!$settings->isRegistrationAllowed()) {
      return $this->createErrorText(
        "Registration is not enabled on this website. If you are an administrator,
@@ -30,28 +37,33 @@ class Register extends AccountView {
          <div class=\"input-group-append\">
            <span class=\"input-group-text\"><i class=\"fas fa-hashtag\"></i></span>  
          </div>
-          <input id=\"username\" name=\"username\" placeholder=\"Username\" class=\"form-control\" type=\"text\" maxlength=\"32\">
+          <input id=\"username\" autocomplete='username' name=\"username\" placeholder=\"Username\" class=\"form-control\" type=\"text\" maxlength=\"32\">
        </div>
        <div class=\"input-group mt-3\">
         <div class=\"input-group-append\">
            <span class=\"input-group-text\"><i class=\"fas fa-at\"></i></span>
          </div>
-          <input type=\"email\" name='email' id='email' class=\"form-control\" placeholder=\"Email\" maxlength=\"64\">
+          <input type=\"email\" autocomplete='email' name='email' id='email' class=\"form-control\" placeholder=\"Email\" maxlength=\"64\">
        </div>
        <div class=\"input-group mt-3\">
          <div class=\"input-group-append\">
            <span class=\"input-group-text\"><i class=\"fas fa-key\"></i></span>
          </div>
-          <input type=\"password\" name='password' id='password' class=\"form-control\" placeholder=\"Password\">
+          <input type=\"password\" autocomplete='new-password' name='password' id='password' class=\"form-control\" placeholder=\"Password\">
        </div>
        <div class=\"input-group mt-3\">
          <div class=\"input-group-append\">
            <span class=\"input-group-text\"><i class=\"fas fa-key\"></i></span>
          </div>
-          <input type=\"password\" name='confirmPassword' id='confirmPassword' class=\"form-control\" placeholder=\"Confirm Password\">
+          <input type=\"password\" autocomplete='new-password' name='confirmPassword' id='confirmPassword' class=\"form-control\" placeholder=\"Confirm Password\">
        </div>
        <div class=\"input-group mt-3\">
-          <button type=\"button\" class=\"btn btn-success\" id='btnRegister'>Submit</button>
+          <button type=\"button\" class=\"btn btn-primary\" id='btnRegister'>Submit</button>          
+          <a href='/login' style='margin-left: 10px'>
+            <button class='btn btn-secondary' type='button'>
+              Back to Login
+            </button>
+          </a>
        </div>
     </form>";
  }
--- a/core/Views/Account/ResendConfirmEmail.class.php
+++ b/core/Views/Account/ResendConfirmEmail.class.php
@@ -0,0 +1,39 @@
+<?php
+
+
+namespace Views\Account;
+
+
+use Elements\Document;
+
+class ResendConfirmEmail extends AccountView {
+
+  public function __construct(Document $document, $loadView = true) {
+    parent::__construct($document, $loadView);
+    $this->title = "Resend Confirm Email";
+    $this->description = "Request a new confirmation email to finalize the account creation";
+    $this->icon = "envelope";
+  }
+
+  protected function getAccountContent() {
+    return  "<p class='lead'>Enter your E-Mail address, to receive a new e-mail to confirm your registration.</p>
+          <form>
+        <div class=\"input-group\">
+          <div class=\"input-group-append\">
+            <span class=\"input-group-text\"><i class=\"fas fa-at\"></i></span>  
+          </div>
+          <input id=\"email\" autocomplete='email' name=\"email\" placeholder=\"E-Mail address\" class=\"form-control\" type=\"email\" maxlength=\"64\" />
+        </div>
+        <div class=\"input-group mt-2\" style='position: absolute;bottom: 15px'>
+          <button id='btnResendConfirmEmail' class='btn btn-primary'>
+            Request
+          </button>
+          <a href='/login' style='margin-left: 10px'>
+            <button class='btn btn-secondary' type='button'>
+              Back to Login
+            </button>
+          </a>
+        </div>
+      ";
+  }
+}
--- a/core/Views/Account/ResetPassword.class.php
+++ b/core/Views/Account/ResetPassword.class.php
@@ -56,10 +56,17 @@ class ResetPassword extends AccountView {
          <div class=\"input-group-append\">
            <span class=\"input-group-text\"><i class=\"fas fa-at\"></i></span>  
          </div>
-          <input id=\"email\" name=\"email\" placeholder=\"E-Mail address\" class=\"form-control\" type=\"email\" maxlength=\"64\" />
+          <input id=\"email\" autocomplete='email' name=\"email\" placeholder=\"E-Mail address\" class=\"form-control\" type=\"email\" maxlength=\"64\" />
        </div>
-        <div class=\"input-group mt-2\">
-          <button id='btnRequestPasswordReset' class='btn btn-primary'>Request</button>
+        <div class=\"input-group mt-2\" style='position: absolute;bottom: 15px'>
+          <button id='btnRequestPasswordReset' class='btn btn-primary'>
+            Request
+          </button>
+          <a href='/login' style='margin-left: 10px'>
+            <button class='btn btn-secondary' type='button'>
+              Back to Login
+            </button>
+          </a>
        </div>
      ";
    } else {
@@ -70,13 +77,13 @@ class ResetPassword extends AccountView {
          <div class=\"input-group-append\">
            <span class=\"input-group-text\"><i class=\"fas fa-key\"></i></span>
          </div>
-          <input type=\"password\" name='password' id='password' class=\"form-control\" placeholder=\"Password\">
+          <input type=\"password\" autocomplete='new-password' name='password' id='password' class=\"form-control\" placeholder=\"Password\">
        </div>
        <div class=\"input-group mt-3\">
          <div class=\"input-group-append\">
            <span class=\"input-group-text\"><i class=\"fas fa-key\"></i></span>
          </div>
-          <input type=\"password\" name='confirmPassword' id='confirmPassword' class=\"form-control\" placeholder=\"Confirm Password\">
+          <input type=\"password\" autocomplete='new-password' name='confirmPassword' id='confirmPassword' class=\"form-control\" placeholder=\"Confirm Password\">
        </div>
        <div class=\"input-group mt-3\">
          <button type=\"button\" class=\"btn btn-success\" id='btnResetPassword'>Submit</button>