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

SSL fixes; work on password reset

Browse source
This commit is contained in:
calzoneman 2014-01-23 22:59:08 -06:00
parent 21af0af1be
commit 65ef082a64
5 changed files with 129 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
www/assets/js/callbacks.js
View file

@ -1040,20 +1040,19 @@ setupCallbacks = function() {
}
}
$.getScript(IO_URL+"/socket.io/socket.io.js", function() {
try {
if(NO_WEBSOCKETS || USEROPTS.altsocket) {
var i = io.transports.indexOf("websocket");
if(i >= 0)
io.transports.splice(i, 1);
try {
if (NO_WEBSOCKETS || USEROPTS.altsocket) {
var i = io.transports.indexOf("websocket");
if (i >= 0) {
io.transports.splice(i, 1);
}
var opts = {};
if (location.protocol === "https:")
opts.secure = true;
socket = io.connect(IO_URL);
setupCallbacks();
}
catch(e) {
Callbacks.disconnect();
var opts = {};
if (location.protocol === "https:" || USEROPTS.secure_connection) {
opts.secure = true;
}
});
socket = io.connect(IO_URL, opts);
setupCallbacks();
} catch (e) {
Callbacks.disconnect();
}

2
www/assets/js/util.js
View file

@ -829,7 +829,6 @@ function handleModPermissions() {
setParentVisible("a[href='#cs-filtereditor']", CLIENT.rank >= 3);
setParentVisible("a[href='#cs-chanranks']", CLIENT.rank >= 3);
setParentVisible("a[href='#cs-chanlog']", CLIENT.rank >= 3);
$("#qlockbtn").attr("disabled", !hasPermission("playlistlock"));
$("#cs-chatfilters-import").attr("disabled", !hasPermission("filterimport"));
}
@ -838,6 +837,7 @@ function handlePermissionChange() {
handleModPermissions();
}
$("#qlockbtn").attr("disabled", !hasPermission("playlistlock"));
setVisible("#showchansettings", CLIENT.rank >= 2);
setVisible("#playlistmanagerwrap", CLIENT.rank >= 1);
setVisible("#modflair", CLIENT.rank >= 2);