X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/6f848bbb40fdc691537f3c7d1e4c20931c7178a0..3bf9d70e994874a792f87fa52c20d195a3b598b3:/js/ui/panes/connect.js
diff --git a/js/ui/panes/connect.js b/js/ui/panes/connect.js
index 1f99dd9..abe71ef 100644
--- a/js/ui/panes/connect.js
+++ b/js/ui/panes/connect.js
@@ -1,165 +1,235 @@
-qwebirc.ui.GenericLoginBox = function(parentElement, callback, initialNickname, initialChannels, autoConnect, autoNick, networkName) {
- if(autoConnect) {
- qwebirc.ui.ConfirmBox(parentElement, callback, initialNickname, initialChannels, autoNick, networkName);
- } else {
- qwebirc.ui.LoginBox(parentElement, callback, initialNickname, initialChannels, networkName);
- }
-}
+qwebirc.ui.ConnectPane = new Class({
+ Implements: [Events],
+ initialize: function(parent, options) {
+ var callback = options.callback, initialNickname = options.initialNickname, initialChannels = options.initialChannels, networkName = options.networkName, autoConnect = options.autoConnect, autoNick = options.autoNick;
+ this.options = options;
+ this.__windowName = "authgate_" + Math.floor(Math.random() * 100000);
-qwebirc.ui.AuthLogin = function(e) {
- var cookie = Cookie.write("redirect", document.location);
- document.location = "./auth/";
- new Event(e).stop();
-}
+ var delayfn = function() { parent.set("html", "
Loading. . .
"); };
+ var cb = delayfn.delay(500);
-qwebirc.ui.ConfirmBox = function(parentElement, callback, initialNickname, initialChannels, autoNick, networkName) {
- var outerbox = new Element("table");
- outerbox.addClass("qwebirc-centrebox");
- parentElement.appendChild(outerbox);
- var tbody = new Element("tbody");
- outerbox.appendChild(tbody);
- var tr = new Element("tr");
- tbody.appendChild(tr);
- var td = new Element("td");
- tr.appendChild(td);
-
- var box = new Element("table");
- box.addClass("qwebirc-confirmbox");
- td.appendChild(box);
+ var r = qwebirc.ui.RequestTransformHTML({url: qwebirc.global.staticBaseURL + "panes/connect.html", update: parent, onSuccess: function() {
+ $clear(cb);
- var tbody = new Element("tbody");
- box.appendChild(tbody);
-
- var tr = new Element("tr");
- tbody.appendChild(tr);
- tr.addClass("tr1");
-
- var text = new Element("td");
- tr.appendChild(text);
-
- var nick = new Element("b");
- nick.set("text", initialNickname);
-
- var c = initialChannels.split(" ")[0].split(",");
-
- text.appendChild(document.createTextNode("To connect to " + networkName + " IRC and join channel" + ((c.length>1)?"s":"") + " "));
+ var box = (autoConnect ? "confirm" : "login");
+ var rootElement = parent.getElement("[name=" + box + "box]");
+ this.rootElement = rootElement;
+
+ this.util.exec = function(n, x) { rootElement.getElements(n).each(x); };
+ var util = this.util;
+ var exec = util.exec;
+ util.makeVisible(rootElement);
- for(var i=0;i 1) && (i == c.length - 1)) {
- text.appendChild(document.createTextNode(" and "));
- } else if(i > 0) {
- text.appendChild(document.createTextNode(", "));
- }
- text.appendChild(new Element("b").set("text", c[i]));
-
- }
-
- if(!autoNick) {
- text.appendChild(document.createTextNode(" as "));
- text.appendChild(nick);
- }
-
- text.appendChild(document.createTextNode(" click 'Connect'."));
- text.appendChild(new Element("br"));
- if(qwebirc.auth.enabled() && qwebirc.auth.quakeNetAuth() && !qwebirc.auth.loggedin())
- text.appendChild(document.createTextNode("If you'd like to connect using your Q auth click 'Log in'."));
-
- var tr = new Element("tr");
- tbody.appendChild(tr);
- tr.addClass("tr2");
-
- var td = new Element("td");
- tr.appendChild(td);
+ exec("[name=nickname]", util.setText(initialNickname));
+ exec("[name=channels]", util.setText(initialChannels));
+ exec("[name=prettychannels]", function(node) { this.__buildPrettyChannels(node, initialChannels); }.bind(this));
+ exec("[name=networkname]", util.setText(networkName));
- var yes = new Element("input", {"type": "submit", "value": "Connect"});
- td.appendChild(yes);
- yes.focus();
- yes.addEvent("click", function(e) {
- parentElement.removeChild(outerbox);
- callback({"nickname": initialNickname, "autojoin": initialChannels});
- });
-
- if(qwebirc.auth.enabled() && qwebirc.auth.quakeNetAuth() && !qwebirc.auth.loggedin()) {
- var auth = new Element("input", {"type": "submit", "value": "Log in"});
- td.appendChild(auth);
- auth.addEvent("click", qwebirc.ui.AuthLogin);
- }
-}
+ var focus = "connect";
+ if(autoConnect) {
+ if(!autoNick)
+ exec("[name=nickselected]", util.makeVisible);
-qwebirc.ui.LoginBox = function(parentElement, callback, initialNickname, initialChannels, networkName) {
- var outerbox = new Element("table");
- outerbox.addClass("qwebirc-centrebox");
- parentElement.appendChild(outerbox);
- var tbody = new Element("tbody");
- outerbox.appendChild(tbody);
- var tr = new Element("tr");
- tbody.appendChild(tr);
- var td = new Element("td");
- tr.appendChild(td);
-
- var box = new Element("table");
- box.addClass("qwebirc-loginbox");
- td.appendChild(box);
-
- var tbody = new Element("tbody");
- box.appendChild(tbody);
-
- var tr = new Element("tr");
- tbody.appendChild(tr);
- tr.addClass("tr1");
-
- var td = new Element("td");
- tr.appendChild(td);
- td.set("html", "Connect to " + networkName + " IRC
");
-
- var tr = new Element("tr");
- tbody.appendChild(tr);
- tr.addClass("tr2");
-
- var td = new Element("td");
- tr.appendChild(td);
-
- var form = new Element("form");
- td.appendChild(form);
+ this.__validate = this.__validateConfirmData;
+ } else {
+ if(!initialNickname) {
+ focus = "nickname";
+ } else if(initialNickname && !initialChannels) {
+ focus = "channels";
+ }
- var boxtable = new Element("table");
- form.appendChild(boxtable);
+ this.__validate = this.__validateLoginData;
+ }
- var tbody = new Element("tbody");
- boxtable.appendChild(tbody); /* stupid IE */
+ if(qwebirc.auth.loggedin()) {
+ exec("[name=authname]", util.setText(qwebirc.auth.loggedin()));
+ exec("[name=connectbutton]", util.makeVisible);
+ exec("[name=loginstatus]", util.makeVisible);
+ } else {
+ if(qwebirc.ui.isAuthRequired()) {
+ exec("[name=loginconnectbutton]", util.makeVisible);
+ if(focus == "connect")
+ focus = "loginconnect";
+ } else {
+ exec("[name=connectbutton]", util.makeVisible);
+ exec("[name=loginbutton]", util.makeVisible);
+ }
+ }
- function createRow(label, e2, style) {
- var r = new Element("tr");
- tbody.appendChild(r);
+ if(window == window.top) /* don't focus when we're iframe'd */
+ exec("[name=" + focus + "]", util.focus);
+ exec("[name=connect]", util.attachClick(this.__connect.bind(this)));
+ exec("[name=loginconnect]", util.attachClick(this.__loginConnect.bind(this)));
- var d1 = new Element("td");
- if(label)
- d1.set("text", label);
- r.appendChild(d1);
+ exec("[name=login]", util.attachClick(this.__login.bind(this)));
- var d2 = new Element("td");
- r.appendChild(d2);
-
- if($defined(e2))
- d2.appendChild(e2);
- if($defined(style)) {
- r.setStyles(style);
- return [r, d2];
+ if(qwebirc.ui.isHideAuth())
+ exec("[name=login]", util.setVisible(false));
+ }.bind(this)});
+ r.get();
+ },
+ util: {
+ makeVisible: function(x) { x.setStyle("display", ""); },
+ setVisible: function(y) { return function(x) { x.setStyle("display", y ? "" : "none"); }; },
+ focus: function(x) { x.focus(); },
+ attachClick: function(fn) { return function(x) { x.addListener("click", fn); } },
+ setText: function(x) { return function(y) {
+ if(typeof y.value === "undefined") {
+ y.set("text", x);
+ } else {
+ y.value = x === null ? "" : x;
+ }
+ } }
+ },
+ validate: function() {
+ return this.__validate();
+ },
+ __connect: function(e) {
+ new Event(e).stop();
+ var data = this.validate();
+ if(data === false)
+ return;
+
+ this.__cancelLogin();
+ this.fireEvent("close");
+ this.options.callback(data);
+ },
+ __cancelLogin: function(noUIModifications) {
+ if(this.__cancelLoginCallback)
+ this.__cancelLoginCallback(noUIModifications);
+ },
+ __loginConnect: function(e) {
+ new Event(e).stop();
+ if(this.validate() === false)
+ return;
+
+ this.__performLogin(function() {
+ var data = this.validate();
+ if(data === false) {
+ /* we're logged in -- show the normal join button */
+ this.util.exec("[name=connectbutton]", this.util.setVisible(true));
+ return;
+ }
+
+ this.fireEvent("close");
+ this.options.callback(data);
+ }.bind(this), "loginconnectbutton");
+ },
+ __login: function(e) {
+ new Event(e).stop();
+
+ this.__cancelLogin(true);
+
+ this.__performLogin(function() {
+ var focus = "connect";
+ if(!this.options.autoConnect) {
+ var nick = this.rootElement.getElement("input[name=nickname]").value, chan = this.rootElement.getElement("input[name=channels]").value;
+ if(!nick) {
+ focus = "nickname";
+ } else if(!chan) {
+ focus = "channels";
+ }
+ }
+ this.util.exec("[name=" + focus + "]", this.util.focus);
+ }.bind(this), "login");
+ },
+ __performLogin: function(callback, calleename) {
+ Cookie.write("jslogin", "1");
+
+ var handle = window.open("/auth", this.__windowName, "status=0,toolbar=0,location=1,menubar=0,directories=0,resizable=0,scrollbars=1,height=280,width=550");
+
+ if(handle === null || handle === undefined) {
+ Cookie.dispose("jslogin");
+// Cookie.write("redirect", document.location);
+// window.location = "auth?";
+ return;
+ }
+
+ var closeDetector = function() {
+ if(handle.closed)
+ this.__cancelLoginCallback();
+ }.bind(this);
+ var closeCallback = closeDetector.periodical(100);
+
+ this.__cancelLoginCallback = function(noUIModifications) {
+ $clear(closeCallback);
+
+ Cookie.dispose("jslogin");
+
+ try {
+ handle.close();
+ } catch(e) {
+ }
+
+ if(!noUIModifications) {
+ this.util.exec("[name=loggingin]", this.util.setVisible(false));
+ this.util.exec("[name=" + calleename + "]", this.util.setVisible(true));
+ }
+ this.__cancelLoginCallback = null;
+ }.bind(this);
+
+ this.util.exec("[name=loggingin]", this.util.setVisible(true));
+ this.util.exec("[name=" + calleename + "]", this.util.setVisible(false));
+
+ __qwebircAuthCallback = function(username, expiry, serverNow) {
+ this.__cancelLoginCallback(true);
+
+ var now = new Date().getTime();
+ var offset = (serverNow * 1000) - now;
+ var ourExpiry = expiry * 1000 - offset;
+ Cookie.write("ticketexpiry", ourExpiry)
+
+ this.util.exec("[name=loggingin]", this.util.setVisible(false));
+ this.util.exec("[name=loginstatus]", this.util.setVisible(true));
+ this.util.exec("[name=authname]", this.util.setText(username));
+ callback();
+ }.bind(this);
+
+ },
+ __validateConfirmData: function() {
+ return {nickname: this.options.initialNickname, autojoin: this.options.initialChannels};
+ },
+ __validateLoginData: function() {
+ var nick = this.rootElement.getElement("input[name=nickname]"), chan = this.rootElement.getElement("input[name=channels]");
+
+ var nickname = nick.value;
+ var chans = chan.value;
+ if(chans == "#") /* sorry channel "#" :P */
+ chans = "";
+
+ if(!nickname) {
+ alert("You must supply a nickname.");
+ nick.focus();
+ return false;
+ }
+
+ var stripped = qwebirc.global.nicknameValidator.validate(nickname);
+ if(stripped != nickname) {
+ nick.value = stripped;
+ alert("Your nickname was invalid and has been corrected; please check your altered nickname and try again.");
+ nick.focus();
+ return false;
}
- return d2;
+ var data = {nickname: nickname, autojoin: chans};
+ return data;
+ },
+ __buildPrettyChannels: function(node, channels) {
+ var c = channels.split(" ")[0].split(",");
+ node.appendChild(document.createTextNode("channel" + ((c.length>1)?"s":"") + " "));
+ for(var i=0;i 1) && (i == c.length - 1)) {
+ node.appendChild(document.createTextNode(" and "));
+ } else if(i > 0) {
+ node.appendChild(document.createTextNode(", "));
+ }
+ node.appendChild(new Element("b").set("text", c[i]));
+ }
}
+});
- var nick = new Element("input");
- createRow("Nickname:", nick);
-
- var chanStyle = null;
- if(qwebirc.auth.enabled() && qwebirc.auth.bouncerAuth())
- chanStyle = {display: "none"};
-
- var chan = new Element("input");
- createRow("Channels:", chan, chanStyle);
-
+qwebirc.ui.LoginBox2 = function(parentElement, callback, initialNickname, initialChannels, networkName) {
+/*
if(qwebirc.auth.enabled()) {
if(qwebirc.auth.passAuth()) {
var authRow = createRow("Auth to services:");
@@ -177,19 +247,15 @@ qwebirc.ui.LoginBox = function(parentElement, callback, initialNickname, initial
var passwordBox = qwebirc.util.createInput("password", passwordRow, "connect_auth_password");
}
}
-
+ */
+
var connbutton = new Element("input", {"type": "submit"});
connbutton.set("value", "Connect");
var r = createRow(undefined, connbutton);
- if(qwebirc.auth.enabled() && qwebirc.auth.quakeNetAuth() && !qwebirc.auth.loggedin()) {
- var auth = new Element("input", {"type": "submit", "value": "Log in"});
- r.appendChild(auth);
- auth.addEvent("click", qwebirc.ui.AuthLogin);
- }
-
form.addEvent("submit", function(e) {
new Event(e).stop();
+
var nickname = nick.value;
var chans = chan.value;
if(chans == "#") /* sorry channel "#" :P */
@@ -200,7 +266,14 @@ qwebirc.ui.LoginBox = function(parentElement, callback, initialNickname, initial
nick.focus();
return;
}
-
+ var stripped = qwebirc.global.nicknameValidator.validate(nickname);
+ if(stripped != nickname) {
+ nick.value = stripped;
+ alert("Your nickname was invalid and has been corrected; please check your altered nickname and press Connect again.");
+ nick.focus();
+ return;
+ }
+
var data = {"nickname": nickname, "autojoin": chans};
if(qwebirc.auth.enabled()) {
if(qwebirc.auth.passAuth() && authCheckBox.checked) {
@@ -233,7 +306,8 @@ qwebirc.ui.LoginBox = function(parentElement, callback, initialNickname, initial
nick.set("value", initialNickname);
chan.set("value", initialChannels);
- nick.focus();
+ if(window == window.top)
+ nick.focus();
}
qwebirc.ui.authShowHide = function(checkbox, authRow, usernameBox, usernameRow, passwordRow) {
@@ -247,3 +321,20 @@ qwebirc.ui.authShowHide = function(checkbox, authRow, usernameBox, usernameRow,
usernameBox.focus();
}
}
+
+qwebirc.ui.isAuthRequired = (function() {
+ var args = qwebirc.util.parseURI(String(document.location));
+ var value = $defined(args) && args["authrequired"];
+ return function() {
+ return value && qwebirc.auth.enabled();
+ };
+})();
+
+qwebirc.ui.isHideAuth = (function() {
+ var args = qwebirc.util.parseURI(String(document.location));
+ var value = $defined(args) && args["hideauth"];
+ return function() {
+ return value;
+ };
+})();
+