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

Hendrik search #181

Merged
11342374 merged 70 commits from hendrik-search into master 2017-02-02 12:47:08 +01:00
Conversation 2 Commits 70 Files Changed 142 +7 -18
4 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fcfa6ed9ba - Show all commits

6
website/queries/login.php
View File

@@ -19,7 +19,7 @@ function getUser() {
} }
function getUserID() { function getUserID() {
$stmt = $GLOBALS["db"]->prepare(" $stmt = prepareQuery("
SELECT SELECT
`userID` `userID`
FROM FROM
@@ -73,7 +73,7 @@ function validateLogin($username, $password){
} }
function fbLogin($fbID) { function fbLogin($fbID) {
$stmt = $GLOBALS["db"]->prepare(" $stmt = prepareQuery("
SELECT SELECT
`email`, `email`,
`userID`, `userID`,
@@ -91,7 +91,7 @@ function fbLogin($fbID) {
} }
function getfbUserID($fbID) { function getfbUserID($fbID) {
$stmt = $GLOBALS["db"]->prepare(" $stmt = prepareQuery("
SELECT SELECT
`userID`, `userID`,
`role` `role`

6
website/queries/register.php
View File

@@ -17,7 +17,7 @@ function getExistingUsername() {
} }
function getExistingFBUsername() { function getExistingFBUsername() {
$stmt = $GLOBALS["db"]->prepare(" $stmt = prepareQuery("
SELECT SELECT
`username` `username`
FROM FROM
@@ -49,7 +49,7 @@ function getExistingEmail() {
} }
function getExistingFBEmail() { function getExistingFBEmail() {
$stmt = $GLOBALS["db"]->prepare(" $stmt = prepareQuery("
SELECT SELECT
`email`, `email`,
`userID` `userID`
@@ -120,7 +120,7 @@ function registerAccount() {
} }
function fbRegisterAccount() { function fbRegisterAccount() {
$stmt = $GLOBALS["db"]->prepare(" $stmt = prepareQuery("
INSERT INTO INSERT INTO
`user`(fname, `user`(fname,
lname, lname,

4
website/views/facebookRegisterModal.php
View File

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

9
website/views/homeLoginRegister.php
View File

@@ -58,7 +58,7 @@ $fb = new Facebook\Facebook([
'app_secret' => $appSecret, 'app_secret' => $appSecret,
'default_graph_version' => 'v2.2', 'default_graph_version' => 'v2.2',
]); ]);
$redirect = "https://myhyvesbookplus.nl/~joey/login.php"; $redirect = "https://myhyvesbookplus.nl/login.php";
$helper = $fb->getRedirectLoginHelper(); $helper = $fb->getRedirectLoginHelper();
try { try {
@@ -80,12 +80,6 @@ if(!isset($acces_token)){
$response = $fb->get('/me?fields=email,name,birthday'); $response = $fb->get('/me?fields=email,name,birthday');
$usernode = $response->getGraphUser(); $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()); $nameSplit = explode(" ", $usernode->getName());
$fbName = $nameSplit[0]; $fbName = $nameSplit[0];
$fbSurname = $nameSplit[1]; $fbSurname = $nameSplit[1];
@@ -93,7 +87,6 @@ if(!isset($acces_token)){
$fbEmail = $usernode->getProperty("email"); $fbEmail = $usernode->getProperty("email");
// $image = 'https://graph.facebook.com/' . $usernode->getId() . '/picture?width=200'; // $image = 'https://graph.facebook.com/' . $usernode->getId() . '/picture?width=200';
if (fbLogin($fbUserID) == 1) { if (fbLogin($fbUserID) == 1) {
$fbID = getfbUserID($fbUserID)["userID"]; $fbID = getfbUserID($fbUserID)["userID"];
$fbRole = getfbUserID($fbUserID)["role"]; $fbRole = getfbUserID($fbUserID)["role"];