diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2003-03-09 20:46:47 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2003-03-09 20:46:47 +0000 |
| commit | f3916bddd2ee79f82c138f2fce09b878ab721cf6 (patch) | |
| tree | fa3e18694ddc1a8b8c41690061906110bfa370b4 /src/mod_register.erl | |
| parent | * src/ejabberd_c2s.erl: More correct stream closing (diff) | |
* src/cyrsasl*.erl: SASL support (currently support only PLAIN
mechanism)
* src/ejabberd_c2s.erl: Likewise
(all): Support for new-style error elements (except old errors
"Not Acceptable", "Not Found", "Invalid Namespace" and "Server
Connect Failed", so ejabberd may work unstable)
SVN Revision: 86
Diffstat (limited to 'src/mod_register.erl')
| -rw-r--r-- | src/mod_register.erl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mod_register.erl b/src/mod_register.erl index c585cb71..febc58dd 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -15,7 +15,7 @@ -export([start/1, init/0, process_iq/3]). -include("ejabberd.hrl"). --include("namespaces.hrl"). +-include("jlib.hrl"). start(Opts) -> IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), @@ -97,12 +97,9 @@ process_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -> case try_register(User, Password) of ok -> {iq, ID, result, XMLNS, [SubEl]}; - {error, Code, Reason} -> + {error, Error} -> {iq, ID, error, XMLNS, - [SubEl, {xmlelement, - "error", - [{"code", Code}], - [{xmlcdata, Reason}]}]} + [SubEl, Error]} end end end; @@ -128,9 +125,9 @@ try_register(User, Password) -> {atomic, ok} -> ok; {atomic, exists} -> - {error, "400", "Bad Request"}; + {error, ?ERR_BAD_REQUEST}; {error, Reason} -> - {error, "500", "Internal Server Error"} + {error, ?ERR_INTERNAL_SERVER_ERROR} end end. |