plugin XEP-0077: misc fixes

This commit is contained in:
Goffi 2012-12-09 23:24:53 +01:00
commit 70c3c04fee

View file

@ -20,12 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
from logging import debug, info, error
from twisted.words.protocols.jabber import client, jid
from twisted.words.protocols.jabber import error as jab_error
from twisted.words.protocols.jabber import jid
from twisted.words.protocols.jabber.xmlstream import IQ
from twisted.internet import reactor
from sat.tools.xml_tools import dataForm2xml
import pdb
from wokkel import data_form
@ -115,8 +112,8 @@ class XEP_0077():
answer_data['reason'] = 'unknown'
answer_data={"message":_("Registration failed")}
self.host.bridge.actionResult(answer_type, failure.value.stanza['id'], answer_data, profile)
if self.triggers.has_key(answer["from"]):
del self.triggers[answer["from"]]
if failure.value.stanza["from"] in self.triggers.has_key:
del self.triggers[failure.value.stanza["from"]]
def in_band_submit(self, action, target, fields, profile):
"""Submit a form for registration, using data_form"""
@ -138,6 +135,6 @@ class XEP_0077():
reg_request=IQ(client.xmlstream,'get')
reg_request["from"]=client.jid.full()
reg_request["to"] = to_jid.full()
query=reg_request.addElement('query', NS_REG)
reg_request.send(to_jid.full()).addCallbacks(self.reg_ok, self.reg_err, callbackArgs=[profile], errbackArgs=[profile])
reg_request.addElement('query', NS_REG)
reg_request.send(to_jid.full()).addCallbacks(self.reg_ok, self.reg_err, callbackArgs=[client.profile], errbackArgs=[client.profile])
return reg_request["id"]