Revert back to using emails for login form

Author: carlbennett

src/controllers/User/Login.php

@@ -47,10 +47,10 @@ protected function tryLogin(Router &$router, UserLoginModel &$model) {
     $csrf_id    = (isset($data["csrf_id"   ]) ? $data["csrf_id"   ] : null);
     $csrf_token = (isset($data["csrf_token"]) ? $data["csrf_token"] : null);
     $csrf_valid = CSRF::validate($csrf_id, $csrf_token);
-    $username   = (isset($data["username"  ]) ? $data["username"  ] : null);
+    $email      = (isset($data["email"     ]) ? $data["email"     ] : null);
     $password   = (isset($data["password"  ]) ? $data["password"  ] : null);
 
-    $model->username = $username;
+    $model->email = $email;
 
     if (!$csrf_valid) {
       $model->error = "INVALID_CSRF";
@@ -60,16 +60,16 @@ protected function tryLogin(Router &$router, UserLoginModel &$model) {
 
     if ( isset( Authentication::$user )) {
       $model->error = "ALREADY_LOGGED_IN";
-    } else if (empty($username)) {
-      $model->error = "EMPTY_USERNAME";
+    } else if (empty($email)) {
+      $model->error = "EMPTY_EMAIL";
     } else if (Common::$config->bnetdocs->user_login_disabled) {
       $model->error = "LOGIN_DISABLED";
     }
 
     if ($model->error) return;
 
     try {
-      $user = new User(User::findIdByUsername($username));
+      $user = new User(User::findIdByEmail($email));
     } catch (UserNotFoundException $e) {
       $user = null;
     }
@@ -95,7 +95,7 @@ protected function tryLogin(Router &$router, UserLoginModel &$model) {
       getenv("REMOTE_ADDR"),
       json_encode([
         "error" => $model->error,
-        "username" => $username,
+        "email" => $model->email,
       ])
     );
   }

src/models/User/Login.php

@@ -8,7 +8,7 @@ class Login extends Model {
 
   public $csrf_id;
   public $csrf_token;
+  public $email;
   public $error;
-  public $username;
 
 }

src/templates/User/Login.phtml

@@ -16,12 +16,12 @@ switch ($this->getContext()->error) {
   case "ALREADY_LOGGED_IN":
     $message = "You are already logged in, you must log out first.";
     break;
-  case "EMPTY_USERNAME":
-    $message = "The username was left blank.";
+  case "EMPTY_EMAIL":
+    $message = "The email address was left blank.";
     break;
   case "USER_NOT_FOUND":
   case "PASSWORD_INCORRECT":
-    $message = "Incorrect username or password.";
+    $message = "Incorrect email address or password.";
     break;
   case "USER_DISABLED":
     $message = "The account has been administratively disabled.";
@@ -56,15 +56,15 @@ require("./header.inc.phtml");
               <tbody>
                 <tr>
                   <td>
-                    <label for="username">Username:</label><br/>
+                    <label for="email">Email address:</label><br/>
                     <input
-                      type="text"
-                      name="username"
-                      id="username"
-                      value="<?=filter_var($this->getContext()->username, FILTER_SANITIZE_FULL_SPECIAL_CHARS)?>"
+                      type="email"
+                      name="email"
+                      id="email"
+                      value="<?=filter_var($this->getContext()->email, FILTER_SANITIZE_FULL_SPECIAL_CHARS)?>"
                       tabindex="1"
                       required
-                      autocomplete="username"
+                      autocomplete="email"
                       autofocus="autofocus"
                     />
                   </td><td>