From c37113c2666d65015f967b6cf1a5d2e8836d920d Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Fri, 9 Sep 2011 16:55:14 -0700 Subject: changes to pathery.com --- css/mapstyle.css | 4 ++-- errors.php | 2 +- globe.php | 6 +++--- includes/header.php | 2 +- index.php | 4 ++++ pages/home.php | 10 ++++++---- pages/login.php | 19 +++++++++++++++++-- 7 files changed, 34 insertions(+), 13 deletions(-) diff --git a/css/mapstyle.css b/css/mapstyle.css index e5ba406..ffec888 100644 --- a/css/mapstyle.css +++ b/css/mapstyle.css @@ -9,9 +9,9 @@ position:relative; padding: 0px; margin-top: 10px; - margin-bottom: 60px; + margin-bottom: 1px; padding-top:2px; - padding-bottom:10px; + padding-bottom:1px; margin-left:auto; margin-right:auto; border-top: 1px solid #000; diff --git a/errors.php b/errors.php index 05a717a..be8a890 100644 --- a/errors.php +++ b/errors.php @@ -8,7 +8,7 @@ Echo "You're here because of error: $_GET[error] "; Echo "
$_SERVER[HTTP_REFERER]"; -Echo "
Go back to Home"; +Echo "
Go back to Home"; diff --git a/globe.php b/globe.php index 72795c8..291453b 100644 --- a/globe.php +++ b/globe.php @@ -8,7 +8,7 @@ session_start(); -$mydomain = "http://www.snapems.com/"; +$mydomain = "http://www.pathery.com/"; //https://www.google.com/accounts/o8/id?id=AItOawl4GX29ka40T4ZeuXnR2FVsP4LZWaED_T8 //https%3A%2F%2Fwww.google.com%2Faccounts%2Fo8%2Fid%3Fid%3DAItOawl @@ -122,8 +122,8 @@ Function CheckAuth($page) { } //!! Contains domain !! -Function DoRedirect($message = "Thanks", $to = "http://www.snapems.com/", $duration = "3") { - $to=(is_null($to)?'http://www.snapems.com/':$to); +Function DoRedirect($message = "Thanks", $to = "http://www.pathery.com/", $duration = "3") { + $to=(is_null($to)?'http://www.pathery.com/':$to); if ($duration == 0) { header("Location: $to"); diff --git a/includes/header.php b/includes/header.php index 53c1a82..b386cfa 100644 --- a/includes/header.php +++ b/includes/header.php @@ -9,7 +9,7 @@ function htmlHeader() { - Snapems.com Mazegame + pathery.com diff --git a/index.php b/index.php index 0c87fa7..e34b0b4 100644 --- a/index.php +++ b/index.php @@ -29,6 +29,10 @@ switch (strtolower($_GET[page])) { require("pages/test.php"); break; + case "embed": + require("pages/embed.php"); + break; + case "about": require("pages/about.php"); break; 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;
- Some very exciting changes to be expected April 23rd!

- New maps are generated daily at 9:00 PM Pacific Time. -
Maps for : +

News:
+ We've moved to www.Pathery.com (look up, you're already there) You'll need to re-allow your email-address with google. +
Don't worry- we've saved all your solutions and history - (soon you'll be able to access it too! hehe) - 09-09-11 +
New maps are generated daily at 9:00 PM Pacific Time. +
Maps for :


@@ -168,7 +170,7 @@ echo $solutiondiv;
Send feedback to snapems@gmail.com (or IM me if you know me).
We've been aptly implementing changes from feedback.
This game is being adjusted, some 'rules' may change. -
Copyright © 2011 Snapems.com +
Copyright © 2011 www.pathery.com
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); + } + // + //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