Fix several login bugs, add bouncer auth mode.

[irc/quakenet/qwebirc.git] / qwebirc / ircclient.py

diff --git a/qwebirc/ircclient.py b/qwebirc/ircclient.py
index e473eccd889c5cced736b3e866d4122ca145c4f3..f34398628609d57f5bdc23fc115f905ec6d20712 100644 (file)
--- a/qwebirc/ircclient.py
+++ b/qwebirc/ircclient.py
@@ -71,7 +71,7 @@ class QWebIRCClient(basic.LineReceiver):
     
     self.lastError = None
     f = self.factory.ircinit
-    nick, ident, ip, realname, hostname = f["nick"], f["ident"], f["ip"], f["realname"], f["hostname"]
+    nick, ident, ip, realname, hostname, pass_ = f["nick"], f["ident"], f["ip"], f["realname"], f["hostname"], f.get("password")
     self.__nickname = nick
     self.__perform = f.get("perform")
 
@@ -94,6 +94,8 @@ class QWebIRCClient(basic.LineReceiver):
 
       self.write("USER %s bleh bleh :%s - %s" % (ident, dispip, realname))
 
+    if pass_ is not None:
+      self.write("PASS :%s" % pass_)
     self.write("NICK %s" % nick)
     
     self.factory.client = self