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 !169
This commit was merged in pull request #173.
This commit is contained in:
Lars van Hijfte
2017-02-01 12:51:12 +01:00
parent bccb813e92 700e27e5e3
commit fcfa6ed9ba
4 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/queries/login.php
View File

@@ -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`

6
website/queries/register.php
View File

@@ -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,

4
website/views/facebookRegisterModal.php
View File

@@ -81,18 +81,14 @@
<input type="hidden"
name="fbName"
value="<?php echo $fbName ?>">
<?php echo $fbName ?>
<input type="hidden"
name="fbSurname"
value="<?php echo $fbSurname ?>">
<?php echo $fbSurname ?>
<input type="hidden"
name="fbUserID"
value="<?php echo $fbUserID ?>">
<?php echo $fbUserID ?>
<input type="hidden"
name="fbEmail"
value="<?php echo $fbEmail ?>">
<?php echo $fbEmail ?>
</form>
</div>

9
website/views/homeLoginRegister.php
View File

@@ -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() . "</br>";
echo $usernode->getID() . "</br>";
// echo $usernode->getProperty("email") . "<br><br>";
// echo "Picture<br>";
// echo "<img src='$image' /><br><br>";
$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"];