Fix several login bugs, add bouncer auth mode.

[irc/quakenet/qwebirc.git] / qwebirc / engines / ajaxengine.py

diff --git a/qwebirc/engines/ajaxengine.py b/qwebirc/engines/ajaxengine.py
index 0bf340465917b3a756d9dcfaf48caccae1ed3199..a7acb464e6ee8bec3b9a8b1c2ce180d7dd3930bb 100644 (file)
--- a/qwebirc/engines/ajaxengine.py
+++ b/qwebirc/engines/ajaxengine.py
@@ -190,6 +190,10 @@ class AJAXEngine(resource.Resource):
       raise AJAXException, "Nickname not supplied."
     nick = ircclient.irc_decode(nick[0])
 
+    password = request.args.get("password")
+    if password is not None:
+      password = ircclient.irc_decode(password[0])
+      
     for i in xrange(10):
       id = get_session_id()
       if not Sessions.get(id):
@@ -216,7 +220,11 @@ class AJAXEngine(resource.Resource):
     self.__connect_hit()
 
     def proceed(hostname):
-      client = ircclient.createIRC(session, nick=nick, ident=ident, ip=ip, realname=realname, perform=perform, hostname=hostname)
+      kwargs = dict(nick=nick, ident=ident, ip=ip, realname=realname, perform=perform, hostname=hostname)
+      if password is not None:
+        kwargs["password"] = password
+        
+      client = ircclient.createIRC(session, **kwargs)
       session.client = client
 
     if not hasattr(config, "WEBIRC_MODE") or config.WEBIRC_MODE == "hmac":