Rewrite several modules to use XML generator

1 files changed, 4 insertions, 17 deletions

diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl
index ae264bbc..8f11b0ea 100644
--- a/src/mod_service_log.erl
+++ b/src/mod_service_log.erl
@@ -62,9 +62,7 @@ log_user_receive(Packet, _C2SState, _JID, From, To) ->
     log_packet(From, To, Packet, To#jid.lserver),
     Packet.
 
-log_packet(From, To,
-	   #xmlel{name = Name, attrs = Attrs, children = Els},
-	   Host) ->
+log_packet(From, To, Packet, Host) ->
     Loggers = gen_mod:get_module_opt(Host, ?MODULE, loggers,
                                      fun(L) ->
                                              lists:map(
@@ -76,22 +74,11 @@ log_packet(From, To,
                                                        end
                                                end, L)
                                      end, []),
-    ServerJID = #jid{user = <<"">>, server = Host,
-		     resource = <<"">>, luser = <<"">>, lserver = Host,
-		     lresource = <<"">>},
-    NewAttrs =
-	jlib:replace_from_to_attrs(jid:to_string(From),
-				   jid:to_string(To), Attrs),
-    FixedPacket = #xmlel{name = Name, attrs = NewAttrs,
-			 children = Els},
+    ServerJID = jid:make(Host),
+    FixedPacket = xmpp:set_from_to(Packet, From, To),
     lists:foreach(fun (Logger) ->
 			  ejabberd_router:route(ServerJID,
-						#jid{user = <<"">>,
-						     server = Logger,
-						     resource = <<"">>,
-						     luser = <<"">>,
-						     lserver = Logger,
-						     lresource = <<"">>},
+						jid:make(Logger),
 						#xmlel{name = <<"route">>,
 						       attrs = [],
 						       children =