diff options
| author | Badlop <badlop@process-one.net> | 2008-07-11 13:35:08 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-07-11 13:35:08 +0000 |
| commit | e7b42f949947f4235f2541daf08bc4b3b84c1954 (patch) | |
| tree | 7bebd2c8e35f978bc72820377a9a675dfd11a8f7 | |
| parent | * src/configure.ac: Don't check for erlang header file (EJAB-232) (diff) | |
* src/mod_register.erl: Revert support for io_lib newline, since
there is a standard character that representes newline (EJAB-501)
* doc/guide.tex: Update documentation to explain newline character
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise
SVN Revision: 1436
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | doc/guide.html | 4 | ||||
| -rw-r--r-- | doc/guide.tex | 4 | ||||
| -rw-r--r-- | src/ejabberd.cfg.example | 2 | ||||
| -rw-r--r-- | src/mod_register.erl | 3 |
5 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2008-07-11 Badlop <badlop@process-one.net> + + * src/mod_register.erl: Revert support for io_lib newline, since + there is a standard character that representes newline (EJAB-501) + * doc/guide.tex: Update documentation to explain newline character + * doc/guide.html: Likewise + * src/ejabberd.cfg.example: Likewise + 2008-07-10 Badlop <badlop@process-one.net> * src/configure.ac: Don't check for erlang header file (EJAB-232) diff --git a/doc/guide.html b/doc/guide.html index b7f10839b..d1841a4cb 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -2363,7 +2363,7 @@ restrictions by default). </DD><DT CLASS="dt-description"><B><TT>welcome_message</TT></B></DT><DD CLASS="dd-description"> Set a welcome message that is sent to each newly registered account. The first string is the subject, and the second string is the message body. -In the body you can set a newline with the characters: <TT>~n</TT>. +In the body you can set a newline with the characters: <CODE>\n</CODE> </DD><DT CLASS="dt-description"><B><TT>registration_watchers</TT></B></DT><DD CLASS="dd-description"> This option defines a list of JIDs which will be notified each time a new account is registered. </DD><DT CLASS="dt-description"><B><TT>iqdisc</TT></B></DT><DD CLASS="dd-description"> This specifies @@ -2414,7 +2414,7 @@ Also define a registration timeout of one hour: ... {mod_register, [ - {welcome_message, {"Welcome!", "Hi.~nWelcome to this Jabber server.~n Check http://www.jabber.org~n~nBye"}}, + {welcome_message, {"Welcome!", "Hi.\nWelcome to this Jabber server.\n Check http://www.jabber.org\n\nBye"}}, {registration_watchers, ["admin1@example.org", "boss@example.net"]} ]}, ... diff --git a/doc/guide.tex b/doc/guide.tex index 5a23a359a..49e40400d 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -3036,7 +3036,7 @@ Options: \titem{welcome\_message} \ind{options!welcomem}Set a welcome message that is sent to each newly registered account. The first string is the subject, and the second string is the message body. - In the body you can set a newline with the characters: \term{\~\ n}. + In the body you can set a newline with the characters: \verb|\n| \titem{registration\_watchers} \ind{options!rwatchers}This option defines a list of JIDs which will be notified each time a new account is registered. \iqdiscitem{In-Band Registration (\ns{jabber:iq:register})} @@ -3095,7 +3095,7 @@ Also define a registration timeout of one hour: ... {mod_register, [ - {welcome_message, {"Welcome!", "Hi.~nWelcome to this Jabber server.~n Check http://www.jabber.org~n~nBye"}}, + {welcome_message, {"Welcome!", "Hi.\nWelcome to this Jabber server.\n Check http://www.jabber.org\n\nBye"}}, {registration_watchers, ["admin1@example.org", "boss@example.net"]} ]}, ... diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example index eb43bb3ca..022a9ebc2 100644 --- a/src/ejabberd.cfg.example +++ b/src/ejabberd.cfg.example @@ -459,7 +459,7 @@ %% a message with this subject and body. %% {welcome_message, {"Welcome!", - "Hi.~nWelcome to this Jabber server."}}, + "Hi.\nWelcome to this Jabber server."}}, %% %% When a user registers, send a notification to diff --git a/src/mod_register.erl b/src/mod_register.erl index 21080c8a2..a936ea5e1 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -241,13 +241,12 @@ send_welcome_message(JID) -> {"", ""} -> ok; {Subj, Body} -> - BodyFormatted = io_lib:format(Body, []), ejabberd_router:route( jlib:make_jid("", Host, ""), JID, {xmlelement, "message", [{"type", "normal"}], [{xmlelement, "subject", [], [{xmlcdata, Subj}]}, - {xmlelement, "body", [], [{xmlcdata, BodyFormatted}]}]}); + {xmlelement, "body", [], [{xmlcdata, Body}]}]}); _ -> ok end. |