From: Darren <darren@darrenwhitlen.com>
Date: Sun, 17 Jul 2011 15:03:35 +0000 (+0100)
Subject: Changed from ww/s to socket.io http/s
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=12a3d773abc5c3868e896756f9660316d3b03789;p=KiwiIRC.git

Changed from ww/s to socket.io http/s
---

diff --git a/index.php b/index.php
index e96e89d..3994fd0 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,7 @@
 <?php
 
+	$node_config = json_decode(file_get_contents("node/config.json"), true);
+
 	switch(true){
 		case stripos($_SERVER['HTTP_USER_AGENT'], 'android') > 0:
 			$agent = "android"; $touchscreen = true;
@@ -64,7 +66,7 @@
 	var agent = '<?php echo $agent; ?>';
 	var touchscreen = <?php echo ($touchscreen) ? 'true' : 'false'; ?>;
 	var init_data = {};
-	var kiwi_server = 'wss://<?php echo $node_server; ?>:7777/';
+	var kiwi_server = '<?php echo ($node_config['listen_ssl'] ? "https" : "http")."://".$node_server; ?>:7777/';
 	var touch_scroll;
 	
 	$(document).ready(function(){
diff --git a/js/gateway.js b/js/gateway.js
index 585c207..46d6e51 100644
--- a/js/gateway.js
+++ b/js/gateway.js
@@ -21,7 +21,6 @@ var gateway = {
             gateway.socket.on('message', gateway.parse);
             gateway.socket.on('disconnect', function () {
                 // Teardown procedure here
-                // TODO: Ask Ehm if teardown with socket.io is required
                 $(gateway).trigger("ondisconnect", {});
             });
         });