* 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

2 files changed, 17 insertions, 25 deletions

diff --git a/src/mod_irc/mod_irc.erl b/src/mod_irc/mod_irc.erl
index bd3e6985..f2181ca3 100644
--- a/src/mod_irc/mod_irc.erl
+++ b/src/mod_irc/mod_irc.erl
@@ -16,7 +16,7 @@
 	 get_user_and_encoding/2]).
 
 -include("ejabberd.hrl").
--include("namespaces.hrl").
+-include("jlib.hrl").
 
 -define(DEFAULT_IRC_ENCODING, "koi8-r").
 
@@ -200,18 +200,14 @@ process_iq_data(From, To, ID, XMLNS, Type, SubEl) ->
 				       [{"xmlns", XMLNS}],
 				       Res
 				      }]};
-				{error, Code, Desc} ->
+				{error, Error} ->
 				    {iq, ID, error, XMLNS,
-				     [SubEl, {xmlelement, "error",
-					      [{"code", Code}],
-					      [{xmlcdata, Desc}]}]}
+				     [SubEl, Error]}
 			    end
 		    end;
 		_ ->
 		    {iq, ID, error, XMLNS,
-		     [SubEl, {xmlelement, "error",
-			      [{"code", "405"}],
-			      [{xmlcdata, "Not Allowed"}]}]}
+		     [SubEl, ?ERR_NOT_ALLOWED]}
 	    end;
 	get ->
 	    Node =
@@ -222,11 +218,9 @@ process_iq_data(From, To, ID, XMLNS, Type, SubEl) ->
 		     [{xmlelement, "query", [{"xmlns", XMLNS}],
 		       Res
 		      }]};
-		{error, Code, Desc} ->
+		{error, Error} ->
 		    {iq, ID, error, XMLNS,
-		     [SubEl, {xmlelement, "error",
-			      [{"code", Code}],
-			      [{xmlcdata, Desc}]}]}
+		     [SubEl, Error]}
 	    end
     end.
 
@@ -238,7 +232,7 @@ get_form(From, [], Lang) ->
     Customs =
 	case catch mnesia:dirty_read({irc_custom, {LUser, LServer}}) of
 	    {'EXIT', Reason} ->
-		{error, "500", "Internal Server Error"};
+		{error, ?ERR_INTERNAL_SERVER_ERROR};
 	    [] ->
 		{User, []};
 	    [#irc_custom{data = Data}] ->
@@ -302,7 +296,7 @@ get_form(From, [], Lang) ->
 
 
 get_form(_, _, Lang) ->
-    {error, "503", "Service Unavailable"}.
+    {error, ?ERR_SERVICE_UNAVAILABLE}.
 
 
 
@@ -347,7 +341,7 @@ set_form(From, [], Lang, XData) ->
 
 
 set_form(_, _, Lang, XData) ->
-    {error, "503", "Service Unavailable"}.
+    {error, ?ERR_SERVICE_UNAVAILABLE}.
 
 
 get_user_and_encoding(From, IRCServer) ->
diff --git a/src/mod_irc/mod_irc_connection.erl b/src/mod_irc/mod_irc_connection.erl
index 172c823a..b261ae33 100644
--- a/src/mod_irc/mod_irc_connection.erl
+++ b/src/mod_irc/mod_irc_connection.erl
@@ -27,7 +27,7 @@
 	 code_change/4]).
 
 -include("ejabberd.hrl").
--include("namespaces.hrl").
+-include("jlib.hrl").
 
 -define(SETS, gb_sets).
 
@@ -285,7 +285,7 @@ handle_info({route_chan, Channel, Resource,
 		     ID, XMLNS, Type, SubEl);
 	_ ->
 	    Err = jlib:make_error_reply(
-		    El, "503", "Service Unavailable"),
+		    El, ?ERR_SERVICE_UNAVAILABLE),
 	    ejabberd_router:route(To, From, Err)
     end,
     {next_state, StateName, StateData};
@@ -835,11 +835,9 @@ iq_admin(StateData, Channel, From, To, ID, XMLNS, Type, SubEl) ->
 				       [{"xmlns", XMLNS}],
 				       ResEls
 				      }]};
-				{error, Code, Desc} ->
+				{error, Error} ->
 				    {iq, ID, error, XMLNS,
-				     [SubEl, {xmlelement, "error",
-					      [{"code", Code}],
-					      [{xmlcdata, Desc}]}]}
+				     [SubEl, Error]}
 			    end,
 		    ejabberd_router:route(To, From,
 					  jlib:iq_to_xml(ResIQ));
@@ -852,7 +850,7 @@ iq_admin(StateData, Channel, From, To, ID, XMLNS, Type, SubEl) ->
 process_iq_admin(StateData, Channel, set, SubEl) ->
     case xml:get_subtag(SubEl, "item") of
 	false ->
-	    {error, "400", "Bad Request"};
+	    {error, ?ERR_BAD_REQUEST};
 	ItemEl ->
 	    Nick = xml:get_tag_attr_s("nick", ItemEl),
 	    Affiliation = xml:get_tag_attr_s("affiliation", ItemEl),
@@ -861,12 +859,12 @@ process_iq_admin(StateData, Channel, set, SubEl) ->
 	    process_admin(StateData, Channel, Nick, Affiliation, Role, Reason)
     end;
 process_iq_admin(StateData, Channel, get, SubEl) ->
-    {error, "501", "Not Implemented"}.
+    {error, ?ERR_FEATURE_NOT_IMPLEMENTED}.
 
 
 
 process_admin(StateData, Channel, "", Affiliation, Role, Reason) ->
-    {error, "501", "Not Implemented"};
+    {error, ?ERR_FEATURE_NOT_IMPLEMENTED};
 
 process_admin(StateData, Channel, Nick, Affiliation, "none", Reason) ->
     case Reason of
@@ -884,7 +882,7 @@ process_admin(StateData, Channel, Nick, Affiliation, "none", Reason) ->
 
 
 process_admin(StateData, Channel, Nick, Affiliation, Role, Reason) ->
-    {error, "501", "Not Implemented"}.
+    {error, ?ERR_FEATURE_NOT_IMPLEMENTED}.