From 5334a2d965bfcc6b2e9cb38c936b07aea3af16c7 Mon Sep 17 00:00:00 2001
From: Pablo Polvorin <pablo.polvorin@process-one.net>
Date: Wed, 18 Feb 2009 18:14:06 +0000
Subject: [PATCH] Bugfix: mod_announce.erl:get_title/2 now accepts node
 argument in binary() or list() format.

SVN Revision: 1887
---
 ChangeLog            |  3 +++
 src/mod_announce.erl | 25 +++++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 274171a67..d8b7ab8c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
 
 	* src/ejabberd_sm.erl: Bugfix in get_user_info/3.
 
+	* src/mod_announce.erl: get_title/2 accepts node argument in binary()
+	or list() format.
+
 2009-02-13 Christophe Romain <christophe.romain@process-one.net>
 
 	* src/ejabberd_auth.erl: prevent from calling 
diff --git a/src/mod_announce.erl b/src/mod_announce.erl
index 5a419fef2..b6a2ea188 100644
--- a/src/mod_announce.erl
+++ b/src/mod_announce.erl
@@ -636,28 +636,29 @@ handle_adhoc_form(From, To,
 	    %% command nodes.
 	    {error, 'internal-server-error'}
     end.
-
-get_title(Lang, "announce") ->
+get_title(Lang, Node) when is_list(Node) ->
+    get_title(Lang, list_to_binary(Node));
+get_title(Lang, <<"announce">>) ->
     translate:translate(Lang, "Announcements");
-get_title(Lang, ?NS_ADMIN_s ++ "#announce-all") ->
+get_title(Lang, <<?NS_ADMIN_s, "#announce-all">>) ->
     translate:translate(Lang, "Send announcement to all users");
-get_title(Lang, ?NS_ADMIN_s ++ "#announce-all-allhosts") ->
+get_title(Lang, <<?NS_ADMIN_s , "#announce-all-allhosts">>) ->
     translate:translate(Lang, "Send announcement to all users on all hosts");
-get_title(Lang, ?NS_ADMIN_s ++ "#announce") ->
+get_title(Lang, <<?NS_ADMIN_s , "#announce">>) ->
     translate:translate(Lang, "Send announcement to all online users");
-get_title(Lang, ?NS_ADMIN_s ++ "#announce-allhosts") ->
+get_title(Lang, <<?NS_ADMIN_s , "#announce-allhosts">>) ->
     translate:translate(Lang, "Send announcement to all online users on all hosts");
-get_title(Lang, ?NS_ADMIN_s ++ "#set-motd") ->
+get_title(Lang, <<?NS_ADMIN_s , "#set-motd">>) ->
     translate:translate(Lang, "Set message of the day and send to online users");
-get_title(Lang, ?NS_ADMIN_s ++ "#set-motd-allhosts") ->
+get_title(Lang, <<?NS_ADMIN_s , "#set-motd-allhosts">>) ->
     translate:translate(Lang, "Set message of the day on all hosts and send to online users");
-get_title(Lang, ?NS_ADMIN_s ++ "#edit-motd") ->
+get_title(Lang, <<?NS_ADMIN_s , "#edit-motd">>) ->
     translate:translate(Lang, "Update message of the day (don't send)");
-get_title(Lang, ?NS_ADMIN_s ++ "#edit-motd-allhosts") ->
+get_title(Lang, <<?NS_ADMIN_s , "#edit-motd-allhosts">>) ->
     translate:translate(Lang, "Update message of the day on all hosts (don't send)");
-get_title(Lang, ?NS_ADMIN_s ++ "#delete-motd") ->
+get_title(Lang, <<?NS_ADMIN_s , "#delete-motd">>) ->
     translate:translate(Lang, "Delete message of the day");
-get_title(Lang, ?NS_ADMIN_s ++ "#delete-motd-allhosts") ->
+get_title(Lang, <<?NS_ADMIN_s , "#delete-motd-allhosts">>) ->
     translate:translate(Lang, "Delete message of the day on all hosts").
 
 %%-------------------------------------------------------------------------