summaryrefslogtreecommitdiffstats
path: root/ajax
diff options
context:
space:
mode:
authorBlueRaja <BlueRaja.admin@gmail.com>2013-06-09 01:03:03 -0500
committerBlueRaja <BlueRaja.admin@gmail.com>2013-06-09 01:03:03 -0500
commit9c20000fb8871437dafb41ec830afbf56a746a57 (patch)
tree713e39b607c4ca474cd703ae9e62fca4226c7d45 /ajax
parent3a65ace8a32fa2c584adee4e75a0eccc9ee37208 (diff)
downloadpathery-9c20000fb8871437dafb41ec830afbf56a746a57.tar.xz
Attempting to remove the multiple calls to getChat(); however, I seem to have broken chat...Messing_with_chat
Diffstat (limited to 'ajax')
-rw-r--r--ajax/chat.ajax.php35
1 files changed, 11 insertions, 24 deletions
diff --git a/ajax/chat.ajax.php b/ajax/chat.ajax.php
index 02a11c6..f9370aa 100644
--- a/ajax/chat.ajax.php
+++ b/ajax/chat.ajax.php
@@ -111,35 +111,22 @@ if (isset($_REQUEST['messages'])) {
if ($_REQUEST['getChatFromID']) {
$getChatID = $_REQUEST['getChatFromID'];
if ($sent) {
- //Wait .2 seconds
- usleep(200000);
- //echo "yesSent";
- for( $i = 1; $i < 3; $i++) {
- //echo "loop";
- $data = getChat($getChatID);
- if ($data !== false) {
- //$data['debug'][] = "Count times: $i";
- //$data['debug'][] = "Count value:".count($data);
- echo prepareChatData($data);
- exit;
- }
- //Wait .1 seconds
- usleep(100000);
- }
+ $data = getChat($getChatID);
+ echo prepareChatData($data);
+ exit;
}
- $json = prepareChatData(getChat($getChatID));
- echo $json;
}
exit;
function prepareChatData($data) {
- if ($data) {
- foreach($data as &$user) {
- //$user['message'] = $user['message'].'write-append';
- $user['secondsSince'] = strtotime($user['dateSent']) - strtotime("now");
- }
- return json_encode($data);
+ if (!$data)
+ {
+ return false;
+ }
+ foreach($data as &$user) {
+ //$user['message'] = $user['message'].'write-append';
+ $user['secondsSince'] = strtotime($user['dateSent']) - strtotime("now");
}
- return $data;
+ return json_encode($data);
}
?> \ No newline at end of file