Accumulated patch to binarize and indent code

1 files changed, 330 insertions, 390 deletions

diff --git a/src/web/mod_register_web.erl b/src/web/mod_register_web.erl
index acb02235..0ccba994 100644
--- a/src/web/mod_register_web.erl
+++ b/src/web/mod_register_web.erl
@@ -51,18 +51,19 @@
 %%% * Optionally register request is forwarded to admin, no account created.
 
 -module(mod_register_web).
+
 -author('badlop@process-one.net').
 
 -behaviour(gen_mod).
 
--export([start/2,
-	 stop/1,
-	 process/2
-	]).
+-export([start/2, stop/1, process/2]).
 
 -include("ejabberd.hrl").
+
 -include("jlib.hrl").
+
 -include("ejabberd_http.hrl").
+
 -include("ejabberd_web_admin.hrl").
 
 %%%----------------------------------------------------------------------
@@ -70,11 +71,10 @@
 %%%----------------------------------------------------------------------
 
 start(_Host, _Opts) ->
-    %% case gen_mod:get_opt(docroot, Opts, undefined) of
+    %% case gen_mod:get_opt(docroot, Opts, fun(A) -> A end, undefined) of
     ok.
 
-stop(_Host) ->
-    ok.
+stop(_Host) -> ok.
 
 %%%----------------------------------------------------------------------
 %%% HTTP handlers
@@ -82,55 +82,64 @@ stop(_Host) ->
 
 process([], #request{method = 'GET', lang = Lang}) ->
     index_page(Lang);
-
-process(["register.css"], #request{method = 'GET'}) ->
+process([<<"register.css">>],
+	#request{method = 'GET'}) ->
     serve_css();
-
-process(["new"], #request{method = 'GET', lang = Lang, host = Host, ip = IP}) ->
-    {Addr, _Port} = IP,
-    form_new_get(Host, Lang, Addr);
-
-process(["delete"], #request{method = 'GET', lang = Lang, host = Host}) ->
+process([<<"new">>],
+	#request{method = 'GET', lang = Lang, host = Host,
+		 ip = IP}) ->
+    {Addr, _Port} = IP, form_new_get(Host, Lang, Addr);
+process([<<"delete">>],
+	#request{method = 'GET', lang = Lang, host = Host}) ->
     form_del_get(Host, Lang);
-
-process(["change_password"], #request{method = 'GET', lang = Lang, host = Host}) ->
+process([<<"change_password">>],
+	#request{method = 'GET', lang = Lang, host = Host}) ->
     form_changepass_get(Host, Lang);
-
-process(["new"], #request{method = 'POST', q = Q, ip = {Ip,_Port}, lang = Lang, host = Host}) ->
+process([<<"new">>],
+	#request{method = 'POST', q = Q, ip = {Ip, _Port},
+		 lang = Lang, host = Host}) ->
     case form_new_post(Q, Host) of
-    	{success, ok, {Username, Host, _Password}} ->
-	    Jid = jlib:make_jid(Username, Host, ""),
-	    send_registration_notifications(Jid, Ip),
-	    Text = ?T("Your Jabber account was successfully created."),
-	    {200, [], Text};
-	Error ->
-	    ErrorText = ?T("There was an error creating the account: ") ++
-		?T(get_error_text(Error)),
-	    {404, [], ErrorText}
+      {success, ok, {Username, Host, _Password}} ->
+	  Jid = jlib:make_jid(Username, Host, <<"">>),
+          mod_register:send_registration_notifications(?MODULE, Jid, Ip),
+	  Text = (?T(<<"Your Jabber account was successfully "
+		       "created.">>)),
+	  {200, [], Text};
+      Error ->
+	  ErrorText =
+                list_to_binary([?T(<<"There was an error creating the account: ">>),
+                                ?T(get_error_text(Error))]),
+	  {404, [], ErrorText}
     end;
-
-process(["delete"], #request{method = 'POST', q = Q, lang = Lang, host = Host}) ->
+process([<<"delete">>],
+	#request{method = 'POST', q = Q, lang = Lang,
+		 host = Host}) ->
     case form_del_post(Q, Host) of
-    	{atomic, ok} ->
-	    Text = ?T("Your Jabber account was successfully deleted."),
-	    {200, [], Text};
-	Error ->
-	    ErrorText = ?T("There was an error deleting the account: ") ++
-		?T(get_error_text(Error)),
-	    {404, [], ErrorText}
+      {atomic, ok} ->
+	  Text = (?T(<<"Your Jabber account was successfully "
+		       "deleted.">>)),
+	  {200, [], Text};
+      Error ->
+	  ErrorText =
+                list_to_binary([?T(<<"There was an error deleting the account: ">>),
+                                ?T(get_error_text(Error))]),
+	  {404, [], ErrorText}
     end;
-
 %% TODO: Currently only the first vhost is usable. The web request record
 %% should include the host where the POST was sent.
-process(["change_password"], #request{method = 'POST', q = Q, lang = Lang, host = Host}) ->
+process([<<"change_password">>],
+	#request{method = 'POST', q = Q, lang = Lang,
+		 host = Host}) ->
     case form_changepass_post(Q, Host) of
-    	{atomic, ok} ->
-	    Text = ?T("The password of your Jabber account was successfully changed."),
-	    {200, [], Text};
-	Error ->
-	    ErrorText = ?T("There was an error changing the password: ") ++
-		?T(get_error_text(Error)),
-	    {404, [], ErrorText}
+      {atomic, ok} ->
+	  Text = (?T(<<"The password of your Jabber account "
+		       "was successfully changed.">>)),
+	  {200, [], Text};
+      Error ->
+	  ErrorText =
+                list_to_binary([?T(<<"There was an error changing the password: ">>),
+                                ?T(get_error_text(Error))]),
+	  {404, [], ErrorText}
     end.
 
 %%%----------------------------------------------------------------------
@@ -138,48 +147,48 @@ process(["change_password"], #request{method = 'POST', q = Q, lang = Lang, host
 %%%----------------------------------------------------------------------
 
 serve_css() ->
-    {200, [{"Content-Type", "text/css"},
-	   last_modified(), cache_control_public()], css()}.
+    {200,
+     [{<<"Content-Type">>, <<"text/css">>}, last_modified(),
+      cache_control_public()],
+     css()}.
 
 last_modified() ->
-    {"Last-Modified", "Mon, 25 Feb 2008 13:23:30 GMT"}.
+    {<<"Last-Modified">>,
+     <<"Mon, 25 Feb 2008 13:23:30 GMT">>}.
+
 cache_control_public() ->
-    {"Cache-Control", "public"}.
+    {<<"Cache-Control">>, <<"public">>}.
 
 css() ->
-    "html,body {
-background: white;
-margin: 0;
-padding: 0;
-height: 100%;
-}".
+    <<"html,body {\nbackground: white;\nmargin: "
+      "0;\npadding: 0;\nheight: 100%;\n}">>.
 
 %%%----------------------------------------------------------------------
 %%% Index page
 %%%----------------------------------------------------------------------
 
 index_page(Lang) ->
-    HeadEls = [
-	       ?XCT("title", "Jabber Account Registration"),
-	       ?XA("link",
-		   [{"href", "/register/register.css"},
-		    {"type", "text/css"},
-		    {"rel", "stylesheet"}])
-	      ],
-    Els=[
-	 ?XACT("h1",
-	       [{"class", "title"}, {"style", "text-align:center;"}],
-	       "Jabber Account Registration"),
-	 ?XE("ul", [
-		    ?XE("li", [?ACT("new", "Register a Jabber account")]),
-		    ?XE("li", [?ACT("change_password", "Change Password")]),
-		    ?XE("li", [?ACT("delete", "Unregister a Jabber account")])
-		   ]
-	    )
-	],
+    HeadEls = [?XCT(<<"title">>,
+		    <<"Jabber Account Registration">>),
+	       ?XA(<<"link">>,
+		   [{<<"href">>, <<"/register/register.css">>},
+		    {<<"type">>, <<"text/css">>},
+		    {<<"rel">>, <<"stylesheet">>}])],
+    Els = [?XACT(<<"h1">>,
+		 [{<<"class">>, <<"title">>},
+		  {<<"style">>, <<"text-align:center;">>}],
+		 <<"Jabber Account Registration">>),
+	   ?XE(<<"ul">>,
+	       [?XE(<<"li">>,
+		    [?ACT(<<"new">>, <<"Register a Jabber account">>)]),
+		?XE(<<"li">>,
+		    [?ACT(<<"change_password">>, <<"Change Password">>)]),
+		?XE(<<"li">>,
+		    [?ACT(<<"delete">>,
+			  <<"Unregister a Jabber account">>)])])],
     {200,
-     [{"Server", "ejabberd"},
-      {"Content-Type", "text/html"}],
+     [{<<"Server">>, <<"ejabberd">>},
+      {<<"Content-Type">>, <<"text/html">>}],
      ejabberd_web:make_xhtml(HeadEls, Els)}.
 
 %%%----------------------------------------------------------------------
@@ -188,149 +197,114 @@ index_page(Lang) ->
 
 form_new_get(Host, Lang, IP) ->
     CaptchaEls = build_captcha_li_list(Lang, IP),
-    HeadEls = [
-	       ?XCT("title", "Register a Jabber account"),
-	       ?XA("link",
-		   [{"href", "/register/register.css"},
-		    {"type", "text/css"},
-		    {"rel", "stylesheet"}])
-	      ],
-    Els=[
-	 ?XACT("h1",
-	       [{"class", "title"}, {"style", "text-align:center;"}],
-	       "Register a Jabber account"),
-	 ?XCT("p",
-	      "This page allows to create a Jabber account in this Jabber server. "
-	      "Your JID (Jabber IDentifier) will be of the form: username@server. "
-	      "Please read carefully the instructions to fill correctly the fields."),
-	 %% <!-- JID's take the form of 'username@server.com'. For example, my JID is 'kirjava@jabber.org'.
-	 %% The maximum length for a JID is 255 characters. -->
-	 ?XAE("form", [{"action", ""}, {"method", "post"}],
-	      [
-	       ?XE("ol", [
-			  ?XE("li", [
-				     ?CT("Username:"),
-				     ?C(" "),
-				     ?INPUTS("text", "username", "", "20"),
-				     ?BR,
-				     ?XE("ul", [
-						?XCT("li", "This is case insensitive: macbeth is the same that MacBeth and Macbeth."),
-						?XC("li", ?T("Characters not allowed:") ++ " \" & ' / : < > @ ")
-					       ])
-				    ]),
-			  ?XE("li", [
-				     ?CT("Server:"),
-				     ?C(" "),
-				     ?C(Host)
-				    ]),
-			  ?XE("li", [
-				     ?CT("Password:"),
-				     ?C(" "),
-				     ?INPUTS("password", "password", "", "20"),
-				     ?BR,
-				     ?XE("ul", [
-						?XCT("li", "Don't tell your password to anybody, "
-						    "not even the administrators of the Jabber server."),
-						?XCT("li", "You can later change your password using a Jabber client."),
-						?XCT("li", "Some Jabber clients can store your password in your computer. "
-						    "Use that feature only if you trust your computer is safe."),
-						?XCT("li", "Memorize your password, or write it in a paper placed in a safe place. "
-						    "In Jabber there isn't an automated way to recover your password if you forget it.")
-					       ])
-				    ]),
-			  ?XE("li", [
-				     ?CT("Password Verification:"),
-				     ?C(" "),
-				     ?INPUTS("password", "password2", "", "20")
-				    ])] ++ CaptchaEls ++ [
-			  %% Nombre</b> (opcional)<b>:</b> <input type="text" size="20" name="name" maxlength="255"> <br /> <br /> -->
-			  %%
-			  %% Direcci&oacute;n de correo</b> (opcional)<b>:</b> <input type="text" size="20" name="email" maxlength="255"> <br /> <br /> -->
-			  ?XE("li", [
-				     ?INPUTT("submit", "register", "Register")
-				    ])
-			 ])
-	      ])
-	],
+    HeadEls = [?XCT(<<"title">>,
+		    <<"Register a Jabber account">>),
+	       ?XA(<<"link">>,
+		   [{<<"href">>, <<"/register/register.css">>},
+		    {<<"type">>, <<"text/css">>},
+		    {<<"rel">>, <<"stylesheet">>}])],
+    Els = [?XACT(<<"h1">>,
+		 [{<<"class">>, <<"title">>},
+		  {<<"style">>, <<"text-align:center;">>}],
+		 <<"Register a Jabber account">>),
+	   ?XCT(<<"p">>,
+		<<"This page allows to create a Jabber "
+		  "account in this Jabber server. Your "
+		  "JID (Jabber IDentifier) will be of the "
+		  "form: username@server. Please read carefully "
+		  "the instructions to fill correctly the "
+		  "fields.">>),
+	   ?XAE(<<"form">>,
+		[{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}],
+		[?XE(<<"ol">>,
+		     ([?XE(<<"li">>,
+			   [?CT(<<"Username:">>), ?C(<<" ">>),
+			    ?INPUTS(<<"text">>, <<"username">>, <<"">>,
+				    <<"20">>),
+			    ?BR,
+			    ?XE(<<"ul">>,
+				[?XCT(<<"li">>,
+				      <<"This is case insensitive: macbeth is "
+					"the same that MacBeth and Macbeth.">>),
+				 ?XC(<<"li">>,
+				     <<(?T(<<"Characters not allowed:">>))/binary,
+				       " \" & ' / : < > @ ">>)])]),
+		       ?XE(<<"li">>,
+			   [?CT(<<"Server:">>), ?C(<<" ">>), ?C(Host)]),
+		       ?XE(<<"li">>,
+			   [?CT(<<"Password:">>), ?C(<<" ">>),
+			    ?INPUTS(<<"password">>, <<"password">>, <<"">>,
+				    <<"20">>),
+			    ?BR,
+			    ?XE(<<"ul">>,
+				[?XCT(<<"li">>,
+				      <<"Don't tell your password to anybody, "
+					"not even the administrators of the Jabber "
+					"server.">>),
+				 ?XCT(<<"li">>,
+				      <<"You can later change your password using "
+					"a Jabber client.">>),
+				 ?XCT(<<"li">>,
+				      <<"Some Jabber clients can store your password "
+					"in your computer. Use that feature only "
+					"if you trust your computer is safe.">>),
+				 ?XCT(<<"li">>,
+				      <<"Memorize your password, or write it "
+					"in a paper placed in a safe place. In "
+					"Jabber there isn't an automated way "
+					"to recover your password if you forget "
+					"it.">>)])]),
+		       ?XE(<<"li">>,
+			   [?CT(<<"Password Verification:">>), ?C(<<" ">>),
+			    ?INPUTS(<<"password">>, <<"password2">>, <<"">>,
+				    <<"20">>)])]
+			++
+			CaptchaEls ++
+			  [?XE(<<"li">>,
+			       [?INPUTT(<<"submit">>, <<"register">>,
+					<<"Register">>)])]))])],
     {200,
-     [{"Server", "ejabberd"},
-      {"Content-Type", "text/html"}],
+     [{<<"Server">>, <<"ejabberd">>},
+      {<<"Content-Type">>, <<"text/html">>}],
      ejabberd_web:make_xhtml(HeadEls, Els)}.
 
 %% Copied from mod_register.erl
-send_registration_notifications(UJID, Source) ->
-    Host = UJID#jid.lserver,
-    case gen_mod:get_module_opt(Host, ?MODULE, registration_watchers, []) of
-        [] -> ok;
-        JIDs when is_list(JIDs) ->
-            Body = lists:flatten(
-                     io_lib:format(
-                       "[~s] The account ~s was registered from IP address ~s "
-                       "on node ~w using ~p.",
-                       [get_time_string(), jlib:jid_to_string(UJID),
-                        ip_to_string(Source), node(), ?MODULE])),
-            lists:foreach(
-              fun(S) ->
-                      case jlib:string_to_jid(S) of
-                          error -> ok;
-                          JID ->
-                              ejabberd_router:route(
-                                jlib:make_jid("", Host, ""),
-                                JID,
-                                {xmlelement, "message", [{"type", "chat"}],
-                                 [{xmlelement, "body", [],
-                                   [{xmlcdata, Body}]}]})
-                      end
-              end, JIDs);
-        _ ->
-            ok
-    end.
-ip_to_string(Source) when is_tuple(Source) -> inet_parse:ntoa(Source);
-ip_to_string(undefined) -> "undefined";
-ip_to_string(_) -> "unknown".
-get_time_string() -> write_time(erlang:localtime()).
 %% Function copied from ejabberd_logger_h.erl and customized
-write_time({{Y,Mo,D},{H,Mi,S}}) ->
-    io_lib:format("~w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w",
-                  [Y, Mo, D, H, Mi, S]).
-
 %%%----------------------------------------------------------------------
 %%% Formulary new POST
 %%%----------------------------------------------------------------------
 
 form_new_post(Q, Host) ->
     case catch get_register_parameters(Q) of
-	[Username, Password, Password, Id, Key] ->
-	    form_new_post(Username, Host, Password, {Id, Key});
-	[_Username, _Password, _Password2, false, false] ->
-	    {error, passwords_not_identical};
-	[_Username, _Password, _Password2, Id, Key] ->
-	    ejabberd_captcha:check_captcha(Id, Key), %% This deletes the captcha
-	    {error, passwords_not_identical};
-	_ ->
-	    {error, wrong_parameters}
+      [Username, Password, Password, Id, Key] ->
+	  form_new_post(Username, Host, Password, {Id, Key});
+      [_Username, _Password, _Password2, false, false] ->
+	  {error, passwords_not_identical};
+      [_Username, _Password, _Password2, Id, Key] ->
+	  ejabberd_captcha:check_captcha(Id, Key),
+	  {error, passwords_not_identical};
+      _ -> {error, wrong_parameters}
     end.
 
 get_register_parameters(Q) ->
-    lists:map(
-      fun(Key) ->
-	      case lists:keysearch(Key, 1, Q) of
-		  {value, {_Key, Value}} -> Value;
-		  false -> false
-	      end
-      end,
-      ["username", "password", "password2", "id", "key"]).
-
-form_new_post(Username, Host, Password, {false, false}) ->
+    lists:map(fun (Key) ->
+		      case lists:keysearch(Key, 1, Q) of
+			{value, {_Key, Value}} -> Value;
+			false -> false
+		      end
+	      end,
+	      [<<"username">>, <<"password">>, <<"password2">>,
+	       <<"id">>, <<"key">>]).
+
+form_new_post(Username, Host, Password,
+	      {false, false}) ->
     register_account(Username, Host, Password);
 form_new_post(Username, Host, Password, {Id, Key}) ->
     case ejabberd_captcha:check_captcha(Id, Key) of
-	captcha_valid ->
-	    register_account(Username, Host, Password);
-	captcha_non_valid ->
-	    {error, captcha_non_valid};
-	captcha_not_found ->
-	    {error, captcha_non_valid}
+      captcha_valid ->
+	  register_account(Username, Host, Password);
+      captcha_non_valid -> {error, captcha_non_valid};
+      captcha_not_found -> {error, captcha_non_valid}
     end.
 
 %%%----------------------------------------------------------------------
@@ -339,28 +313,26 @@ form_new_post(Username, Host, Password, {Id, Key}) ->
 
 build_captcha_li_list(Lang, IP) ->
     case ejabberd_captcha:is_feature_available() of
-	true -> build_captcha_li_list2(Lang, IP);
-	false -> []
+      true -> build_captcha_li_list2(Lang, IP);
+      false -> []
     end.
 
 build_captcha_li_list2(Lang, IP) ->
-    SID = "",
-    From = #jid{user = "", server = "test", resource = ""},
-    To = #jid{user = "", server = "test", resource = ""},
+    SID = <<"">>,
+    From = #jid{user = <<"">>, server = <<"test">>,
+		resource = <<"">>},
+    To = #jid{user = <<"">>, server = <<"test">>,
+	      resource = <<"">>},
     Args = [],
-    case ejabberd_captcha:create_captcha(SID, From, To, Lang, IP, Args) of
-        {ok, Id, _} ->
-            {_, {CImg,CText,CId,CKey}} =
-                ejabberd_captcha:build_captcha_html(Id, Lang),
-            [?XE("li", [CText,
-                        ?C(" "),
-                        CId,
-                        CKey,
-                        ?BR,
-                        CImg]
-                )];
-        _ ->
-            []
+    case ejabberd_captcha:create_captcha(SID, From, To,
+					 Lang, IP, Args)
+	of
+      {ok, Id, _} ->
+	  {_, {CImg, CText, CId, CKey}} =
+	      ejabberd_captcha:build_captcha_html(Id, Lang),
+	  [?XE(<<"li">>,
+	       [CText, ?C(<<" ">>), CId, CKey, ?BR, CImg])];
+      _ -> []
     end.
 
 %%%----------------------------------------------------------------------
@@ -368,54 +340,42 @@ build_captcha_li_list2(Lang, IP) ->
 %%%----------------------------------------------------------------------
 
 form_changepass_get(Host, Lang) ->
-    HeadEls = [
-	       ?XCT("title", "Change Password"),
-	       ?XA("link",
-		   [{"href", "/register/register.css"},
-		    {"type", "text/css"},
-		    {"rel", "stylesheet"}])
-	      ],
-    Els=[
-	 ?XACT("h1",
-	       [{"class", "title"}, {"style", "text-align:center;"}],
-	       "Change Password"),
-	 ?XAE("form", [{"action", ""}, {"method", "post"}],
-	      [
-	       ?XE("ol", [
-			  ?XE("li", [
-				     ?CT("Username:"),
-				     ?C(" "),
-				     ?INPUTS("text", "username", "", "20")
-				    ]),
-			  ?XE("li", [
-				     ?CT("Server:"),
-				     ?C(" "),
-				     ?C(Host)
-				    ]),
-			  ?XE("li", [
-				     ?CT("Old Password:"),
-				     ?C(" "),
-				     ?INPUTS("password", "passwordold", "", "20")
-				    ]),
-			  ?XE("li", [
-				     ?CT("New Password:"),
-				     ?C(" "),
-				     ?INPUTS("password", "password", "", "20")
-				    ]),
-			  ?XE("li", [
-				     ?CT("Password Verification:"),
-				     ?C(" "),
-				     ?INPUTS("password", "password2", "", "20")
-				    ]),
-			  ?XE("li", [
-				     ?INPUTT("submit", "changepass", "Change Password")
-				    ])
-			 ])
-	      ])
-	],
+    HeadEls = [?XCT(<<"title">>, <<"Change Password">>),
+	       ?XA(<<"link">>,
+		   [{<<"href">>, <<"/register/register.css">>},
+		    {<<"type">>, <<"text/css">>},
+		    {<<"rel">>, <<"stylesheet">>}])],
+    Els = [?XACT(<<"h1">>,
+		 [{<<"class">>, <<"title">>},
+		  {<<"style">>, <<"text-align:center;">>}],
+		 <<"Change Password">>),
+	   ?XAE(<<"form">>,
+		[{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}],
+		[?XE(<<"ol">>,
+		     [?XE(<<"li">>,
+			  [?CT(<<"Username:">>), ?C(<<" ">>),
+			   ?INPUTS(<<"text">>, <<"username">>, <<"">>,
+				   <<"20">>)]),
+		      ?XE(<<"li">>,
+			  [?CT(<<"Server:">>), ?C(<<" ">>), ?C(Host)]),
+		      ?XE(<<"li">>,
+			  [?CT(<<"Old Password:">>), ?C(<<" ">>),
+			   ?INPUTS(<<"password">>, <<"passwordold">>, <<"">>,
+				   <<"20">>)]),
+		      ?XE(<<"li">>,
+			  [?CT(<<"New Password:">>), ?C(<<" ">>),
+			   ?INPUTS(<<"password">>, <<"password">>, <<"">>,
+				   <<"20">>)]),
+		      ?XE(<<"li">>,
+			  [?CT(<<"Password Verification:">>), ?C(<<" ">>),
+			   ?INPUTS(<<"password">>, <<"password2">>, <<"">>,
+				   <<"20">>)]),
+		      ?XE(<<"li">>,
+			  [?INPUTT(<<"submit">>, <<"changepass">>,
+				   <<"Change Password">>)])])])],
     {200,
-     [{"Server", "ejabberd"},
-      {"Content-Type", "text/html"}],
+     [{<<"Server">>, <<"ejabberd">>},
+      {<<"Content-Type">>, <<"text/html">>}],
      ejabberd_web:make_xhtml(HeadEls, Els)}.
 
 %%%----------------------------------------------------------------------
@@ -424,64 +384,60 @@ form_changepass_get(Host, Lang) ->
 
 form_changepass_post(Q, Host) ->
     case catch get_changepass_parameters(Q) of
-	[Username, PasswordOld, Password, Password] ->
-	    try_change_password(Username, Host, PasswordOld, Password);
-	[_Username, _PasswordOld, _Password, _Password2] ->
-	    {error, passwords_not_identical};
-	_ ->
-	    {error, wrong_parameters}
+      [Username, PasswordOld, Password, Password] ->
+	  try_change_password(Username, Host, PasswordOld,
+			      Password);
+      [_Username, _PasswordOld, _Password, _Password2] ->
+	  {error, passwords_not_identical};
+      _ -> {error, wrong_parameters}
     end.
 
 get_changepass_parameters(Q) ->
-    lists:map(
-      fun(Key) ->
-	      {value, {_Key, Value}} = lists:keysearch(Key, 1, Q),
-	      Value
-      end,
-      ["username", "passwordold", "password", "password2"]).
-
 %% @spec(Username,Host,PasswordOld,Password) -> {atomic, ok} |
 %%                                              {error, account_doesnt_exist} |
 %%                                              {error, password_not_changed} |
 %%                                              {error, password_incorrect}
-try_change_password(Username, Host, PasswordOld, Password) ->
-    try change_password(Username, Host, PasswordOld, Password) of
-	{atomic, ok} ->
-	    {atomic, ok}
+    lists:map(fun (Key) ->
+		      {value, {_Key, Value}} = lists:keysearch(Key, 1, Q),
+		      Value
+	      end,
+	      [<<"username">>, <<"passwordold">>, <<"password">>,
+	       <<"password2">>]).
+
+try_change_password(Username, Host, PasswordOld,
+		    Password) ->
+    try change_password(Username, Host, PasswordOld,
+			Password)
+    of
+      {atomic, ok} -> {atomic, ok}
     catch
-	error:{badmatch, Error} ->
-	    {error, Error}
+      error:{badmatch, Error} -> {error, Error}
     end.
 
-change_password(Username, Host, PasswordOld, Password) ->
-    %% Check the account exists
+change_password(Username, Host, PasswordOld,
+		Password) ->
     account_exists = check_account_exists(Username, Host),
-
-    %% Check the old password is correct
-    password_correct = check_password(Username, Host, PasswordOld),
-
-    %% This function always returns: ok
-    %% Change the password
-    ok = ejabberd_auth:set_password(Username, Host, Password),
-
-    %% Check the new password is correct
+    password_correct = check_password(Username, Host,
+				      PasswordOld),
+    ok = ejabberd_auth:set_password(Username, Host,
+				    Password),
     case check_password(Username, Host, Password) of
-    	password_correct ->
-	    {atomic, ok};
-    	password_incorrect ->
-	    {error, password_not_changed}
+      password_correct -> {atomic, ok};
+      password_incorrect -> {error, password_not_changed}
     end.
 
 check_account_exists(Username, Host) ->
     case ejabberd_auth:is_user_exists(Username, Host) of
-    	true -> account_exists;
-	false -> account_doesnt_exist
+      true -> account_exists;
+      false -> account_doesnt_exist
     end.
 
 check_password(Username, Host, Password) ->
-    case ejabberd_auth:check_password(Username, Host, Password) of
-    	true -> password_correct;
-	false -> password_incorrect
+    case ejabberd_auth:check_password(Username, Host,
+				      Password)
+	of
+      true -> password_correct;
+      false -> password_incorrect
     end.
 
 %%%----------------------------------------------------------------------
@@ -489,46 +445,38 @@ check_password(Username, Host, Password) ->
 %%%----------------------------------------------------------------------
 
 form_del_get(Host, Lang) ->
-    HeadEls = [
-	       ?XCT("title", "Unregister a Jabber account"),
-	       ?XA("link",
-		   [{"href", "/register/register.css"},
-		    {"type", "text/css"},
-		    {"rel", "stylesheet"}])
-	      ],
-    Els=[
-	 ?XACT("h1",
-	       [{"class", "title"}, {"style", "text-align:center;"}],
-	       "Unregister a Jabber account"),
-	 ?XCT("p",
-	      "This page allows to unregister a Jabber account in this Jabber server."),
-	 ?XAE("form", [{"action", ""}, {"method", "post"}],
-	      [
-	       ?XE("ol", [
-			  ?XE("li", [
-				     ?CT("Username:"),
-				     ?C(" "),
-				     ?INPUTS("text", "username", "", "20")
-				    ]),
-			  ?XE("li", [
-				     ?CT("Server:"),
-				     ?C(" "),
-				     ?C(Host)
-				    ]),
-			  ?XE("li", [
-				     ?CT("Password:"),
-				     ?C(" "),
-				     ?INPUTS("password", "password", "", "20")
-				    ]),
-			  ?XE("li", [
-				     ?INPUTT("submit", "unregister", "Unregister")
-				    ])
-			 ])
-	      ])
-	],
+    HeadEls = [?XCT(<<"title">>,
+		    <<"Unregister a Jabber account">>),
+	       ?XA(<<"link">>,
+		   [{<<"href">>, <<"/register/register.css">>},
+		    {<<"type">>, <<"text/css">>},
+		    {<<"rel">>, <<"stylesheet">>}])],
+    Els = [?XACT(<<"h1">>,
+		 [{<<"class">>, <<"title">>},
+		  {<<"style">>, <<"text-align:center;">>}],
+		 <<"Unregister a Jabber account">>),
+	   ?XCT(<<"p">>,
+		<<"This page allows to unregister a Jabber "
+		  "account in this Jabber server.">>),
+	   ?XAE(<<"form">>,
+		[{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}],
+		[?XE(<<"ol">>,
+		     [?XE(<<"li">>,
+			  [?CT(<<"Username:">>), ?C(<<" ">>),
+			   ?INPUTS(<<"text">>, <<"username">>, <<"">>,
+				   <<"20">>)]),
+		      ?XE(<<"li">>,
+			  [?CT(<<"Server:">>), ?C(<<" ">>), ?C(Host)]),
+		      ?XE(<<"li">>,
+			  [?CT(<<"Password:">>), ?C(<<" ">>),
+			   ?INPUTS(<<"password">>, <<"password">>, <<"">>,
+				   <<"20">>)]),
+		      ?XE(<<"li">>,
+			  [?INPUTT(<<"submit">>, <<"unregister">>,
+				   <<"Unregister">>)])])])],
     {200,
-     [{"Server", "ejabberd"},
-      {"Content-Type", "text/html"}],
+     [{<<"Server">>, <<"ejabberd">>},
+      {<<"Content-Type">>, <<"text/html">>}],
      ejabberd_web:make_xhtml(HeadEls, Els)}.
 
 %% @spec(Username, Host, Password) -> {success, ok, {Username, Host, Password} |
@@ -536,16 +484,18 @@ form_del_get(Host, Lang) ->
 %%                                    {error, not_allowed} |
 %%                                    {error, invalid_jid}
 register_account(Username, Host, Password) ->
-    case jlib:make_jid(Username, Host, "") of
-	error -> {error, invalid_jid};
-	_ -> register_account2(Username, Host, Password)
+    case jlib:make_jid(Username, Host, <<"">>) of
+      error -> {error, invalid_jid};
+      _ -> register_account2(Username, Host, Password)
     end.
+
 register_account2(Username, Host, Password) ->
-    case ejabberd_auth:try_register(Username, Host, Password) of
-	{atomic, Res} ->
-	    {success, Res, {Username, Host, Password}};
-	Other ->
-	    Other
+    case ejabberd_auth:try_register(Username, Host,
+				    Password)
+	of
+      {atomic, Res} ->
+	  {success, Res, {Username, Host, Password}};
+      Other -> Other
     end.
 
 %%%----------------------------------------------------------------------
@@ -554,47 +504,37 @@ register_account2(Username, Host, Password) ->
 
 form_del_post(Q, Host) ->
     case catch get_unregister_parameters(Q) of
-	[Username, Password] ->
-	    try_unregister_account(Username, Host, Password);
-	_ ->
-	    {error, wrong_parameters}
+      [Username, Password] ->
+	  try_unregister_account(Username, Host, Password);
+      _ -> {error, wrong_parameters}
     end.
 
 get_unregister_parameters(Q) ->
-    lists:map(
-      fun(Key) ->
-	      {value, {_Key, Value}} = lists:keysearch(Key, 1, Q),
-	      Value
-      end,
-      ["username", "password"]).
-
 %% @spec(Username, Host, Password) -> {atomic, ok} |
 %%                                    {error, account_doesnt_exist} |
 %%                                    {error, account_exists} |
 %%                                    {error, password_incorrect}
+    lists:map(fun (Key) ->
+		      {value, {_Key, Value}} = lists:keysearch(Key, 1, Q),
+		      Value
+	      end,
+	      [<<"username">>, <<"password">>]).
+
 try_unregister_account(Username, Host, Password) ->
     try unregister_account(Username, Host, Password) of
-	{atomic, ok} ->
-	    {atomic, ok}
+      {atomic, ok} -> {atomic, ok}
     catch
-	error:{badmatch, Error} ->
-	    {error, Error}
+      error:{badmatch, Error} -> {error, Error}
     end.
 
 unregister_account(Username, Host, Password) ->
-    %% Check the account exists
     account_exists = check_account_exists(Username, Host),
-
-    %% Check the password is correct
-    password_correct = check_password(Username, Host, Password),
-
-    %% This function always returns: ok
-    ok = ejabberd_auth:remove_user(Username, Host, Password),
-
-    %% Check the account does not exist anymore
-    account_doesnt_exist = check_account_exists(Username, Host),
-
-    %% If we reached this point, return success
+    password_correct = check_password(Username, Host,
+				      Password),
+    ok = ejabberd_auth:remove_user(Username, Host,
+				   Password),
+    account_doesnt_exist = check_account_exists(Username,
+						Host),
     {atomic, ok}.
 
 %%%----------------------------------------------------------------------
@@ -602,24 +542,24 @@ unregister_account(Username, Host, Password) ->
 %%%----------------------------------------------------------------------
 
 get_error_text({error, captcha_non_valid}) ->
-    "The captcha you entered is wrong";
+    <<"The captcha you entered is wrong">>;
 get_error_text({success, exists, _}) ->
     get_error_text({atomic, exists});
 get_error_text({atomic, exists}) ->
-    "The account already exists";
+    <<"The account already exists">>;
 get_error_text({error, password_incorrect}) ->
-    "Incorrect password";
+    <<"Incorrect password">>;
 get_error_text({error, invalid_jid}) ->
-    "The username is not valid";
+    <<"The username is not valid">>;
 get_error_text({error, not_allowed}) ->
-    "Not allowed";
+    <<"Not allowed">>;
 get_error_text({error, account_doesnt_exist}) ->
-    "Account doesn't exist";
+    <<"Account doesn't exist">>;
 get_error_text({error, account_exists}) ->
-    "The account was not deleted";
+    <<"The account was not deleted">>;
 get_error_text({error, password_not_changed}) ->
-    "The password was not changed";
+    <<"The password was not changed">>;
 get_error_text({error, passwords_not_identical}) ->
-    "The passwords are different";
+    <<"The passwords are different">>;
 get_error_text({error, wrong_parameters}) ->
-    "Wrong parameters in the web formulary".
+    <<"Wrong parameters in the web formulary">>.