diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2003-05-09 19:32:59 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2003-05-09 19:32:59 +0000 |
| commit | 86cd1729cb0fce35e17c9e4a8d44a64cfd409db8 (patch) | |
| tree | c05468bce96e13031bc68eed1b33d5860f4a61b6 /src/mod_vcard.erl | |
| parent | * src/mod_muc/mod_muc.erl: Denied using of empty nick (diff) | |
* src/ejabberd_local.erl: Updated missed errors to new style
* src/mod_register.erl: Likewise
* src/mod_version.erl: Likewise
* src/mod_time.erl: Likewise
* src/mod_stats.erl: Likewise
* src/mod_register.erl: Likewise
* src/mod_private.erl: Likewise
* src/mod_configure.erl: Likewise
* src/ejabberd_sm.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_muc/mod_muc.erl: Added vcard to mod_muc module
* src/ejabberd_app.erl: Dump list of opened ports every hour
* src/ejabberd.hrl: Added INFO_MSG macros, ERROR_LOG_PATH renamed
to LOG_PATH
SVN Revision: 106
Diffstat (limited to 'src/mod_vcard.erl')
| -rw-r--r-- | src/mod_vcard.erl | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index 8e9225ffe..3f19d21ca 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -91,9 +91,7 @@ process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -> {iq, ID, result, XMLNS, []}; _ -> {iq, ID, error, XMLNS, - [SubEl, {xmlelement, "error", - [{"code", "405"}], - [{xmlcdata, "Not Allowed"}]}]} + [SubEl, ?ERR_NOT_ALLOWED]} end; get -> {iq, ID, result, XMLNS, @@ -116,9 +114,7 @@ process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -> process_sm_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -> case Type of set -> - {iq, ID, error, XMLNS, [SubEl, {xmlelement, "error", - [{"code", "405"}], - [{xmlcdata, "Not Allowed"}]}]}; + {iq, ID, error, XMLNS, [SubEl, ?ERR_NOT_ALLOWED]}; get -> {User, _, _} = To, LUser = jlib:tolower(User), @@ -217,7 +213,7 @@ do_route(From, To, Packet) -> {User, Server, Resource} = To, if (User /= "") or (Resource /= "") -> - Err = jlib:make_error_reply(Packet, "503", "Service Unavailable"), + Err = jlib:make_error_reply(Packet, ?ERR_SERVICE_UNAVAILABLE), ejabberd_router ! {route, To, From, Err}; true -> IQ = jlib:iq_query_info(Packet), @@ -230,7 +226,7 @@ do_route(From, To, Packet) -> case XDataEl of false -> Err = jlib:make_error_reply( - Packet, "400", "Bad Request"), + Packet, ?ERR_BAD_REQUEST), ejabberd_router:route(To, From, Err); _ -> XData = jlib:parse_xdata_submit(XDataEl), @@ -238,7 +234,7 @@ do_route(From, To, Packet) -> invalid -> Err = jlib:make_error_reply( Packet, - "400", "Bad Request"), + ?ERR_BAD_REQUEST), ejabberd_router:route(To, From, Err); _ -> @@ -271,7 +267,7 @@ do_route(From, To, Packet) -> case Type of set -> Err = jlib:make_error_reply( - Packet, "405", "Not Allowed"), + Packet, ?ERR_NOT_ALLOWED), ejabberd_router:route(To, From, Err); get -> ResIQ = {iq, ID, result, ?NS_DISCO_INFO, @@ -294,7 +290,7 @@ do_route(From, To, Packet) -> case Type of set -> Err = jlib:make_error_reply( - Packet, "405", "Not Allowed"), + Packet, ?ERR_NOT_ALLOWED), ejabberd_router:route(To, From, Err); get -> ResIQ = {iq, ID, result, ?NS_DISCO_INFO, @@ -307,7 +303,7 @@ do_route(From, To, Packet) -> end; _ -> Err = jlib:make_error_reply(Packet, - "503", "Service Unavailable"), + ?ERR_SERVICE_UNAVAILABLE), ejabberd_router:route(To, From, Err) end end. |