Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating to ChatZilla 0.9.75 on 1.8 branch

Browse Source 
r=silver
blanket-a=SeaMonkey Council (See bug 334161)
ChatZilla Only


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@206124 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gijskruitbosch%gmail.com
2006-07-31 11:46:21 +00:00
parent 0ed5c76ffb
commit 1f0d6200de
12 changed files with 350 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/extensions/irc/js/lib/command-manager.js
View File

@@ -172,6 +172,9 @@ function CommandManager (defaultBundle)
{
this.commands = new Object();
this.defaultBundle = defaultBundle;
this.currentDispatchDepth = 0;
this.maxDispatchDepth = 10;
this.dispatchUnwinding = false;
}
CommandManager.prototype.defaultFlags = 0;

85
mozilla/extensions/irc/js/lib/connection-xpcom.js
View File

@@ -51,7 +51,7 @@ const NS_NET_STATUS_SENDING_TO = NS_ERROR_MODULE_NETWORK + 5;
const NS_NET_STATUS_RECEIVING_FROM = NS_ERROR_MODULE_NETWORK + 6;
const NS_NET_STATUS_CONNECTING_TO = NS_ERROR_MODULE_NETWORK + 7;
// Security Constants.
// Security Constants.
const STATE_IS_BROKEN = 1;
const STATE_IS_SECURE = 2;
const STATE_IS_INSECURE = 3;
@@ -166,47 +166,67 @@ function CBSConnection (binary)
CBSConnection.prototype.workingBinaryStreams = -1;
CBSConnection.prototype.connect =
function bc_connect(host, port, bind, tcp_flag, isSecure, observer)
function bc_connect(host, port, config, observer)
{
if (typeof tcp_flag == "undefined")
tcp_flag = false;
this.host = host.toLowerCase();
this.port = port;
this.bind = bind;
this.tcp_flag = tcp_flag;
if (typeof config != "object")
config = {};
// Lets get a transportInfo for this
var cls =
Components.classes["@mozilla.org/network/protocol-proxy-service;1"];
var pps = cls.getService(Components.interfaces.nsIProtocolProxyService);
var pps = getService("@mozilla.org/network/protocol-proxy-service;1",
"nsIProtocolProxyService");
if (!pps)
throw ("Couldn't get protocol proxy service");
var ios = Components.classes["@mozilla.org/network/io-service;1"].
getService(Components.interfaces.nsIIOService);
var spec = "irc://" + host + ':' + port;
var uri = ios.newURI(spec,null,null);
// As of 2005-03-25, 'examineForProxy' was replaced by 'resolve'.
var info = null;
if ("resolve" in pps)
info = pps.resolve(uri, 0);
else if ("examineForProxy" in pps)
info = pps.examineForProxy(uri);
var ios = getService("@mozilla.org/network/io-service;1", "nsIIOService");
function getProxyFor(uri)
{
var uri = ios.newURI(uri, null, null);
// As of 2005-03-25, 'examineForProxy' was replaced by 'resolve'.
if ("resolve" in pps)
return pps.resolve(uri, 0);
if ("examineForProxy" in pps)
return pps.examineForProxy(uri);
return null;
};
var proxyInfo = null;
var usingHTTPCONNECT = false;
if ("proxy" in config)
{
/* Force Necko to supply the HTTP proxy info if desired. For none,
* force no proxy. Other values will get default treatment.
*/
if (config.proxy == "http")
proxyInfo = getProxyFor("http://" + host + ":" + port);
else if (config.proxy != "none")
proxyInfo = getProxyFor("irc://" + host + ":" + port);
/* Since the proxy info is opaque, we need to check that we got
* something for our HTTP proxy - we can't just check proxyInfo.type.
*/
usingHTTPCONNECT = ((config.proxy == "http") && proxyInfo);
}
else
{
proxyInfo = getProxyFor("irc://" + host + ":" + port);
}
if (jsenv.HAS_STREAM_PROVIDER)
{
if (isSecure)
if (("isSecure" in config) && config.isSecure)
{
this._transport = this._sockService.
createTransportOfType("ssl", host, port, info,
0, 0);
createTransportOfType("ssl", host, port,
proxyInfo, 0, 0);
}
else
{
this._transport = this._sockService.
createTransport(host, port, info, 0, 0);
createTransport(host, port, proxyInfo, 0, 0);
}
if (!this._transport)
throw ("Error creating transport.");
@@ -238,15 +258,16 @@ function bc_connect(host, port, bind, tcp_flag, isSecure, observer)
else
{
/* use new necko interfaces */
if (isSecure)
if (("isSecure" in config) && config.isSecure)
{
this._transport = this._sockService.
createTransport(["ssl"], 1, host, port, info);
createTransport(["ssl"], 1, host, port,
proxyInfo);
}
else
{
this._transport = this._sockService.
createTransport(null, 0, host, port, info);
createTransport(null, 0, host, port, proxyInfo);
}
if (!this._transport)
throw ("Error creating transport.");
@@ -276,6 +297,12 @@ function bc_connect(host, port, bind, tcp_flag, isSecure, observer)
this.connectDate = new Date();
this.isConnected = true;
// Bootstrap the connection if we're proxying via an HTTP proxy.
if (usingHTTPCONNECT)
{
this.sendData("CONNECT " + host + ":" + port + " HTTP/1.1\r\n\r\n");
}
return this.isConnected;
}
@@ -313,8 +340,6 @@ function bc_accept(transport, observer)
this._transport = transport;
this.host = this._transport.host.toLowerCase();
this.port = this._transport.port;
//this.bind = bind;
//this.tcp_flag = tcp_flag;
if (jsenv.HAS_STREAM_PROVIDER)
{

4
mozilla/extensions/irc/js/lib/dcc.js
View File

@@ -633,7 +633,7 @@ function dchat_accept()
this.state.sendAccept();
this.connection = new CBSConnection();
if (this.connection.connect(this.remoteIP, this.port, null, true, null))
if (this.connection.connect(this.remoteIP, this.port))
{
this.state.socketConnected();
@@ -1061,7 +1061,7 @@ function dfile_accept(localFile)
this.connection = new CBSConnection(true);
this.position = 0;
if (this.connection.connect(this.remoteIP, this.port, null, true, null))
if (this.connection.connect(this.remoteIP, this.port))
{
this.state.socketConnected();

98
mozilla/extensions/irc/js/lib/irc.js
View File

@@ -130,6 +130,9 @@ CIRCNetwork.prototype.MAX_CONNECT_ATTEMPTS = 5;
CIRCNetwork.prototype.getReconnectDelayMs = function() { return 15000; }
CIRCNetwork.prototype.stayingPower = false;
// "http" = use HTTP proxy, "none" = none, anything else = auto.
CIRCNetwork.prototype.PROXY_TYPE_OVERRIDE = "";
CIRCNetwork.prototype.TYPE = "IRCNetwork";
CIRCNetwork.prototype.getURL =
@@ -212,6 +215,19 @@ function net_delayedConnect(eventProperties)
network.immediateConnect(eventProperties);
};
if ((-1 != this.MAX_CONNECT_ATTEMPTS) &&
(this.connectAttempt >= this.MAX_CONNECT_ATTEMPTS))
{
this.state = NET_OFFLINE;
var ev = new CEvent("network", "error", this, "onError");
ev.debug = "Connection attempts exhausted, giving up.";
ev.errorCode = JSIRC_ERR_EXHAUSTED;
this.eventPump.addEvent(ev);
return;
}
this.state = NET_WAITING;
this.reconnectTimer = setTimeout(reconnectFn,
this.getReconnectDelayMs(),
@@ -344,20 +360,6 @@ function net_doconnect(e)
this.connectAttempt++;
this.connectCandidate++;
if ((-1 != this.MAX_CONNECT_ATTEMPTS) &&
(this.connectAttempt > this.MAX_CONNECT_ATTEMPTS))
{
this.state = NET_OFFLINE;
ev = new CEvent ("network", "error", this, "onError");
ev.server = this;
ev.debug = "Connection attempts exhausted, giving up.";
ev.errorCode = JSIRC_ERR_EXHAUSTED;
this.eventPump.addEvent(ev);
return false;
}
this.state = NET_CONNECTING; /* connection is considered "made" when server
* sends a 001 message (see server.on001) */
@@ -674,7 +676,11 @@ function serv_connect (password)
return false;
}
if (this.connection.connect(this.hostname, this.port, null, true, this.isSecure, null))
var config = { isSecure: this.isSecure };
if (this.parent.PROXY_TYPE_OVERRIDE)
config.proxy = this.parent.PROXY_TYPE_OVERRIDE;
if (this.connection.connect(this.hostname, this.port, config))
{
var ev = new CEvent("server", "connect", this, "onConnect");
@@ -2271,48 +2277,74 @@ function serv_invite(e)
CIRCServer.prototype.onNotice =
function serv_notice (e)
{
if (!("user" in e))
var targetName = e.params[1];
// Strip off one (and only one) user mode prefix.
for (var i = 0; i < this.userModes.length; i++)
{
if (targetName[0] == this.userModes[i].symbol)
{
targetName = targetName.substr(1);
break;
}
}
if (arrayIndexOf(this.channelTypes, targetName[0]) != -1)
{
e.channel = new CIRCChannel(this, null, targetName);
if ("user" in e)
e.user = new CIRCChanUser(e.channel, e.user.unicodeName);
e.replyTo = e.channel;
e.set = "channel";
}
else if (!("user" in e))
{
e.set = "network";
e.destObject = this.parent;
return true;
}
if (arrayIndexOf(this.channelTypes, e.params[1][0]) != -1)
else
{
e.channel = new CIRCChannel(this, null, e.params[1]);
e.user = new CIRCChanUser(e.channel, e.user.unicodeName);
e.replyTo = e.channel;
e.set = "channel";
e.set = "user";
e.replyTo = e.user; /* send replies to the user who sent the message */
}
else if (e.params[2].search (/\x01.*\x01/i) != -1)
if (e.params[2].search (/\x01.*\x01/i) != -1)
{
e.type = "ctcp-reply";
e.destMethod = "onCTCPReply";
e.set = "server";
e.destObject = this;
return true;
}
else
{
e.set = "user";
e.replyTo = e.user; /* send replys to the user who sent the message */
e.msg = e.decodeParam(2, e.replyTo);
e.destObject = e.replyTo;
}
e.msg = e.decodeParam(2, e.replyTo);
e.destObject = e.replyTo;
return true;
}
CIRCServer.prototype.onPrivmsg =
function serv_privmsg (e)
{
/* setting replyTo provides a standard place to find the target for */
/* replys associated with this event. */
if (arrayIndexOf(this.channelTypes, e.params[1][0]) != -1)
var targetName = e.params[1];
// Strip off one (and only one) user mode prefix.
for (var i = 0; i < this.userModes.length; i++)
{
e.channel = new CIRCChannel(this, null, e.params[1]);
if (targetName[0] == this.userModes[i].symbol)
{
targetName = targetName.substr(1);
break;
}
}
/* setting replyTo provides a standard place to find the target for */
/* replies associated with this event. */
if (arrayIndexOf(this.channelTypes, targetName[0]) != -1)
{
e.channel = new CIRCChannel(this, null, targetName);
e.user = new CIRCChanUser(e.channel, e.user.unicodeName);
e.replyTo = e.channel;
e.set = "channel";

28
mozilla/extensions/irc/js/lib/utils.js
View File

@@ -682,14 +682,26 @@ function formatDateOffset (offset, format)
if (!format)
{
var ary = new Array();
if (days > 0)
ary.push (getMsg(MSG_DAYS, days));
if (hours > 0)
ary.push (getMsg(MSG_HOURS, hours));
if (minutes > 0)
ary.push (getMsg(MSG_MINUTES, minutes));
if (seconds > 0 || offset == 0)
ary.push (getMsg(MSG_SECONDS, seconds));
if (days == 1)
ary.push(MSG_DAY);
else if (days > 0)
ary.push(getMsg(MSG_DAYS, days));
if (hours == 1)
ary.push(MSG_HOUR);
else if (hours > 0)
ary.push(getMsg(MSG_HOURS, hours));
if (minutes == 1)
ary.push(MSG_MINUTE);
else if (minutes > 0)
ary.push(getMsg(MSG_MINUTES, minutes));
if (seconds == 1)
ary.push(MSG_SECOND);
else if (seconds > 0 || offset == 0)
ary.push(getMsg(MSG_SECONDS, seconds));
format = ary.join(", ");
}

10
mozilla/extensions/irc/xpi/resources/install.rdf
View File

@@ -14,21 +14,21 @@
</Description>
</em:targetApplication>
<!-- target: Mozilla Firefox, version 0.9 to 3.0 -->
<!-- target: Mozilla Firefox, version 1.0 to 3.0a1 -->
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>0.9</em:minVersion>
<em:maxVersion>3.0</em:maxVersion>
<em:minVersion>1.0</em:minVersion>
<em:maxVersion>3.0a1</em:maxVersion>
</Description>
</em:targetApplication>
<!-- target: SeaMonkey, version 1.0 -->
<!-- target: SeaMonkey, version 1.0 to 1.1 -->
<em:targetApplication>
<Description>
<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
<em:minVersion>1.0</em:minVersion>
<em:maxVersion>1.0</em:maxVersion>
<em:maxVersion>1.1</em:maxVersion>
</Description>
</em:targetApplication>

78
mozilla/extensions/irc/xul/content/commands.js
View File

@@ -354,6 +354,12 @@ function dispatch(text, e, isInteractive, flags)
/* split command from arguments */
var ary = text.match(/(\S+) ?(.*)/);
if (!ary)
{
display(getMsg(MSG_ERR_NO_COMMAND, ""));
return null;
}
e.commandText = ary[1];
if (ary[2])
e.inputData = stringTrim(ary[2]);
@@ -381,6 +387,21 @@ function dispatch(text, e, isInteractive, flags)
case 1:
/* one match, good for you */
var cm = client.commandManager;
if (cm.currentDispatchDepth >= cm.maxDispatchDepth)
{
/* We've reatched the max dispatch depth, so we need to unwind
* the entire stack of commands.
*/
cm.dispatchUnwinding = true;
}
// Don't start any new commands while unwinding.
if (cm.dispatchUnwinding)
break;
cm.currentDispatchDepth++;
var ex;
try
{
@@ -396,6 +417,19 @@ function dispatch(text, e, isInteractive, flags)
else
dd(formatException(ex), MT_ERROR);
}
cm.currentDispatchDepth--;
if (cm.dispatchUnwinding && (cm.currentDispatchDepth == 0))
{
/* Last level to unwind, and this is where we display the
* message. We need to leave it until here because displaying
* a message invokes a couple of commands itself, and we need
* to not be right on the dispatch limit for that.
*/
cm.dispatchUnwinding = false;
display(getMsg(MSG_ERR_MAX_DISPATCH_DEPTH, ary[0].name),
MT_ERROR);
}
break;
default:
@@ -1859,28 +1893,47 @@ function cmdDescribe(e)
function cmdMode(e)
{
// get our canonical channel name, so we know what channel we talk about
var chan = fromUnicode(e.target, e.server);
var chan;
// Make sure the user can leave the channel name out from a channel view.
if (e.channel && /^[\+\-].+/.test(e.target) &&
!(e.server.toLowerCase(chan) in e.server.channels))
if ((!e.target || /^[\+\-].+/.test(e.target)) &&
!(chan && e.server.getChannel(chan)))
{
chan = e.channel.canonicalName;
if (e.param && e.modestr)
if (e.channel)
{
e.paramList.unshift(e.modestr);
chan = e.channel.canonicalName;
if (e.param && e.modestr)
{
e.paramList.unshift(e.modestr);
}
else if (e.modestr)
{
e.paramList = [e.modestr];
e.param = e.modestr;
}
e.modestr = e.target;
}
else if (e.modestr)
else
{
e.paramList = [e.modestr];
e.param = e.modestr;
display(getMsg(MSG_ERR_REQUIRED_PARAM, "target"), MT_ERROR);
return;
}
e.modestr = e.target;
}
else
{
chan = fromUnicode(e.target, e.server);
}
// Check whether our mode string makes sense
if (!(/^([+-][a-z]+)+$/i).test(e.modestr))
if (!e.modestr)
{
e.modestr = "";
if (!e.channel && arrayContains(e.server.channelTypes, chan[0]))
e.channel = new CIRCChannel(e.server, null, chan);
if (e.channel)
e.channel.pendingModeReply = true;
}
else if (!(/^([+-][a-z]+)+$/i).test(e.modestr))
{
display(getMsg(MSG_ERR_INVALID_MODE, e.modestr), MT_ERROR);
return;
@@ -1889,7 +1942,6 @@ function cmdMode(e)
var params = (e.param) ? " " + e.paramList.join(" ") : "";
e.server.sendData("MODE " + chan + " " + fromUnicode(e.modestr, e.server) +
params + "\n");
}
function cmdMotif(e)

2
mozilla/extensions/irc/xul/content/contents.rdf
View File

@@ -9,7 +9,7 @@
<!-- package information -->
<RDF:Description about="urn:mozilla:package:chatzilla"
chrome:displayName="ChatZilla 0.9.74"
chrome:displayName="ChatZilla 0.9.75"
chrome:author="mozilla.org"
chrome:authorURL="http://www.mozilla.org/projects/rt-messaging/chatzilla/"
chrome:description="A simple, straightforward Internet Relay Chat (IRC) client."

107
mozilla/extensions/irc/xul/content/handlers.js
View File

@@ -340,6 +340,8 @@ function onInputKeyPress (e)
case 13: /* CR */
e.line = e.target.value;
e.target.value = "";
if (e.ctrlKey)
e.line = client.COMMAND_CHAR + "say " + e.line;
if (e.line.search(/\S/) == -1)
return;
onInputCompleteLine (e);
@@ -685,7 +687,7 @@ function onWhoTimeout()
net.primServ.LIGHTWEIGHT_WHO = true;
net.primServ.sendData("WHO " + chan.encodedName + "\n");
net.lastWhoCheckChannel = chan;
net.lastWhoCheckTime = Date.now();
net.lastWhoCheckTime = Number(new Date());
return;
}
@@ -705,7 +707,7 @@ function onWhoTimeout()
var period = net.prefs["autoAwayPeriod"];
// The time since the last check, with a 5s error margin to
// stop us from not checking because the timer fired a tad early:
var waited = Date.now() - net.lastWhoCheckTime + 5000;
var waited = Number(new Date()) - net.lastWhoCheckTime + 5000;
if (net.isConnected() && (period != 0) && (period * 60000 < waited))
checkWho();
}
@@ -1740,18 +1742,8 @@ function my_sconnect (e)
if ("_firstNick" in this)
delete this._firstNick;
if (-1 == this.MAX_CONNECT_ATTEMPTS)
this.display (getMsg(MSG_CONNECTION_ATTEMPT_UNLIMITED,
[this.getURL(),
e.server.getURL(),
e.connectAttempt,
e.reconnectDelayMs / 1000]), "INFO");
else
this.display (getMsg(MSG_CONNECTION_ATTEMPT,
[this.getURL(),
e.server.getURL(),
e.connectAttempt,
this.MAX_CONNECT_ATTEMPTS]), "INFO");
this.display(getMsg(MSG_CONNECTION_ATTEMPT,
[this.getURL(), e.server.getURL()]), "INFO");
if (this.prefs["identd.enabled"])
{
@@ -1777,7 +1769,7 @@ function my_neterror (e)
break;
case JSIRC_ERR_EXHAUSTED:
msg = MSG_ERR_EXHAUSTED;
// error already displayed in onDisconnect
break;
case JSIRC_ERR_OFFLINE:
@@ -1808,7 +1800,8 @@ function my_neterror (e)
client.ident.removeNetwork(this);
this.display(msg, type);
if (msg)
this.display(msg, type);
if (this.deleteWhenDone)
this.dispatch("delete-view");
@@ -1821,7 +1814,7 @@ function my_neterror (e)
CIRCNetwork.prototype.onDisconnect =
function my_netdisconnect (e)
{
var msg;
var msg, msgNetwork;
var msgType = "ERROR";
if (typeof e.disconnectStatus != "undefined")
@@ -1872,25 +1865,47 @@ function my_netdisconnect (e)
{
msgType = "DISCONNECT";
msg = getMsg(MSG_CONNECTION_QUIT, [this.getURL(), e.server.getURL()]);
msgNetwork = msg;
}
else
{
var delayStr = formatDateOffset(this.getReconnectDelayMs() / 1000);
if (this.MAX_CONNECT_ATTEMPTS == -1)
{
msgNetwork = getMsg(MSG_RECONNECTING_IN, [msg, delayStr]);
}
else if (this.connectAttempt < this.MAX_CONNECT_ATTEMPTS)
{
var left = this.MAX_CONNECT_ATTEMPTS - this.connectAttempt;
if (left == 1)
{
msgNetwork = getMsg(MSG_RECONNECTING_IN_LEFT1, [msg, delayStr]);
}
else
{
msgNetwork = getMsg(MSG_RECONNECTING_IN_LEFT,
[msg, left, delayStr]);
}
}
else
{
msgNetwork = getMsg(MSG_CONNECTION_EXHAUSTED, msg);
}
}
/* If we were only /trying/ to connect, and failed, just put an error on
* the network tab. If we were actually connected ok, put it on all tabs.
/* If we were connected ok, put an error on all tabs. If we were only
* /trying/ to connect, and failed, just put it on the network tab.
*/
if (this.state != NET_ONLINE)
{
this.busy = false;
updateProgress();
if (this.state != NET_CANCELLING)
this.displayHere(msg, msgType);
}
// Don't do anything if we're cancelling.
else if (this.state != NET_CANCELLING)
if (this.state == NET_ONLINE)
{
for (var v in client.viewsArray)
{
var obj = client.viewsArray[v].source;
if (obj != client)
if (obj == this)
{
obj.displayHere(msgNetwork, msgType);
}
else if (obj != client)
{
var details = getObjectDetails(obj);
if ("server" in details && details.server == e.server)
@@ -1898,6 +1913,17 @@ function my_netdisconnect (e)
}
}
}
else
{
this.busy = false;
updateProgress();
// Don't do anything if we're cancelling.
if (this.state != NET_CANCELLING)
{
this.displayHere(msgNetwork, msgType);
}
}
for (var c in this.primServ.channels)
{
@@ -2200,6 +2226,12 @@ function my_endofexcepts(e)
this.display(getMsg(MSG_EXCEPTLIST_END, this.unicodeName), "EXCEPT");
}
CIRCChannel.prototype.on482 =
function my_needops(e)
{
this.display(getMsg(MSG_CHANNEL_NEEDOPS, this.unicodeName), MT_ERROR);
}
CIRCChannel.prototype.onNotice =
function my_notice (e)
{
@@ -2390,14 +2422,25 @@ function my_ckick (e)
CIRCChannel.prototype.onChanMode =
function my_cmode (e)
{
if ("user" in e)
if (e.code == "MODE")
{
var msg = e.decodeParam(1);
for (var i = 2; i < e.params.length; i++)
msg += " " + e.decodeParam(i);
this.display (getMsg(MSG_MODE_CHANGED, [msg, e.user.unicodeName]),
"MODE", e.user, this);
var source = e.user ? e.user.unicodeName : e.source;
this.display(getMsg(MSG_MODE_CHANGED, [msg, source]),
"MODE", (e.user || null), this);
}
else if ("pendingModeReply" in this)
{
var msg = e.decodeParam(3);
for (var i = 4; i < e.params.length; i++)
msg += " " + e.decodeParam(i);
var view = ("messages" in this && this.messages) ? this : e.network;
view.display(getMsg(MSG_MODE_ALL, [this.unicodeName, msg]), "MODE");
delete this.pendingModeReply;
}
var updates = new Array();

15
mozilla/extensions/irc/xul/content/prefs.js
View File

@@ -215,6 +215,7 @@ function initPrefs()
["outgoing.colorCodes", false, "global"],
["outputWindowURL", "chrome://chatzilla/content/output-window.html",
"appearance.misc"],
["proxy.typeOverride", "", ".connect"],
["sortUsersByMode", true, "appearance.userlist"],
//["queryBeep", "beep", "global.sounds"],
["reconnect", true, ".connect"],
@@ -259,6 +260,7 @@ function initPrefs()
CIRCNetwork.prototype.INITIAL_DESC = client.prefs["desc"];
CIRCNetwork.prototype.INITIAL_UMODE = client.prefs["usermode"];
CIRCNetwork.prototype.MAX_MESSAGES = client.prefs["networkMaxLines"];
CIRCNetwork.prototype.PROXY_TYPE_OVERRIDE = client.prefs["proxy.typeOverride"];
CIRCChannel.prototype.MAX_MESSAGES = client.prefs["channelMaxLines"];
CIRCChanUser.prototype.MAX_MESSAGES = client.prefs["userMaxLines"];
var dccUserMaxLines = client.prefs["dccUserMaxLines"];
@@ -445,6 +447,7 @@ function getNetworkPrefManager(network)
["nicknameList", defer, "lists.nicknameList"],
["notifyList", [], "lists.notifyList"],
["outputWindowURL", defer, "appearance.misc"],
["proxy.typeOverride", defer, ".connect"],
["reconnect", defer, ".connect"],
["timestamps", defer, "appearance.timestamps"],
["timestampFormat", defer, "appearance.timestamps"],
@@ -476,6 +479,10 @@ function getNetworkPrefManager(network)
if (value != CIRCNetwork.prototype.INITIAL_UMODE)
network.INITIAL_UMODE = value;
value = prefManager.prefs["proxy.typeOverride"];
if (value != CIRCNetwork.prototype.PROXY_TYPE_OVERRIDE)
network.PROXY_TYPE_OVERRIDE = value;
network.stayingPower = prefManager.prefs["reconnect"];
network.MAX_CONNECT_ATTEMPTS = prefManager.prefs["connectTries"];
@@ -692,6 +699,10 @@ function onPrefChanged(prefName, newValue, oldValue)
runInstrumentation("inst1", false);
break;
case "proxy.typeOverride":
CIRCNetwork.prototype.PROXY_TYPE_OVERRIDE = newValue;
break;
case "showModeSymbols":
if (newValue)
setListMode("symbol");
@@ -817,6 +828,10 @@ function onNetworkPrefChanged(network, prefName, newValue, oldValue)
network.INITIAL_DESC = newValue;
break;
case "proxy.typeOverride":
network.PROXY_TYPE_OVERRIDE = newValue;
break;
case "reconnect":
network.stayingPower = newValue;
break;

37
mozilla/extensions/irc/xul/content/static.js
View File

@@ -39,11 +39,11 @@
*
* ***** END LICENSE BLOCK ***** */
const __cz_version = "0.9.74";
const __cz_version = "0.9.75";
const __cz_condition = "green";
const __cz_suffix = "";
const __cz_guid = "59c81df5-4b7a-477b-912d-4e0fdf64e5f2";
const __cz_locale = "0.9.74";
const __cz_locale = "0.9.75";
var warn;
var ASSERT;
@@ -184,7 +184,7 @@ function init()
client.openLogFile(client);
// kick-start a log-check interval to make sure we change logfiles in time:
// It will fire 2 seconds past the next full hour.
setTimeout("checkLogFiles()", 3602000 - (Date.now() % 3600000));
setTimeout("checkLogFiles()", 3602000 - (Number(new Date()) % 3600000));
// Make sure the userlist is on the correct side.
updateUserlistSide(client.prefs["userlistLeft"]);
@@ -2231,15 +2231,6 @@ function gotoIRCURL (url)
}
var network;
var pass = "";
if (url.needpass)
{
if (url.pass)
pass = url.pass;
else
pass = window.promptPassword(getMsg(MSG_URL_PASSWORD, url.spec));
}
if (url.isserver)
{
@@ -2263,8 +2254,22 @@ function gotoIRCURL (url)
dd ("gotoIRCURL: not already connected to " +
"server " + url.host + " trying to connect...");
*/
var pass = "";
if (url.needpass)
{
if (url.pass)
pass = url.pass;
else
pass = promptPassword(getMsg(MSG_HOST_PASSWORD, url.host));
}
network = dispatch((url.scheme == "ircs" ? "sslserver" : "server"),
{hostname: url.host, port: url.port, password: pass});
{hostname: url.host, port: url.port,
password: pass});
if (!url.target)
return;
if (!("pendingURLs" in network))
network.pendingURLs = new Array();
network.pendingURLs.unshift(url);
@@ -2288,6 +2293,10 @@ function gotoIRCURL (url)
"network " + url.host + " trying to connect...");
*/
client.connectToNetwork(network, (url.scheme == "ircs" ? true : false));
if (!url.target)
return;
if (!("pendingURLs" in network))
network.pendingURLs = new Array();
network.pendingURLs.unshift(url);
@@ -4628,7 +4637,7 @@ function checkLogFiles()
// We use the same line again to make sure we keep a constant offset
// from the full hour, in case the timers go crazy at some point.
setTimeout("checkLogFiles()", 3602000 - (Date.now() % 3600000));
setTimeout("checkLogFiles()", 3602000 - (Number(new Date()) % 3600000));
}
CIRCChannel.prototype.getLCFunction =

28
mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties
View File

@@ -69,7 +69,7 @@
#
### End of notes ###
locale.version = 0.9.74
locale.version = 0.9.75
locale.error = You are using ChatZilla %1$S, which requires the locale version %2$S. The currently selected locale, %3$S, is version %4$S, and therefore there may be problems running ChatZilla.\n\nIt is strongly advised that you update or remove the ChatZilla locale in question.
# Misc
@@ -511,7 +511,7 @@ cmd.me.help = Sends the text <action> to the channel as a statement in the thi
cmd.motd.help = Displays the "Message of the Day", which usually contains information about the network and current server, as well as any usage policies.
cmd.mode.params = <target> [<modestr> [<param> [<...>]]]
cmd.mode.params = [<target>] [<modestr> [<param> [<...>]]]
cmd.mode.help = Changes the channel or user mode of <target> using <modestr> and any subsequent <param> if added. When used from a channel view, <target> may be omitted. For a list of modes you may use, see http://irchelp.org.
cmd.motif.params = [<motif>]
@@ -709,6 +709,7 @@ msg.err.notimplemented = Sorry, ``%1$S'' has not been implemented.
msg.err.required.param = Missing required parameter %1$S.
msg.err.ambigcommand = Ambiguous command, ``%1$S'', %2$S commands match [%3$S].
msg.err.required.nr.param = Missing %1$S parameters. This alias requires at least %2$S parameters.
msg.err.max.dispatch.depth = Reached max dispatch depth while attempting to dispatch ``%1$S''.
## chatzilla error messages ##
msg.err.invalid.pref = Invalid value for preference %1$S (%2$S).
@@ -737,7 +738,6 @@ msg.err.need.recip = Command ``%1$S'' must be run in the context of a user or
msg.err.no.default = Please do not just type into this tab, use an actual command instead.
msg.err.no.match = No match for ``%S''.
msg.err.no.socket = Error creating socket.
msg.err.exhausted = Connection attempts exhausted, giving up.
msg.err.no.secure = The network ``%S'' has no secure servers defined.
msg.err.cancelled = Connection process canceled.
msg.err.offline = The host software platform (e.g. Mozilla, Firefox) is in ``offline mode''. No network connections can be made in this mode.
@@ -834,6 +834,10 @@ msg.days = "%S days
msg.hours = "%S hours
msg.minutes = "%S minutes
msg.seconds = "%S seconds
msg.day = 1 day
msg.hour = 1 hour
msg.minute = 1 minute
msg.second = 1 second
msg.rsp.hello = [HELLO]
@@ -977,6 +981,8 @@ msg.exceptlist.item = "%S excepted %S from bans in %S on %S.
msg.exceptlist.button = [[Remove][Remove this ban exception][%S]]
msg.exceptlist.end = End of %S exception list.
msg.channel.needops = You need to be an operator in %S to do that.
msg.ctcphelp.clientinfo = CLIENTINFO gives information on available CTCP commands
msg.ctcphelp.action = ACTION performs an action at the user
msg.ctcphelp.time = TIME gives the local date and time for the client
@@ -1088,8 +1094,8 @@ msg.si.speed.6 = EiB/s
msg.ident.server.not.possible = Ident Server is unavailable in this version of the host software platform (e.g. Mozilla, Firefox) - the feature "scriptable server sockets" is missing. Mozilla builds after 2003-11-15 should contain this feature (e.g. Mozilla 1.6 or later).
msg.url.password = Enter a password for the url %S:
msg.url.key = Enter key for url %S:
msg.host.password = Enter a password for the server %S:
msg.url.key = Enter key for url %S:
msg.startup.added = <%1$S> will now open at startup.
msg.startup.removed = <%1$S> will no longer open at startup.
@@ -1154,8 +1160,7 @@ msg.list.end = Displayed %S of %S channels.
msg.who.end = End of WHO results for ``%S'', %S user(s) found.
msg.who.match = User %S, (%S@%S) ``%S'' (%S), member of %S, is connected to <irc://%S/>, %S hop(s).
msg.connection.attempt = Connecting to %S (%S), attempt %S of %S...
msg.connection.attempt.unlimited = Connecting to %S (%S), attempt %S, next attempt in %S seconds...
msg.connection.attempt = Connecting to %S (%S)...
msg.connection.refused = Connection to %S (%S) refused.
msg.connection.timeout = Connection to %S (%S) timed out.
msg.unknown.host = Unknown host ``%S'' connecting to %S (%S).
@@ -1164,6 +1169,12 @@ msg.connection.reset = Connection to %S (%S) reset.
msg.connection.quit = Disconnected from %S (%S).
msg.close.status = Connection to %S (%S) closed with status %S.
# In these messages, %1$S is a connection error from above.
msg.connection.exhausted = "%1$S Connection attempts exhausted, giving up.
msg.reconnecting.in = "%1$S Reconnecting in %2$S.
msg.reconnecting.in.left = "%1$S %2$S attempts left, reconnecting in %3$S.
msg.reconnecting.in.left1 = "%1$S 1 attempt left, reconnecting in %2$S.
msg.reconnecting = Reconnecting...
msg.confirm.disconnect.all = Are you sure you want to disconnect from ALL networks?
msg.no.connected.nets = You are not connected to any networks.
@@ -1186,6 +1197,7 @@ msg.someone.left.reason = "%S has left %S (%S)
msg.youre.gone = YOU (%S) have been booted from %S by %S (%S)
msg.someone.gone = "%S was booted from %S by %S (%S)
msg.mode.all = Mode for %S is %S"
msg.mode.changed = Mode %S by %S"
msg.away.on = You are now marked as away (%S). Click the nickname button or use the |/back| command to return from being away.
@@ -1457,6 +1469,8 @@ pref.outputWindowURL.label = Output Window
pref.outputWindowURL.help = You probably don't want to change this. The chat view loads this URL to display the actual messages, header, etc., and the file must correctly define certain items or you'll get JavaScript errors and a blank chat window!
pref.profilePath.label = Profile path
pref.profilePath.help = This is the base location for Chatzilla-related files. By default, Chatzilla loads scripts from the "scripts" subdirectory, and stores log files in the "logs" subdirectory.
pref.proxy.typeOverride.label = Proxy Type
pref.proxy.typeOverride.help = Override the normal proxy choice by specifying "http" to use your browser's HTTP Proxy or "none" to force no proxy to be used (not even the SOCKS proxy). Note that this usually only works when the browser is set to use a manual proxy configuration.
pref.reconnect.label = Reconnect when disconnected unexpectedly
pref.reconnect.help = When your connection is lost unexpectedly, Chatzilla can automatically reconnect to the server for you.
pref.showModeSymbols.label = Show user mode symbols