-# Copyright 2004-2005 James Bunton <james@delx.cjb.net>
+# Copyright 2004-2006 James Bunton <james@delx.cjb.net>
# Licensed for distribution under the GPL version 2, check COPYING for details
import utils
-if(utils.checkTwisted()):
- from twisted.xish.domish import Element
- from twisted.words.protocols.jabber import jid
-else:
- from tlib.domish import Element
- from tlib.jabber import jid
+from twisted.words.xish.domish import Element
+from twisted.words.protocols.jabber.jid import internJID
from debug import LogEvent, INFO, WARN, ERROR
import disco
import session
(blah1, password, blah3) = self.getRegInfo(jabberID)
reginfo = legacy.formRegEntry(username, password)
- self.pytrans.xdb.set(jid.JID(jabberID).userhost(), legacy.namespace, reginfo)
+ self.pytrans.xdb.set(internJID(jabberID).userhost(), legacy.namespace, reginfo)
def getRegInfo(self, jabberID):
LogEvent(INFO)
- result = self.pytrans.xdb.request(jid.JID(jabberID).userhost(), legacy.namespace)
+ result = self.pytrans.xdb.request(internJID(jabberID).userhost(), legacy.namespace)
if(result == None):
LogEvent(INFO, "", "Not registered!")
return None
ID = incoming.getAttribute("id")
fro = incoming.getAttribute("from")
LogEvent(INFO)
- source = jid.JID(fro).userhost()
+ source = internJID(fro).userhost()
ulang = utils.getLang(incoming)
username = None
password = None
LogEvent(INFO, "", "Updated XDB")
self.successReply(incoming)
LogEvent(INFO, "", "Sent a result Iq")
- (user, host, res) = jid.parse(incoming.getAttribute("from"))
- jabw.sendPresence(self.pytrans, to=user + "@" + host, fro=config.jid, ptype="subscribe")
+ to = internJID(incoming.getAttribute("from")).userhost()
+ jabw.sendPresence(self.pytrans, to=to, fro=config.jid, ptype="subscribe")
if(config.registerMessage):
jabw.sendMessage(self.pytrans, to=incoming.getAttribute("from"), fro=config.jid, body=config.registerMessage)
except: