Accumulated patch to binarize and indent code

1 files changed, 62 insertions, 44 deletions

diff --git a/src/mod_time.erl b/src/mod_time.erl
index ce2865a5b..a97391e7d 100644
--- a/src/mod_time.erl
+++ b/src/mod_time.erl
@@ -2,6 +2,7 @@
 %%% File    : mod_time.erl
 %%% Author  : Alexey Shchepin <alexey@process-one.net>
 %%% Purpose : 
+%%% Purpose :
 %%% Created : 18 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
@@ -25,67 +26,84 @@
 %%%----------------------------------------------------------------------
 
 -module(mod_time).
+
 -author('alexey@process-one.net').
 
 -behaviour(gen_mod).
 
--export([start/2,
-	 stop/1,
-	 process_local_iq90/3, % TODO: Remove once XEP-0090 is Obsolete
+-export([start/2, stop/1, process_local_iq90/3,
 	 process_local_iq/3]).
 
+                               % TODO: Remove once XEP-0090 is Obsolete
+
 -include("ejabberd.hrl").
--include("jlib.hrl").
 
+-include("jlib.hrl").
 
 start(Host, Opts) ->
-    IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
-    %% TODO: Remove the next two lines once XEP-0090 is Obsolete
-    gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_TIME90,
-				  ?MODULE, process_local_iq90, IQDisc),
-    gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_TIME,
-				  ?MODULE, process_local_iq, IQDisc).
+    IQDisc = gen_mod:get_opt(iqdisc, Opts, fun gen_iq_handler:check_type/1,
+                             one_queue),
+    gen_iq_handler:add_iq_handler(ejabberd_local, Host,
+				  ?NS_TIME90, ?MODULE, process_local_iq90,
+				  IQDisc),
+    gen_iq_handler:add_iq_handler(ejabberd_local, Host,
+				  ?NS_TIME, ?MODULE, process_local_iq, IQDisc).
 
 stop(Host) ->
-    %% TODO: Remove the next line once XEP-0090 is Obsolete
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_TIME90),
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_TIME).
+    gen_iq_handler:remove_iq_handler(ejabberd_local, Host,
+				     ?NS_TIME90),
+    gen_iq_handler:remove_iq_handler(ejabberd_local, Host,
+				     ?NS_TIME).
 
 %% TODO: Remove this function once XEP-0090 is Obsolete
-process_local_iq90(_From, _To, #iq{type = Type, sub_el = SubEl} = IQ) ->
+process_local_iq90(_From, _To,
+		   #iq{type = Type, sub_el = SubEl} = IQ) ->
     case Type of
-	set ->
-	    IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
-	get ->
-	    UTC = jlib:timestamp_to_iso(calendar:universal_time()),
-	    IQ#iq{type = result,
-		  sub_el = [{xmlelement, "query",
-			     [{"xmlns", ?NS_TIME90}],
-			     [{xmlelement, "utc", [],
-			       [{xmlcdata, UTC}]}]}]}
+      set ->
+	  IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
+      get ->
+	  UTC = jlib:timestamp_to_iso(calendar:universal_time()),
+	  IQ#iq{type = result,
+		sub_el =
+		    [#xmlel{name = <<"query">>,
+			    attrs = [{<<"xmlns">>, ?NS_TIME90}],
+			    children =
+				[#xmlel{name = <<"utc">>, attrs = [],
+					children = [{xmlcdata, UTC}]}]}]}
     end.
 
-process_local_iq(_From, _To, #iq{type = Type, sub_el = SubEl} = IQ) ->
+process_local_iq(_From, _To,
+		 #iq{type = Type, sub_el = SubEl} = IQ) ->
     case Type of
-	set ->
-	    IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
-	get ->
-	    Now = now(),
-	    Now_universal = calendar:now_to_universal_time(Now),
-	    Now_local = calendar:now_to_local_time(Now),
-	    {UTC, UTC_diff} = jlib:timestamp_to_iso(Now_universal, utc),
-	    Seconds_diff = calendar:datetime_to_gregorian_seconds(Now_local)
-	     - calendar:datetime_to_gregorian_seconds(Now_universal),
-	    {Hd, Md, _} = calendar:seconds_to_time(abs(Seconds_diff)),
-	    {_, TZO_diff} = jlib:timestamp_to_iso({{0, 0, 0}, {0, 0, 0}}, {sign(Seconds_diff), {Hd, Md}}),
-	    IQ#iq{type = result,
-		  sub_el = [{xmlelement, "time",
-			     [{"xmlns", ?NS_TIME}],
-			     [{xmlelement, "tzo", [],
-			       [{xmlcdata, TZO_diff}]},
-			      {xmlelement, "utc", [],
-			       [{xmlcdata, UTC ++ UTC_diff}]}]}]}
+      set ->
+	  IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
+      get ->
+	  Now = now(),
+	  Now_universal = calendar:now_to_universal_time(Now),
+	  Now_local = calendar:now_to_local_time(Now),
+	  {UTC, UTC_diff} = jlib:timestamp_to_iso(Now_universal,
+						  utc),
+	  Seconds_diff =
+	      calendar:datetime_to_gregorian_seconds(Now_local) -
+		calendar:datetime_to_gregorian_seconds(Now_universal),
+	  {Hd, Md, _} =
+	      calendar:seconds_to_time(abs(Seconds_diff)),
+	  {_, TZO_diff} = jlib:timestamp_to_iso({{0, 1, 1},
+						 {0, 0, 0}},
+						{sign(Seconds_diff), {Hd, Md}}),
+	  IQ#iq{type = result,
+		sub_el =
+		    [#xmlel{name = <<"time">>,
+			    attrs = [{<<"xmlns">>, ?NS_TIME}],
+			    children =
+				[#xmlel{name = <<"tzo">>, attrs = [],
+					children = [{xmlcdata, TZO_diff}]},
+				 #xmlel{name = <<"utc">>, attrs = [],
+					children =
+					    [{xmlcdata,
+                                              <<UTC/binary,
+                                                UTC_diff/binary>>}]}]}]}
     end.
 
-sign(N) when N < 0 -> "-";
-sign(_)            -> "+".
+sign(N) when N < 0 -> <<"-">>;
+sign(_) -> <<"+">>.