david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass data form to set_register filters

Browse Source 
darcs-hash:20071008054253-86b55-d93c18ba8336484edfbfd3631c5b54fbeb207df5.gz
This commit is contained in:
David Rousselie
2007-10-08 07:42:53 +02:00
parent 3f7820bf11
commit ad6c5dddd0
3 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/jcl/jabber/component.py
View File

@@ -458,18 +458,11 @@ class JCLComponent(Component, object):
{"jir" : "jabber:iq:register",
"jxd" : "jabber:x:data"})[0]
x_data = Form(x_node)
if not "name" in x_data or x_data["name"].value == "":
iq_error = info_query.make_error_response("not-acceptable")
text = iq_error.get_error().xmlnode.newTextChild(\
None,
"text",
lang_class.mandatory_field % ("name"))
text.setNs(text.newNs(error.STANZA_ERROR_NS, None))
self.stream.send(iq_error)
return
return self.apply_registered_behavior(\
self.set_register_handlers,
info_query,
apply_filter_func=lambda filter_func, stanza, lang_class: \
filter_func(stanza, lang_class, x_data),
apply_handle_func=lambda handle_func, stanza, lang_class, data, result: \
handle_func(stanza, lang_class, data, x_data))

53
src/jcl/jabber/register.py
View File

@@ -38,7 +38,7 @@ class SetRegisterHandler(object):
self.account_manager = component.account_manager
self.__logger = logging.getLogger("jcl.jabber.SetRegisterHandler")
def filter(self, info_query, lang_class, node):
def filter(self, info_query, lang_class, x_data):
"""Filter requests to be handled"""
return False
@@ -61,27 +61,38 @@ class SetRegisterHandler(object):
class RootSetRegisterHandler(SetRegisterHandler):
filter = jabber.root_filter
def __init__(self, component):
SetRegisterHandler.__init__(self, component)
self.__logger = logging.getLogger("jcl.jabber.RootSetRegisterHandler")
def filter(self, stanza, lang_class, x_data):
""""""
return jabber.root_filter(self, stanza, lang_class)
def handle(self, info_query, lang_class, data, x_data):
""""""
self.__logger.debug("root_set_register")
_account = None
if not "name" in x_data or x_data["name"].value == "":
# TODO : use handle_error
iq_error = info_query.make_error_response("not-acceptable")
text = iq_error.get_error().xmlnode.newTextChild(\
None,
"text",
lang_class.mandatory_field % ("name"))
text.setNs(text.newNs(error.STANZA_ERROR_NS, None))
return [iq_error]
try:
info_querys = self.account_manager.create_default_account(\
x_data["name"].value,
info_query.get_from(),
lang_class,
x_data)
info_querys.insert(0, info_query.make_result_response())
info_queries = self.account_manager.create_default_account(\
x_data["name"].value,
info_query.get_from(),
lang_class,
x_data)
info_queries.insert(0, info_query.make_result_response())
except FieldError, field_error:
return self.handle_error(field_error,
info_query, lang_class)
return info_querys
return info_queries
class AccountSetRegisterHandler(SetRegisterHandler):
@@ -91,44 +102,50 @@ class AccountSetRegisterHandler(SetRegisterHandler):
SetRegisterHandler.__init__(self, component)
self.__logger = logging.getLogger("jcl.jabber.AccountSetRegisterHandler")
def filter(self, stanza, lang_class, x_data):
""""""
return jabber.account_filter(self, stanza, lang_class)
def handle(self, info_query, lang_class, data, x_data):
""""""
self.__logger.debug("account_set_register")
_account = None
try:
info_querys = self.account_manager.update_account(\
info_queries = self.account_manager.update_account(\
x_data["name"].value,
info_query.get_from(),
lang_class,
x_data)
info_querys.insert(0, info_query.make_result_response())
info_queries.insert(0, info_query.make_result_response())
except FieldError, field_error:
return self.handle_error(field_error,
info_query, lang_class)
return info_querys
return info_queries
class AccountTypeSetRegisterHandler(SetRegisterHandler):
filter = jabber.account_type_filter
def __init__(self, component):
SetRegisterHandler.__init__(self, component)
self.__logger = logging.getLogger("jcl.jabber.AccountTypeSetRegisterHandler")
def filter(self, stanza, lang_class, x_data):
""""""
return jabber.account_type_filter(self, stanza, lang_class)
def handle(self, info_query, lang_class, data, x_data):
""""""
self.__logger.debug("account_type_set_register")
account_type = data
_account = None
try:
info_querys = self.account_manager.create_account_from_type(\
info_queries = self.account_manager.create_account_from_type(\
x_data["name"].value,
info_query.get_from(),
account_type,
lang_class,
x_data)
info_querys.insert(0, info_query.make_result_response())
info_queries.insert(0, info_query.make_result_response())
except FieldError, field_error:
return self.handle_error(field_error,
info_query, lang_class)
return info_querys
return info_queries

12
src/jcl/lang.py
View File

@@ -72,10 +72,10 @@ class Lang:
class en:
component_name = u"Jabber Component Library generic component"
register_title = u"Connection registration"
register_instructions = u"Enter connection parameters"
register_title = u"Create new account"
register_instructions = u"Enter account parameters"
message_status = u" accounts registered."
account_name = u"Connection name"
account_name = u"Account name"
password_saved_for_session = u"Password will be kept during your " \
u"Jabber session"
@@ -236,10 +236,10 @@ class Lang:
class fr:
component_name = u"composant générique Jabber Component Library"
register_title = u"Enregistrement d'une nouvelle connexion"
register_instructions = u"Entrer les paramètres de connexion"
register_title = u"Enregistrement d'un nouveau compte"
register_instructions = u"Entrer les paramètres du compte"
message_status = u" comptes enregistrés."
account_name = u"Nom de la connexion"
account_name = u"Nom du compte"
password_saved_for_session = u"Le mot de passe sera garder tout au " \
u"long de la session Jabber."