From 640816989a99e069397ed18f3fa703d1ec12d596 Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Wed, 15 Jan 2014 01:39:04 -0800
Subject: More work on channel list.

---
 ajax/chat.ajax.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'ajax/chat.ajax.php')

diff --git a/ajax/chat.ajax.php b/ajax/chat.ajax.php
index 8302c33..91c5b95 100644
--- a/ajax/chat.ajax.php
+++ b/ajax/chat.ajax.php
@@ -7,10 +7,15 @@ session_start();
 // }
 
 
-ini_set('display_errors',1);
-ini_set('display_startup_errors',1);
-error_reporting(-1);
+//ini_set('display_errors',1);
+//ini_set('display_startup_errors',1);
+//error_reporting(-1);
 
+if (isset($_REQUEST['pollChannelList'])) {
+	require_once('../includes/chats.php');
+	echo json_encode(getChannelList());
+	exit;
+}
 
 if (isset($_SESSION['chatLastReset'])) $chatLastReset = $_SESSION['chatLastReset'];
 else $chatLastReset = 0;
@@ -50,7 +55,9 @@ $use_psuedo_longpoll = true;
 
 require_once('../includes/chats.php');
 
+//exit;
 
+enterChannel($userID);
 $sent = false;
 
 if (isset($_REQUEST['messages'])) {
-- 
cgit v1.2.3