projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f7ecb8c)
Updated Node port
authorDarren <darren@darren-vm.(none)>
Fri, 15 Jul 2011 15:41:09 +0000 (16:41 +0100)
committerDarren <darren@darren-vm.(none)>
Fri, 15 Jul 2011 15:41:09 +0000 (16:41 +0100)
config.php [deleted file] patch | blob | blame | history
css/default_1.css [deleted file] patch | blob | blame | history
index.php patch | blob | blame | history
ircd_profiles/hybrid.php [deleted file] patch | blob | blame | history
ircd_profiles/rfc_1459.php [deleted file] patch | blob | blame | history
ircd_profiles/rfc_2812.php [deleted file] patch | blob | blame | history
js/gateway.js patch | blob | blame | history

diff --git a/config.php b/config.php
deleted file mode 100644 (file)
index 4783f0a..0000000
--- a/config.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php\r
-       \r
-       $config = array(\r
-               'sok_dir' => '/tmp/',\r
-               'sok_prefix' => 'kiwi_',\r
-               \r
-               'memcache_use' => true,\r
-               'memcache_addr' => 'localhost',\r
-               'memcache_port' => 11211,\r
-               \r
-               'php_path' => '/usr/bin/php5',\r
-               'session_script_path' => dirname(__FILE__).'/irc_session.php',\r
-               //Unused 'cons_per_host' => 5,\r
-               \r
-               'messages_per_poll' => 30,\r
-               'max_time_per_poll' => 30, //60*2,\r
-               'timeout' => 5, // minimum time in seconds in which the webclient needs to poll the server\r
-               'scrollback_size' => 15,\r
-               'connections_per_host' => 20,\r
-               \r
-               'websocket' => array(\r
-                       'bind_addr'=>'0.0.0.0',\r
-                       'bind_port'=>7777\r
-               )\r
-       );
\ No newline at end of file
diff --git a/css/default_1.css b/css/default_1.css
deleted file mode 100644 (file)
index 007ff7e..0000000
--- a/css/default_1.css
+++ /dev/null
@@ -1,30 +0,0 @@
-body, html { height: 100%; margin:0px; }\r
-\r
-\r
-\r
-#kiwi { overflow:hidden; font-family:monospace; font-size:1em; height:100%; }\r
-#kiwi * {\r
-       padding:0px; margin:0px;\r
-}\r
-#kiwi ul { list-style:none; }\r
-\r
-#kiwi .userlist {\r
-       float:right;\r
-       width: 100px;\r
-       margin: 5px;\r
-       overflow-y:auto;\r
-}\r
-\r
-#kiwi .messages {      overflow-y:scroll; height:90%; border:1px solid #999; }\r
-\r
-#kiwi .messages .msg { border-bottom: 1px solid #CCC; }\r
-#kiwi .messages .msg .time { width:6em; float:left; }\r
-#kiwi .messages .msg .nick { width:7em; text-align:right; float:left; }\r
-#kiwi .messages .msg .text { margin-left:15em; }\r
-\r
-#kiwi .control { margin: 3px;}\r
-#kiwi .control .msginput { padding:3px; padding-left: 7em; background-color:#F2F9FD; }\r
-#kiwi .control .msginput .nick { float:left; width:6em; text-align:right; }\r
-#kiwi .control .msginput .nick a { text-decoration:none; }\r
-#kiwi .control .msginput input { margin-left: 1em; border:none; background-color:inherit; padding:3px; display:block;}\r
-#kiwi .control .plugins ul li { display:inline; font-size:0.9em; margin-left:1em; }
\ No newline at end of file
diff --git a/index.php b/index.php
index a2c1dee0be98edb1ba7063a479fe77a0fbfe0c5d..9624789a3d83ba19b474865eea7a5cdcb1aa00b2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -26,6 +26,8 @@
        $server = isset($_GET['server']) ? $_GET['server'] : "irc.anonnet.org";\r
        $nick = isset($_GET['nick']) ? $_GET['nick'] : "";\r
        // Channel is set via javascript using location.hash\r
+\r
+       $node_server = $_SERVER['HTTP_HOST'];\r
        \r
 ?>\r
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
@@ -45,7 +47,7 @@
 <link rel="stylesheet" type="text/css" href="css/touchscreen_tweaks.css">\r
 <?php } ?>\r
 \r
-<script src="http://192.168.1.127:7777/socket.io/socket.io.js"></script>\r
+<script src="http://<?php echo $node_server; ?>:7777/socket.io/socket.io.js"></script>\r
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>\r
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>\r
 <script type="text/javascript" src="js/jquery.json-2.2.min.js"></script>\r
@@ -58,9 +60,10 @@
 <?php } ?>\r
 \r
 <script type="text/javascript">\r
-       var agent = '<?= $agent ?>';\r
-       var touchscreen = <?= ($touchscreen) ? 'true' : 'false' ?>;\r
+       var agent = '<?php echo $agent; ?>';\r
+       var touchscreen = <?php echo ($touchscreen) ? 'true' : 'false'; ?>;\r
        var init_data = {};\r
+       var kiwi_server = 'wss://<?php echo $node_server; ?>:7777/';\r
        \r
        $(document).ready(function(){\r
                if(touchscreen) $('#kiwi').addClass('touchscreen');\r
@@ -73,6 +76,7 @@
                }\r
                \r
                front.init();\r
+               gateway.start(kiwi_server);\r
                \r
                addEvents();\r
                $('.nick').focus();\r
diff --git a/ircd_profiles/hybrid.php b/ircd_profiles/hybrid.php
deleted file mode 100644 (file)
index f5284b4..0000000
--- a/ircd_profiles/hybrid.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php\r
-\r
-       /*\r
-        * Best of all worlds\r
-        * A collection of response commands from all RFCs.\r
-        * These selected appears to work best for the most part.\r
-        */\r
-       \r
-       define('RPL_WHOISUSER', 311);\r
-       define('RPL_WHOISSERVER', 312);\r
-       define('RPL_WHOISOPERATOR', 313);\r
-       define('RPL_WHOISIDLE', 317);\r
-       define('RPL_ENDOFWHOIS', 318);\r
-       define('RPL_WHOISCHANNELS', 319);\r
-       \r
-       define('RPL_MOTD', 372);\r
-       define('RPL_WHOISMODES', 379);                                  // Unreal. Conflicts.\r
-       \r
-       define('ERR_NOSUCHNICK', 401);\r
-       define('ERR_NOSUCHSERVER', 402);\r
-       define('ERR_NOSUCHCHANNEL', 403);\r
-       define('ERR_CANNOTSENDTOCHAN', 404);\r
-       define('ERR_TOOMANYCHANNELS', 405);\r
-       define('ERR_WASNOSUCHNICK', 406);\r
-       define('ERR_TOOMANYTARGETS', 407);\r
-               \r
-       define('ERR_LINKCHANNEL', 470);
\ No newline at end of file
diff --git a/ircd_profiles/rfc_1459.php b/ircd_profiles/rfc_1459.php
deleted file mode 100644 (file)
index a4ff2a0..0000000
--- a/ircd_profiles/rfc_1459.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php\r
-\r
-       $resp_code = array(\r
-               'ERR_NOSUCHNICK' => '401',\r
-               'ERR_NOSUCHSERVER' => '402',\r
-               'ERR_NOSUCHCHANNEL' => '403',\r
-               'ERR_CANNOTSENDTOCHAN' => '404',\r
-               'ERR_TOOMANYCHANNELS' => '405',\r
-               'ERR_WASNOSUCHNICK' => '406',\r
-               'ERR_TOOMANYTARGETS' => '407',\r
-       );
\ No newline at end of file
diff --git a/ircd_profiles/rfc_2812.php b/ircd_profiles/rfc_2812.php
deleted file mode 100644 (file)
index 4db4751..0000000
--- a/ircd_profiles/rfc_2812.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php\r
-\r
-       $resp_code = array(\r
-               'RPL_WELCOME' => '001',\r
-               'RPL_YOURHOST' => '002',\r
-       );
\ No newline at end of file
diff --git a/js/gateway.js b/js/gateway.js
index 39237680e663e66acff04474a908df4d027e4a54..b5b252c4bf6a276e64310e2c3f021e3f38ea8b65 100644 (file)
--- a/js/gateway.js
+++ b/js/gateway.js
@@ -12,8 +12,8 @@ var gateway = {
     user_prefixes: [],
     socket: null,
        
-    start: function () {
-        gateway.socket = io.connect('wss://192.168.1.127:7777/');
+    start: function (kiwi_server) {
+        gateway.socket = io.connect(kiwi_server);
         gateway.socket.on('connect', function () {
             gateway.sendData = function (data, callback) {
                 gateway.socket.emit('message', {sid: this.session_id, data: $.toJSON(data)}, callback);