MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'joey-testing' into 'master'

Browse Source 
Joey testing

See merge request !119
This commit was merged in pull request #123.
This commit is contained in:
Marijn Jansen
2017-01-25 13:44:11 +01:00
parent 13c575179d e840def733
commit c23b8bd8e5
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/public/js/registerAndLogin.js
View File

@@ -10,9 +10,6 @@ function bannedAlert(){
alert("Your account is banned"); alert("Your account is banned");
} }
function emailNotConfirmed(userID){ function emailNotConfirmed(){
if (confirm("Your email is not confirmed.\nPress ok to send another confirmation.") == true) { alert("Your account has not been verified yet!\nAnother email has been sent to you")
sendConfirmEmail(userID);
}
} }

6
website/queries/login.php
View File

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