diff options
author | Patrick Davison <snapwilliam@gmail.com> | 2011-09-09 16:55:14 -0700 |
---|---|---|
committer | Patrick Davison <snapwilliam@gmail.com> | 2011-09-09 16:55:14 -0700 |
commit | c37113c2666d65015f967b6cf1a5d2e8836d920d (patch) | |
tree | f99cdc2b52e87741cb08d1fcc7ecec729a9cfab5 | |
parent | f9333b70547ae514ecc848fb195011a11897ee68 (diff) | |
download | pathery-c37113c2666d65015f967b6cf1a5d2e8836d920d.tar.xz |
changes to pathery.com
-rw-r--r-- | css/mapstyle.css | 4 | ||||
-rw-r--r-- | errors.php | 2 | ||||
-rw-r--r-- | globe.php | 6 | ||||
-rw-r--r-- | includes/header.php | 2 | ||||
-rw-r--r-- | index.php | 4 | ||||
-rw-r--r-- | pages/home.php | 10 | ||||
-rw-r--r-- | 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;
@@ -8,7 +8,7 @@ Echo "You're here because of error: $_GET[error] "; Echo "<br />$_SERVER[HTTP_REFERER]";
-Echo "<br /><a href='http://www.snapems.com'>Go back to Home</a>";
+Echo "<br /><a href='http://www.pathery.com'>Go back to Home</a>";
@@ -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() { <link href="css/mapstyle.css" rel="stylesheet" type="text/css" />
<link href="css/pagestyle.css" rel="stylesheet" type="text/css" />
<link href="css/statsstyle.css" rel="stylesheet" type="text/css" />
- <title>Snapems.com Mazegame</title>
+ <title>pathery.com</title>
<script src="js/ajax.js" type="text/javascript"></script>
<script src="js/mapspecs.js" type="text/javascript"></script>
@@ -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; <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&maptype=easy'><? echo $easy; ?></a>
<br /><a href='?page=home&maptype=normal'><? echo $normal; ?></a>
<br /><a href='?page=home&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 © 2011 Snapems.com
+ <br />Copyright © 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);
|