Bug 343195 - Only prompt for password for servers, networks don't care. Also don't add the network/server URL to pending list, as that causes multiple prompts.

ChatZilla only.
p=rdmsoft@bugs.rdmsoft.com (Robert Marshall)
r=silver
This commit is contained in:
silver%warwickcompsoc.co.uk 2006-07-19 20:14:37 +00:00
parent 8bbe04e7d8
commit 1a657208e4
2 changed files with 23 additions and 14 deletions

View File

@ -43,7 +43,7 @@ const __cz_version = "0.9.74";
const __cz_condition = "green";
const __cz_suffix = "";
const __cz_guid = "59c81df5-4b7a-477b-912d-4e0fdf64e5f2";
const __cz_locale = "0.9.74.1";
const __cz_locale = "0.9.74.2";
var warn;
var ASSERT;
@ -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);

View File

@ -69,7 +69,7 @@
#
### End of notes ###
locale.version = 0.9.74.1
locale.version = 0.9.74.2
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
@ -1089,8 +1089,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.