From 6385324b13860641a7b9010e89dd8a79e31df06c Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 17 Jan 2017 14:16:17 +0100 Subject: [PATCH 1/7] The menu now backend supported It loads the friends and groups of userID 2 by default (only if there is no session userID set --- website/public/js/menu.js | 1 + website/public/template_sql.php | 1 - website/queries/friendship.php | 5 +- website/queries/group_member.php | 21 ++++ website/views/head.php | 2 +- website/views/menu.php | 185 ++++++++++++++++--------------- 6 files changed, 120 insertions(+), 95 deletions(-) create mode 100644 website/queries/group_member.php diff --git a/website/public/js/menu.js b/website/public/js/menu.js index 56eab9b..d4471eb 100644 --- a/website/public/js/menu.js +++ b/website/public/js/menu.js @@ -1,5 +1,6 @@ $(document).ready(function() { $(".extra-menu-items").hide(); + $("#menu-back").hide(); // Show more friends $("#more-friends-click").click(function() { diff --git a/website/public/template_sql.php b/website/public/template_sql.php index 3ef5b97..b918f6a 100644 --- a/website/public/template_sql.php +++ b/website/public/template_sql.php @@ -4,7 +4,6 @@ query(" + SELECT + `group_page`.`name`, + `group_page`.`picture` + FROM + `group_page` + INNER JOIN + `group_member` + WHERE + `group_member`.`userID` = $userID AND + `group_member`.`groupID` = `group_page`.`groupID` AND + `group_page`.`status` != 0 + "); +} + + + +?> \ No newline at end of file diff --git a/website/views/head.php b/website/views/head.php index 94ad215..da8929a 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -14,6 +14,6 @@ \ No newline at end of file diff --git a/website/views/menu.php b/website/views/menu.php index bf8b1d7..3506aad 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -4,64 +4,54 @@ Vrienden
@@ -69,44 +59,57 @@ Groepen
From faebda3368f611161f658858ef438dbc978f8803 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 17 Jan 2017 14:24:08 +0100 Subject: [PATCH 2/7] Added default profile picture --- website/public/img/notbad.jpg | Bin 0 -> 24079 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 website/public/img/notbad.jpg diff --git a/website/public/img/notbad.jpg b/website/public/img/notbad.jpg new file mode 100644 index 0000000000000000000000000000000000000000..eeea126059e5143b8eda2a1cc77cbc04ff3150e7 GIT binary patch literal 24079 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 Date: Tue, 17 Jan 2017 14:44:20 +0100 Subject: [PATCH 3/7] Added group_page functions for the admin page --- website/queries/group_page.php | 54 ++++++++++++++++++++++++++++++++++ website/views/menu.php | 18 ++++++------ 2 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 website/queries/group_page.php diff --git a/website/queries/group_page.php b/website/queries/group_page.php new file mode 100644 index 0000000..eb07ade --- /dev/null +++ b/website/queries/group_page.php @@ -0,0 +1,54 @@ +query(" + SELECT + `group_page`.`name`, + `group_page`.`picture`, + `group_page`.`description`, + `group_page`.`status`, + `group_page`.`creationdate` + FROM + `group_page` + WHERE + `group_page`.`groupID` = $groupID + "); +} + +function select20GroupsFromN($db, $n) { + return $db->query(" + SELECT + `group_page`.`name`, + `group_page`.`picture`, + `group_page`.`description`, + `group_page`.`status`, + `group_page`.`creationdate` + FROM + `group_page` + LIMIT + $n, 20 + ORDER BY + `group_page`.`name` + "); +} + +function select20GroupsByStatusFromN($db, $n, $status) { + return $db->query(" + SELECT + `group_page`.`name`, + `group_page`.`picture`, + `group_page`.`description`, + `group_page`.`status`, + `group_page`.`creationdate` + FROM + `group_page` + WHERE + `group_page`.`status` = 1 + ORDER BY + `group_page`.`name` ASC + LIMIT + 0, 3 + "); +} + +?> \ No newline at end of file diff --git a/website/views/menu.php b/website/views/menu.php index 3506aad..5486cd6 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -34,15 +34,15 @@ // Echo the friend. echo " - -

  • -
    - PF - $username -
    -
    • - - "; + +
  • +
    + PF + $username +
    +
    • +     + "; } if ($i > 1) { $i -= 1; From a8fcbecc2eb40b48c6ad7e3c648428a197ecd8af Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 17 Jan 2017 15:02:54 +0100 Subject: [PATCH 4/7] Fixed things --- website/queries/group_page.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/website/queries/group_page.php b/website/queries/group_page.php index eb07ade..d8bab8f 100644 --- a/website/queries/group_page.php +++ b/website/queries/group_page.php @@ -18,6 +18,7 @@ function selectGroupById($db, $groupID) { function select20GroupsFromN($db, $n) { return $db->query(" SELECT + `group_page`.`groupID`, `group_page`.`name`, `group_page`.`picture`, `group_page`.`description`, @@ -25,16 +26,17 @@ function select20GroupsFromN($db, $n) { `group_page`.`creationdate` FROM `group_page` + ORDER BY + `group_page`.`name` ASC LIMIT $n, 20 - ORDER BY - `group_page`.`name` "); } function select20GroupsByStatusFromN($db, $n, $status) { return $db->query(" SELECT + `group_page`.`groupID`, `group_page`.`name`, `group_page`.`picture`, `group_page`.`description`, @@ -43,11 +45,11 @@ function select20GroupsByStatusFromN($db, $n, $status) { FROM `group_page` WHERE - `group_page`.`status` = 1 + `group_page`.`status` = $status ORDER BY `group_page`.`name` ASC LIMIT - 0, 3 + $n, 20 "); } From 9b4743d25af8a11596c9c8140f179bae8c135048 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Wed, 18 Jan 2017 09:19:38 +0100 Subject: [PATCH 5/7] Splitted login and register pages --- website/public/login.php | 62 ++++++++- website/public/register.php | 200 +++++++++++++++++++++++++++ website/public/styles/index.css | 151 +++++++++++--------- website/views/login-view.php | 237 ++------------------------------ website/views/login_head.php | 2 - website/views/register-view.php | 145 +++++++++++++++++++ 6 files changed, 508 insertions(+), 289 deletions(-) create mode 100644 website/public/register.php create mode 100644 website/views/register-view.php diff --git a/website/public/login.php b/website/public/login.php index 0018067..e20c204 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -5,9 +5,65 @@ include("../views/login_head.php"); ?> diff --git a/website/public/register.php b/website/public/register.php new file mode 100644 index 0000000..1d65102 --- /dev/null +++ b/website/public/register.php @@ -0,0 +1,200 @@ + + + + +connect_error) { + die("Connection failed: " . $conn->connect_error); + } + + // Query for inserting all the data in the database + $sql = "INSERT INTO + VALUES ($name, $surname, $bday, $username, $password, + $confirmpassword, $streetname, $housenumber, $email)"; + + // Checks if able to insert into database + if (mysqli_query($conn, $sql)) { + echo "New record created successfully"; + } else { + echo "Error: " . $sql . "
    " . mysqli_error($conn); + } + + + + prepare('SELECT name, colour, calories + FROM fruit + WHERE calories < :calories AND colour = :colour'); + $sth->bindParam(':calories', $calories, PDO::PARAM_INT); + $sth->bindParam(':colour', $colour, PDO::PARAM_STR, 12); + $sth->execute(); + ?> + + + + // Closing connection + mysql_close($connection); + } + } + +/* This view adds register view */ +include("../views/register-view.php"); +?> + + diff --git a/website/public/styles/index.css b/website/public/styles/index.css index b4daae7..5978f9d 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -1,98 +1,117 @@ ::selection { - background: #845663; - color: white; + background: #845663; + color: white; } ::-moz-selection { - background: #845663; - color: white; + background: #845663; + color: white; } a, a:link, a:visited, a:hover, a:active { - color: inherit; - text-decoration: none; + color: inherit; + text-decoration: none; } +a.button { + background-color: #845663; + border: 2px solid black; + border-radius: 12px; + color: white; + cursor: pointer; + height: 50%; + margin: 8px 0; + padding: 14px 20px; + width: 25%; + font-family: Arial; + font-size: 16px; +} a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after, div[data-title]:hover:after{ - content: attr(data-title); - padding: 4px 4px; - color: #FFFFFF; - position: absolute; - left: 0; - top: 100%; - z-index: 20; - white-space: nowrap; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; - -moz-box-shadow: 0px 0px 4px #222; - -webkit-box-shadow: 0px 0px 4px #222; - box-shadow: 0px 0px 4px #222; - background-color: #333; - font-size: 15px; - line-height: normal; - font-family: Arial, sans-serif; + content: attr(data-title); + padding: 4px 4px; + color: #FFFFFF; + position: absolute; + left: 0; + top: 100%; + z-index: 20; + white-space: nowrap; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #222; + -webkit-box-shadow: 0px 0px 4px #222; + box-shadow: 0px 0px 4px #222; + background-color: #333; + font-size: 15px; + line-height: normal; + font-family: Arial, sans-serif; } /* Add Zoom Animation */ .animate { - animation: animatezoom 0.6s - -webkit-animation: animatezoom 0.6s; + animation: animatezoom 0.6s + -webkit-animation: animatezoom 0.6s; } /* Body */ body { - height: 100%; + height: 900px; - background-color: #B78996; - color: #333; + background-image: url(https://images2.pixlis.com/background-image-plaid-checkered-seamless-tileable-235ftm.png); + background-size: contain; + background-attachment: fixed; - font-family: Arial, sans-serif; + /*background-color: #B78996;*/ + color: #333; + + font-family: Arial, sans-serif; } /* stijl voor alle buttons */ button { - background-color: #845663; - border: 2px solid black; - border-radius: 12px; - color: white; - cursor: pointer; - height: 50%; - margin: 8px 0; - padding: 14px 20px; - width: 25%; - font-family: Arial; - font-size: 16px; + background-color: #845663; + border: 2px solid black; + border-radius: 12px; + color: white; + cursor: pointer; + height: 50%; + margin: 8px 0; + padding: 14px 20px; + width: 25%; + font-family: Arial; + font-size: 16px; } /* The Close Button */ .close { /* Position it in the top right corner outside of the modal */ - color: white; - font-size: 100px; - font-weight: bold; - position: absolute; - right: 25px; - top: 0; + color: white; + font-size: 100px; + font-weight: bold; + position: absolute; + right: 25px; + top: 0; } /* Close button on hover */ .close:hover, .close:focus { - color: red; - cursor: pointer; + color: red; + cursor: pointer; } /* inlogform */ form { - background-color: #a87a87; + /*background-color: #a87a87;*/ border: 5px solid #325da3; + background-color: #a87a87; border-radius: 12px; - height: 50%; - margin: auto; - width: 55%; + height: 57%; + margin: 8px auto; + width: 45%; + overflow: auto; } /* inlog titel */ @@ -142,14 +161,21 @@ label { /* padding voor registreer container */ .login_containerregister { - padding: 16px; - text-align: left; + padding: 16px; + text-align: left; } /* padding voor login_containers */ .login_containerlogin { - padding: 16px; - text-align: center; + padding: 16px; + text-align: center; +} + +/* padding voor foutmelding login */ +.login_containerfault { + padding: 16px; + text-align: center; + color: red; } /* The Modal (background) */ @@ -175,12 +201,13 @@ label { margin: 5px auto; /* 15% from the top and centered */ overflow-y: auto; width: 40%; /* Could be more or less, depending on screen size */ - height: 80%; + height: 60%; + } @keyframes animatezoom { - from {transform: scale(0)} - to {transform: scale(1)} + from {transform: scale(0)} + to {transform: scale(1)} } /* datepicker */ @@ -203,6 +230,6 @@ select { } ul { - font-family: Arial; - font-size: 16px; + font-family: Arial; + font-size: 16px; } diff --git a/website/views/login-view.php b/website/views/login-view.php index 7ee3d66..e70d96b 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -1,256 +1,49 @@ - - -
    MyHyvesbook+
    -
    +" + return= $correct method="post">

    Welkom bij MyHyvesbook+

    + + + + + +
    + - - - - - - diff --git a/website/views/login_head.php b/website/views/login_head.php index 6111b5d..2283b7d 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -5,6 +5,4 @@ type="text/css" href="styles/index.css"> - - diff --git a/website/views/register-view.php b/website/views/register-view.php new file mode 100644 index 0000000..a184f71 --- /dev/null +++ b/website/views/register-view.php @@ -0,0 +1,145 @@ +
    + MyHyvesbook+ +
    + + +
    " + return= $correct + method="post"> +

    Registreer uw account

    + + + + + + + + + + + + + + + + +
      +
    • Minstens 6 karakters
      • +
    + + + + +
      +
    • Minstens 8 karakters
      • +
    + + + + + + + + + + + + + + + +
    + + + From afcd048260123e1a150ec76b5d65de64eff8a2b8 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Wed, 18 Jan 2017 12:35:41 +0100 Subject: [PATCH 6/7] Almost finished login/register page --- website/public/login.php | 39 +++-------------- website/public/register.php | 77 +++++++++------------------------ website/public/styles/index.css | 3 +- website/queries/login.php | 18 ++++++++ website/queries/register.php | 57 ++++++++++++++++++++++++ website/queries/settings.php | 6 +-- website/views/register-view.php | 24 +++------- 7 files changed, 113 insertions(+), 111 deletions(-) create mode 100644 website/queries/login.php create mode 100644 website/queries/register.php diff --git a/website/public/login.php b/website/public/login.php index e20c204..40907a7 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -1,7 +1,9 @@ diff --git a/website/public/register.php b/website/public/register.php index 1d65102..8b8f4e6 100644 --- a/website/public/register.php +++ b/website/public/register.php @@ -3,6 +3,7 @@ @@ -10,8 +11,8 @@ session_start(); // define variables and set to empty values - $name = $surname = $bday = $username = $password = $confirmpassword = $streetname = $housenumber = $email = ""; - $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $streetnameErr = $housenumberErr = $emailErr = ""; + $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = ""; + $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = ""; $correct = true; // Saves information of filling in the form @@ -35,8 +36,8 @@ $password = $_POST["password"]; } - if (isset($_POST["streetname"])) { - $streetname = $_POST["streetname"]; + if (isset($_POST["location"])) { + $location = $_POST["location"]; } if (isset($_POST["housenumber"])) { @@ -87,6 +88,10 @@ $usernameErr = "Gebruikersnaam moet minstens 6 karakters bevatten"; $correct = false; + } else if (getExistingUser() == 1 ){ + $usernameErr = "Gebruikersnaam bestaat al"; + $correct = false; + } } @@ -108,30 +113,24 @@ } - if ($_POST["password"]!= $_POST["confirmpassword"]) { + if ($_POST["password"] != $_POST["confirmpassword"]) { $confirmpasswordErr = "Wachtwoorden matchen niet"; $correct = false; } - if (empty($_POST["streetname"])) { - $streetnameErr = "Straatnaam is verplicht!"; + if (empty($_POST["location"])) { + $locationErr = "Straatnaam is verplicht!"; $correct = false; } else { - if (!preg_match("/^[a-zA-Z ]*$/",$streetname)) { - $streetnameErr = "Alleen letters en spaties zijn toegestaan!"; + if (!preg_match("/^[a-zA-Z ]*$/",$location)) { + $locationErr = "Alleen letters en spaties zijn toegestaan!"; $correct = false; } } - if (empty($_POST["housenumber"])) { - $housenumberErr = "Huisnummer is verplicht!"; - $correct = false; - - } - if (empty($_POST["email"])) { $emailErr = "Email is verplicht!"; $correct = false; @@ -140,6 +139,11 @@ if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { $emailErr = "Geldige email invullen!"; $correct = false; + + } else if (getExistingEmail() == 1){ + $emailErr = "Email bestaat al"; + $correct = false; + } } @@ -148,48 +152,9 @@ $genericErr = "Bepaalde velden zijn verkeerd of niet ingevuld!"; } else { - $servername = "agile136.science.uva.nl"; - $username = "mhbp"; - $password = "qdtboXhCHJyL2szC"; + registerAccount(); + // header("location: login.php"); - // Creates connection - $conn = new mysqli($servername, $username, $password); - - // Checks connection - if ($conn->connect_error) { - die("Connection failed: " . $conn->connect_error); - } - - // Query for inserting all the data in the database - $sql = "INSERT INTO - VALUES ($name, $surname, $bday, $username, $password, - $confirmpassword, $streetname, $housenumber, $email)"; - - // Checks if able to insert into database - if (mysqli_query($conn, $sql)) { - echo "New record created successfully"; - } else { - echo "Error: " . $sql . "
    " . mysqli_error($conn); - } - - - - prepare('SELECT name, colour, calories - FROM fruit - WHERE calories < :calories AND colour = :colour'); - $sth->bindParam(':calories', $calories, PDO::PARAM_INT); - $sth->bindParam(':colour', $colour, PDO::PARAM_STR, 12); - $sth->execute(); - ?> - - - - // Closing connection - mysql_close($connection); } } diff --git a/website/public/styles/index.css b/website/public/styles/index.css index 5978f9d..a368066 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -59,8 +59,9 @@ div[data-title]:hover:after{ body { height: 900px; - background-image: url(https://images2.pixlis.com/background-image-plaid-checkered-seamless-tileable-235ftm.png); + background-image: url(https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTEnqKdVtLbxjKuNsCSCxFRhTOpp3Gm0gsU8bMgA_MeUYyzrUFy); background-size: contain; + background-repeat: repeat-x; background-attachment: fixed; /*background-color: #B78996;*/ diff --git a/website/queries/login.php b/website/queries/login.php new file mode 100644 index 0000000..23cdbcd --- /dev/null +++ b/website/queries/login.php @@ -0,0 +1,18 @@ +prepare(" + SELECT + `password` + FROM + `user` + WHERE + `username` = :username + "); + + $stmt->bindParam(":username", $_POST["uname"]); + $stmt->execute(); + return $stmt->fetch(PDO::FETCH_ASSOC); +} + +?> diff --git a/website/queries/register.php b/website/queries/register.php new file mode 100644 index 0000000..4d7d593 --- /dev/null +++ b/website/queries/register.php @@ -0,0 +1,57 @@ +prepare(" + SELECT * FROM `user` WHERE `username` = :username + "); + + $stmt->bindParam(":username", $_POST["username"]); + $stmt->execute(); + return $stmt->rowCount(); + +} + +function getExistingEmail() { + $stmt = $GLOBALS["db"]->prepare(" + SELECT * FROM `user` WHERE `email` = :email + "); + + $stmt->bindParam(":email", $_POST["email"]); + $stmt->execute(); + return $stmt->rowCount(); +} + +function registerAccount() { + $stmt = $GLOBALS["db"]->prepare(" + INSERT INTO + `user`(fname, + lname, + birthdate, + username, + password, + location, + email) + VALUES( + :fname, + :lname, + :bday, + :username, + :password, + :location, + :email + )"); + + $hash=password_hash($_POST["password"], PASSWORD_DEFAULT); + + $stmt->bindParam(":fname", $_POST["name"]); + $stmt->bindParam(":lname", $_POST["surname"]); + $stmt->bindParam(":bday", $_POST["bday"]); + $stmt->bindParam(":username", $_POST["username"]); + $stmt->bindParam(":password", $hash); + $stmt->bindParam(":location", $_POST["location"]); + $stmt->bindParam(":email", $_POST["email"]); + + print("execute".$stmt->execute()); + print("count".$stmt->rowCount()); +} +?> diff --git a/website/queries/settings.php b/website/queries/settings.php index 66ddda8..bd9e542 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -10,9 +10,9 @@ function getSettings() { `birthdate`, `bio`, `profilepicture` - FROM + FROM `user` - WHERE + WHERE `userID` = :userID "); @@ -43,4 +43,4 @@ function updateSettings() { $stmt->bindParam(":userID", $_SESSION["userID"]); $stmt->execute(); -} \ No newline at end of file +} diff --git a/website/views/register-view.php b/website/views/register-view.php index a184f71..3ccc978 100644 --- a/website/views/register-view.php +++ b/website/views/register-view.php @@ -94,28 +94,16 @@ * - + - - - From 0808d46d9ec52a70af07bc0f7d22ec4c99291301 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Wed, 18 Jan 2017 14:46:32 +0100 Subject: [PATCH 7/7] Added salting and no similar username --- website/public/login.php | 10 ++++++---- website/public/register.php | 6 +++--- website/queries/login.php | 5 +++-- website/queries/register.php | 15 ++++++++++----- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/website/public/login.php b/website/public/login.php index 40907a7..82570a6 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -21,14 +21,16 @@ } else { - $uname=$_POST["uname"]; + $uname=strtolower($_POST["uname"]); $psw=$_POST["psw"]; $hash=hashPassword()["password"]; - + $userid=hashPassword()["userID"]; + // If there's an account, go to the profile page - if(password_verify($psw, $hash)) { + if(password_verify($psw.$uname, $hash)) { + $_SESSION["userID"] = $userid; + header("location: /profile.php"); - header("location: myhyvesbookplus.nl/profile.php"); } else { $loginErr = "Inloggegevens zijn niet correct"; } diff --git a/website/public/register.php b/website/public/register.php index 8b8f4e6..2299cf0 100644 --- a/website/public/register.php +++ b/website/public/register.php @@ -88,9 +88,9 @@ $usernameErr = "Gebruikersnaam moet minstens 6 karakters bevatten"; $correct = false; - } else if (getExistingUser() == 1 ){ + } else if (getExistingUsername() == 1){ $usernameErr = "Gebruikersnaam bestaat al"; - $correct = false; + $correct = false; } } @@ -153,7 +153,7 @@ } else { registerAccount(); - // header("location: login.php"); + header("location: login.php"); } } diff --git a/website/queries/login.php b/website/queries/login.php index 23cdbcd..c710833 100644 --- a/website/queries/login.php +++ b/website/queries/login.php @@ -3,11 +3,12 @@ function hashPassword() { $stmt = $GLOBALS["db"]->prepare(" SELECT - `password` + `password`, + `userID` FROM `user` WHERE - `username` = :username + `username` LIKE :username "); $stmt->bindParam(":username", $_POST["uname"]); diff --git a/website/queries/register.php b/website/queries/register.php index 4d7d593..9881872 100644 --- a/website/queries/register.php +++ b/website/queries/register.php @@ -1,8 +1,13 @@ prepare(" - SELECT * FROM `user` WHERE `username` = :username + SELECT + `username` + FROM + `user` + WHERE + `username` LIKE :username "); $stmt->bindParam(":username", $_POST["username"]); @@ -41,7 +46,7 @@ function registerAccount() { :email )"); - $hash=password_hash($_POST["password"], PASSWORD_DEFAULT); + $hash=password_hash($_POST["password"].(strtolower($_POST["username"])), PASSWORD_DEFAULT); $stmt->bindParam(":fname", $_POST["name"]); $stmt->bindParam(":lname", $_POST["surname"]); @@ -51,7 +56,7 @@ function registerAccount() { $stmt->bindParam(":location", $_POST["location"]); $stmt->bindParam(":email", $_POST["email"]); - print("execute".$stmt->execute()); - print("count".$stmt->rowCount()); + $stmt->execute(); + $stmt->rowCount(); } ?>