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

Added confirmation login email #122

Merged
11057122 merged 1 commits from joey-testing into master 2017-01-25 12:49:47 +01:00
Conversation 2 Commits 1 Files Changed 4 +15 -1
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,3 +9,10 @@ function checkLoggedIn() {
function bannedAlert(){ function bannedAlert(){
alert("Your account is banned"); alert("Your account is banned");
} }
function emailNotConfirmed(userID){
if (confirm("Your email is not confirmed.\nPress ok to send another confirmation.") == true) {
sendConfirmEmail(userID);
}
}

3
website/public/login.php
View File

@@ -5,6 +5,7 @@
require_once("../queries/connect.php"); require_once("../queries/connect.php");
include_once("../queries/login.php"); include_once("../queries/login.php");
include_once("../queries/checkInput.php"); include_once("../queries/checkInput.php");
include_once("../queries/emailconfirm.php");
?> ?>
<body> <body>
<?php <?php
@@ -23,7 +24,7 @@
// Trying to login // Trying to login
if ($_SERVER["REQUEST_METHOD"] == "POST") { if ($_SERVER["REQUEST_METHOD"] == "POST") {
try{ try{
$uname = strtolower(test_input($_POST["uname"])); $uname = ($_POST["uname"]);
validateLogin($_POST["uname"], $_POST["psw"]); validateLogin($_POST["uname"], $_POST["psw"]);
} catch(loginException $e) { } catch(loginException $e) {
$loginErr = $e->getMessage(); $loginErr = $e->getMessage();

2
website/public/register.php
View File

@@ -5,6 +5,7 @@
require_once("../queries/connect.php"); require_once("../queries/connect.php");
include_once("../queries/register.php"); include_once("../queries/register.php");
include_once("../queries/checkInput.php"); include_once("../queries/checkInput.php");
include_once("../queries/emailconfirm.php");
?> ?>
<body> <body>
<?php <?php
@@ -91,6 +92,7 @@
try { try {
getIp(); getIp();
registerCheck($correct); registerCheck($correct);
sendConfirmEmailUsername($username);
} catch(registerException $e){ } catch(registerException $e){
$genericErr = $e->getMessage(); $genericErr = $e->getMessage();
} }

4
website/queries/login.php
View File

@@ -34,6 +34,10 @@ function validateLogin($username, $password){
echo "<script> echo "<script>
window.onload=bannedAlert(); window.onload=bannedAlert();
</script>"; </script>";
} else if ($role == "unconfirmed"){
echo "<script>
window.onload=emailNotConfirmed('userID');
</script>";
} else { } else {
$_SESSION["userID"] = $userID; $_SESSION["userID"] = $userID;
header("location: profile.php"); header("location: profile.php");