summaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/datas.php6
-rw-r--r--includes/header.php22
2 files changed, 6 insertions, 22 deletions
diff --git a/includes/datas.php b/includes/datas.php
index fa8bfb0..f1f4377 100644
--- a/includes/datas.php
+++ b/includes/datas.php
@@ -5,7 +5,7 @@
include_once('db.inc.php');
//FirePHP stuff - TODO: Delete
-require_once('includes/FirePHPCore/FirePHP.class.php');
+//require_once('includes/FirePHPCore/FirePHP.class.php');
//FirePHP stuff - TODO: Delete
//Select Stats/Scores.
@@ -719,7 +719,7 @@ function trackMOTDstats($mapType) {
DATE_FORMAT(maps.dateCreated,'%Y-%m-%d')
AND `mapType` = '$mapType'
GROUP BY solutions.userID
- ORDER BY Moves DESC, MAX(dateModified) ASC
+ ORDER BY Moves DESC, MAX(dateModified) ASC, solutions.ID DESC
";
$mainResult = mysql_query($sql);
@@ -804,7 +804,7 @@ function getScores($mapid, $pageNumber = 1, $pageDivide = 10) {
LEFT JOIN `userData`
ON users.ID = userData.userID
WHERE solutions.mapID = '$mapid'
- ORDER BY solutions.moves DESC, solutions.dateModified ASC
+ ORDER BY solutions.moves DESC, solutions.dateModified ASC, solutions.ID DESC
";
$result = mysql_query($sql);
//$utime = date("g:i A (T)");
diff --git a/includes/header.php b/includes/header.php
index 74a773a..c415e75 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -1,20 +1,4 @@
<?php
-$accepted = isset($_SESSION['accepted']) && $_SESSION['accepted'] == 1;
-
-if ($accepted) {
- $userID = $_SESSION['userID'];
- include_once ('./includes/db.inc.php');
- $sql = "
- SELECT
- userData.wallColor,
- userData.wallEmblem
- FROM `userData`
- WHERE userID = '$userID' ";
- $result = mysql_query($sql);
- if ($result)
- list($wallColor, $wallEmblem) = mysql_fetch_row($result);
-}
-
function htmlHeader($css = array(), $title = 'Pathery', $desc = '', $scripts = array()) {
global $accepted;
?>
@@ -37,7 +21,7 @@ function htmlHeader($css = array(), $title = 'Pathery', $desc = '', $scripts = a
echo "<script src='js/$s.js?v=2'></script>";
?>
<script src="js/ajax.js" async="async"></script>
- <script src="js/mapspecs.js?v=112612"></script>
+ <script src="js/mapspecs.js?v=112512"></script>
<script>
(function(c,a){window.mixpanel=a;var b,d,h,e;b=c.createElement("script");b.type="text/javascript";b.async=!0;b.src=("https:"===c.location.protocol?"https:":"http:")+'//cdn.mxpnl.com/libs/mixpanel-2.1.min.js';d=c.getElementsByTagName("script")[0];d.parentNode.insertBefore(b,d);a._i=[];a.init=function(b,c,f){function d(a,b){var c=b.split(".");2==c.length&&(a=a[c[0]],b=c[1]);a[b]=function(){a.push([b].concat(Array.prototype.slice.call(arguments,0)))}}var g=a;"undefined"!==typeof f?
@@ -167,8 +151,8 @@ function topbar($links) {
<h2>Sign in</h2>
<div id="oid_box">
<h2 style="color:#333;">Do you have an account here?</h2>
- <a href="login?op=google"><img id="oid_btn" src="images/btns/signin_Google.png" alt="Sign in with Google" /></a>
- <a href="login?op=yahoo"><img id="oid_btn" src="images/btns/signin_Yahoo.png" alt="Sign in with Yahoo" /></a>
+ <a rel="nofollow" href="login?op=google"><img id="oid_btn" src="images/btns/signin_Google.png" alt="Sign in with Google" /></a>
+ <a rel="nofollow" href="login?op=yahoo"><img id="oid_btn" src="images/btns/signin_Yahoo.png" alt="Sign in with Yahoo" /></a>
<a id="oid_learn" href="http://openid.net/get-an-openid/what-is-openid/" target="_blank" >Learn more about OpenID</a>
<a id="oid_cancel" href="javascript:hideSignin();">X</a>
</div>