from twisted.names import client
from twisted.internet import reactor, error
from authgateengine import login_optional, getSessionData
-import simplejson, md5, sys, os, time, config, weakref, traceback, socket
+import simplejson, md5, sys, os, time, config, qwebirc.config_options as config_options, traceback, socket
import qwebirc.ircclient as ircclient
from adminengine import AdminEngineAction
from qwebirc.util import HitCounter
raise AJAXException, "Nickname not supplied."
nick = ircclient.irc_decode(nick[0])
- password = request.args.get("pass")
+ password = request.args.get("password")
if password is not None:
password = ircclient.irc_decode(password[0])
perform = ["PRIVMSG %s :TICKETAUTH %s" % (msg_mask, qticket)]
ident, realname = config.IDENT, config.REALNAME
- if ident is None:
+ if ident is config_options.IDENT_HEX or ident is None: # latter is legacy
ident = socket.inet_aton(ip).encode("hex")
+ elif ident is config_options.IDENT_NICKNAME:
+ ident = nick
self.__connect_hit()
client = ircclient.createIRC(session, **kwargs)
session.client = client
- if config.WEBIRC_MODE != "hmac":
+ if not hasattr(config, "WEBIRC_MODE") or config.WEBIRC_MODE == "hmac":
+ proceed(None)
+ elif config.WEBIRC_MODE != "hmac":
notice = lambda x: session.event(connect_notice(x))
notice("Looking up your hostname...")
def callback(hostname):
notice("Couldn't look up your hostname!")
proceed(ip)
qdns.lookupAndVerifyPTR(ip, timeout=[config.DNS_TIMEOUT]).addCallbacks(callback, errback)
- else:
- proceed(None) # hmac doesn't care
Sessions[id] = session