Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

1 files changed, 5 insertions, 3 deletions

diff --git a/globe.php b/globe.php
index 05d2e39..c901175 100644
--- a/globe.php
+++ b/globe.php
@@ -27,7 +27,7 @@ function CookieLogin() {
 	$userID = $_COOKIE['userID'];

 	$auth = $_COOKIE['auth'];

 

-	$sql = "SELECT `openID`, `displayName`, `isAdmin`

+	$sql = "SELECT `openID`, `email`, `displayName`, `dateJoined`, `isAdmin`

 	FROM `users`

 	WHERE `ID` = '$userID'

 	";

@@ -36,7 +36,7 @@ function CookieLogin() {
 	if (mysql_num_rows($result) == 0)

 		return;

 		

-	list($claimedid, $display, $isAdmin) = mysql_fetch_row($result);

+	list($claimedid, $email, $display, $dateJoined, $isAdmin) = mysql_fetch_row($result);

 	

 	//I last-see you now!

 	$sql = "UPDATE `users`

@@ -56,7 +56,9 @@ function CookieLogin() {
 		$_SESSION['accepted'] = 1;

 		$accepted = 1;

 		$_SESSION['userID'] = $userID;

+		$_SESSION['email'] = $email;

 		$_SESSION['displayName'] = $display;

+		$_SESSION['dateJoined'] = $dateJoined;

 		if ($isAdmin == 1)

 			$_SESSION['isAdmin'] = true;

 

@@ -189,4 +191,4 @@ function EmailError($data, $subject = "Pathery Error Report") {
    Return $mail_sent;

 }

 

-?>
\ No newline at end of file
+?>