From e6b60448bc08df316daf220db8ecfddc58aefe84 Mon Sep 17 00:00:00 2001 From: Snap Date: Fri, 1 May 2015 16:25:28 -0700 Subject: Minor fixes and adjustments. Moved Javascript in chat to: js/chat.js re-ordered script loading so Jquery loads first. Fixed cookie login issue. --- ajax/chat.ajax.php | 4 +- globe.php | 3 +- includes/header.php | 11 +- index.php | 42 +++-- js/chat.js | 430 ++++++++++++++++++++++++++++++++++++++++++++++++++ js/globe.js | 30 ++++ js/mapspecs.js | 28 ---- pages/chat.php | 441 +--------------------------------------------------- 8 files changed, 501 insertions(+), 488 deletions(-) create mode 100644 js/chat.js diff --git a/ajax/chat.ajax.php b/ajax/chat.ajax.php index 2ffa878..036efad 100644 --- a/ajax/chat.ajax.php +++ b/ajax/chat.ajax.php @@ -72,10 +72,8 @@ $use_psuedo_longpoll = true; // } require_once('../includes/chats.php'); - -//exit; - enterChannel($userID); + $sent = false; //User is sending a message diff --git a/globe.php b/globe.php index fe7123b..5abff5f 100644 --- a/globe.php +++ b/globe.php @@ -98,7 +98,8 @@ function CookieLogin() { $_SESSION['displayName'] = $display; $_SESSION['dateJoined'] = $dateJoined; if ($isAdmin == 1) $_SESSION['isAdmin'] = true; - header("Location: $mydomain"); + // There should be no reason to re-load the page. + //header("Location: $mydomain"); } else { setcookie("doLogin", "lastAttemptFailed"); setcookie("userID", ""); diff --git a/includes/header.php b/includes/header.php index cb34fac..427a57d 100644 --- a/includes/header.php +++ b/includes/header.php @@ -22,18 +22,21 @@ function htmlHeader($css = array(), $title = 'Pathery', $desc = '', $scripts = a -\n"; } - if ($desc !== '') echo " "; - - foreach ($scripts as $s) echo ""; ?> +"; + + foreach ($scripts as $s) echo ""; +?> + - -

Pathery Chat - BETA

-- cgit v1.2.3