Merge branch 'joey-testing' into 'master'

Joey testing

See merge request !119

website/queries/login.php

@@ -35,8 +35,9 @@ function validateLogin($username, $password){
                          window.onload=bannedAlert();
                     </script>";
             } else if ($role == "unconfirmed"){
+                sendConfirmEmail(getUser()["userID"]);
                 echo "<script>
-                         window.onload=emailNotConfirmed('userID');
+                         window.onload=emailNotConfirmed();
                     </script>";
             } else {
                 $_SESSION["userID"] = $userID;
@@ -56,4 +57,5 @@ class loginException extends Exception
         parent::__construct($message, $code, $previous);
     }
 }
-?>
+?>
+