moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ACP reading wrong config key

This commit is contained in:
calzoneman 2014-04-13 19:27:32 -05:00
parent 64980bc293
commit 48e808c8ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config.js
View File

@ -225,7 +225,7 @@ function preprocessConfig(cfg) {
// HTTP/HTTPS domains with port numbers // HTTP/HTTPS domains with port numbers
if (!cfg.http["full-address"]) { if (!cfg.http["full-address"]) {
var httpfa = cfg.http.domain; var httpfa = cfg.http.domain;
if (cfg.http.port !== 80) { if (cfg.http["default-port"] !== 80) {
httpfa += ":" + cfg.http["default-port"]; httpfa += ":" + cfg.http["default-port"];
} }
cfg.http["full-address"] = httpfa; cfg.http["full-address"] = httpfa;
@ -233,7 +233,7 @@ function preprocessConfig(cfg) {
if (!cfg.https["full-address"]) { if (!cfg.https["full-address"]) {
var httpsfa = cfg.https.domain; var httpsfa = cfg.https.domain;
if (cfg.https.port !== 443) { if (cfg.https["default-port"] !== 443) {
httpsfa += ":" + cfg.https["default-port"]; httpsfa += ":" + cfg.https["default-port"];
} }
cfg.https["full-address"] = httpsfa; cfg.https["full-address"] = httpsfa;

4
lib/web/acp.js
View File

@ -43,9 +43,9 @@ function checkAdmin(cb) {
function handleAcp(req, res, user) { function handleAcp(req, res, user) {
var sio; var sio;
if (req.secure) { if (req.secure) {
sio = Config.get("https.domain") + ":" + Config.get("https.port"); sio = Config.get("https.domain") + ":" + Config.get("https.default-port");
} else { } else {
sio = Config.get("io.domain") + ":" + Config.get("io.port"); sio = Config.get("io.domain") + ":" + Config.get("io.default-port");
} }
sio += "/socket.io/socket.io.js"; sio += "/socket.io/socket.io.js";