rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Merge refactoring into 3.0

Browse source
This commit is contained in:
Calvin Montgomery 2014-05-20 19:30:14 -07:00
parent 91bf6a5062
commit 9ea48f58cf
39 changed files with 5555 additions and 6262 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/web/webserver.js
View file

@ -116,11 +116,14 @@ function handleChannel(req, res) {
}
var sio;
if (req.secure) {
sio = Config.get("https.full-address");
} else {
sio = Config.get("io.domain") + ":" + Config.get("io.default-port");
if (net.isIPv6(ipForRequest(req))) {
sio = Config.get("io.ipv6-default");
}
if (!sio) {
sio = Config.get("io.ipv4-default");
}
sio += "/socket.io/socket.io.js";
sendJade(res, "channel", {
@ -166,14 +169,19 @@ function handleSocketConfig(req, res) {
res.type("application/javascript");
var io_url = Config.get("io.domain") + ":" + Config.get("io.default-port");
var web_url = Config.get("http.domain") + ":" + Config.get("http.default-port");
var ssl_url = Config.get("https.domain") + ":" + Config.get("https.default-port");
res.send("var IO_URL='"+io_url+"',WEB_URL='"+web_url+"',SSL_URL='" + ssl_url +
"',ALLOW_SSL="+Config.get("https.enabled")+";" +
(Config.get("https.enabled") ?
"if(location.protocol=='https:'||USEROPTS.secure_connection){" +
"IO_URL=WEB_URL=SSL_URL;}" : ""));
var sioconfig = Config.get("sioconfig");
var iourl;
var ip = ipForRequest(req);
if (net.isIPv6(ip)) {
iourl = Config.get("io.ipv6-default");
}
if (!iourl) {
iourl = Config.get("io.ipv4-default");
}
sioconfig += "var IO_URL='" + iourl + "';";
res.send(sioconfig);
}
function handleUserAgreement(req, res) {