From c37113c2666d65015f967b6cf1a5d2e8836d920d Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Fri, 9 Sep 2011 16:55:14 -0700
Subject: changes to pathery.com

---
 pages/home.php  | 10 ++++++----
 pages/login.php | 19 +++++++++++++++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'pages')

diff --git a/pages/home.php b/pages/home.php
index d905476..928a99e 100644
--- a/pages/home.php
+++ b/pages/home.php
@@ -102,10 +102,12 @@ $mergesolution = $map;
 <br />
 
 <div class="col1">
-	<b>Some very exciting changes to be expected April 23rd!</b>
 	<p>
-	New maps are generated daily at 9:00 PM Pacific Time.
-	<br />Maps for <?php echo "$date" ?>:
+	<center><strong>News:</strong></center>
+	<strong>We've moved to www.Pathery.com </strong> (look up, you're already there) <strong>You'll need to re-allow your email-address with google.
+	<br />Don't worry- we've saved all your solutions and history - (soon you'll be able to access it too! hehe)</strong> - 09-09-11
+	<br />New maps are generated daily at 9:00 PM Pacific Time.
+	<br /><i>Maps for <?php echo "$date" ?>:</i>
 	<br /><a href='?page=home&amp;maptype=easy'><? echo $easy; ?></a>
 	<br /><a href='?page=home&amp;maptype=normal'><? echo $normal; ?></a>
 	<br /><a href='?page=home&amp;maptype=hard'><? echo $hard; ?></a>
@@ -168,7 +170,7 @@ echo $solutiondiv;
 	<br />Send feedback to <a href='mailto:snapems@gmail.com'>snapems@gmail.com</a> (or IM me if you know me).
 	<br />We've been aptly implementing changes from feedback.
 	<br />This game is being adjusted, some 'rules' may change.
-	<br />Copyright &copy; 2011 Snapems.com
+	<br />Copyright &copy; 2011 www.pathery.com
 	
 </div>
 
diff --git a/pages/login.php b/pages/login.php
index c730846..1c16fe8 100644
--- a/pages/login.php
+++ b/pages/login.php
@@ -39,7 +39,9 @@ try {
       //I know just where to put this stuff!
       require './includes/db.inc.php';
       //Unless I already have this information...
-      $sql = "SELECT `ID`, `isAdmin` FROM `users` WHERE `openID` = '$claimedid'";
+		//* Modify this to WHERE `email`
+      $sql = "SELECT `ID`, `isAdmin`, `openID` FROM `users` WHERE `email` = '$email'";
+      //$sql = "SELECT `ID`, `isAdmin` FROM `users` WHERE `openID` = '$claimedid'";
       $result = mysql_query($sql);
       
       $_SESSION['isAdmin'] = false;
@@ -51,6 +53,19 @@ try {
          if (mysql_result($result, 0, 'isAdmin') == 1)
 				$_SESSION['isAdmin'] = true;
 			
+			//TEMPORARY CODE
+			//Check openID; and update it if necessary
+			if (mysql_result($result, 0, 'openID') == $claimedid) {
+				//Don't need to do anything
+			} else {
+				//Update the OpenID Code
+				$sql = "UPDATE `users`
+				SET `openID` = '$claimedid'
+				WHERE `ID` = '$userID'";
+				mysql_query($sql); 
+			}
+			// </TEMPORARY CODE>
+			
 			//I last-see you now!
          $sql = "UPDATE `users`
          SET `dateLogin` = NOW()
@@ -96,7 +111,7 @@ try {
 		$two = MD5($one.$salt);
 		$three = MD5($pepper.$two);
 		
-		$expire = time() + (7 * 24 * 60 * 60);
+		$expire = time() + (31 * 24 * 60 * 60);
 		setcookie("userID", $userID, $expire);
       setcookie("doLogin", "yes", $expire);
       setcookie("auth", $three, $expire);
-- 
cgit v1.2.3