diff --git a/website/queries/login.php b/website/queries/login.php
index f3c5d9a..4dad5c5 100644
--- a/website/queries/login.php
+++ b/website/queries/login.php
@@ -19,7 +19,7 @@ function getUser() {
}
function getUserID() {
- $stmt = $GLOBALS["db"]->prepare("
+ $stmt = prepareQuery("
SELECT
`userID`
FROM
@@ -73,7 +73,7 @@ function validateLogin($username, $password){
}
function fbLogin($fbID) {
- $stmt = $GLOBALS["db"]->prepare("
+ $stmt = prepareQuery("
SELECT
`email`,
`userID`,
@@ -91,7 +91,7 @@ function fbLogin($fbID) {
}
function getfbUserID($fbID) {
- $stmt = $GLOBALS["db"]->prepare("
+ $stmt = prepareQuery("
SELECT
`userID`,
`role`
diff --git a/website/queries/register.php b/website/queries/register.php
index 6ed4d50..3dcbed4 100644
--- a/website/queries/register.php
+++ b/website/queries/register.php
@@ -17,7 +17,7 @@ function getExistingUsername() {
}
function getExistingFBUsername() {
- $stmt = $GLOBALS["db"]->prepare("
+ $stmt = prepareQuery("
SELECT
`username`
FROM
@@ -49,7 +49,7 @@ function getExistingEmail() {
}
function getExistingFBEmail() {
- $stmt = $GLOBALS["db"]->prepare("
+ $stmt = prepareQuery("
SELECT
`email`,
`userID`
@@ -120,7 +120,7 @@ function registerAccount() {
}
function fbRegisterAccount() {
- $stmt = $GLOBALS["db"]->prepare("
+ $stmt = prepareQuery("
INSERT INTO
`user`(fname,
lname,
diff --git a/website/views/facebookRegisterModal.php b/website/views/facebookRegisterModal.php
index d36b08e..7db44b0 100644
--- a/website/views/facebookRegisterModal.php
+++ b/website/views/facebookRegisterModal.php
@@ -81,18 +81,14 @@
-
-
-
-
\ No newline at end of file
diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php
index 8fc0ec0..beffff8 100644
--- a/website/views/homeLoginRegister.php
+++ b/website/views/homeLoginRegister.php
@@ -58,7 +58,7 @@ $fb = new Facebook\Facebook([
'app_secret' => $appSecret,
'default_graph_version' => 'v2.2',
]);
-$redirect = "https://myhyvesbookplus.nl/~joey/login.php";
+$redirect = "https://myhyvesbookplus.nl/login.php";
$helper = $fb->getRedirectLoginHelper();
try {
@@ -80,12 +80,6 @@ if(!isset($acces_token)){
$response = $fb->get('/me?fields=email,name,birthday');
$usernode = $response->getGraphUser();
-// echo $usernode->getName() . "";
- echo $usernode->getID() . "";
-// echo $usernode->getProperty("email") . "
";
-// echo "Picture
";
-// echo "
";
-
$nameSplit = explode(" ", $usernode->getName());
$fbName = $nameSplit[0];
$fbSurname = $nameSplit[1];
@@ -93,7 +87,6 @@ if(!isset($acces_token)){
$fbEmail = $usernode->getProperty("email");
// $image = 'https://graph.facebook.com/' . $usernode->getId() . '/picture?width=200';
-
if (fbLogin($fbUserID) == 1) {
$fbID = getfbUserID($fbUserID)["userID"];
$fbRole = getfbUserID($fbUserID)["role"];