- Revert to -r1831

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1834 82007160-df01-0410-b94d-b575c5fd34c7

1 files changed, 21 insertions, 3 deletions

diff --git a/modules/m_set.c b/modules/m_set.c
index fbbf932..4fa1970 100644
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -58,6 +58,7 @@ static void quote_autoconnall(struct Client *, int);
 static void quote_floodcount(struct Client *, int);
 static void quote_identtimeout(struct Client *, int);
 static void quote_max(struct Client *, int);
+static void quote_msglocale(struct Client *, char *);
 static void quote_spamnum(struct Client *, int);
 static void quote_spamtime(struct Client *, int);
 static void quote_splitmode(struct Client *, char *);
@@ -84,6 +85,7 @@ static const struct SetStruct set_cmd_table[] =
   { "FLOODCOUNT",	quote_floodcount,	0,	1 },
   { "IDENTTIMEOUT",	quote_identtimeout,	0,	1 },
   { "MAX",		quote_max,		0,	1 },
+  { "MSGLOCALE",	quote_msglocale,	1,	0 },
   { "SPAMNUM",		quote_spamnum,		0,	1 },
   { "SPAMTIME",		quote_spamtime,		0,	1 },
   { "SPLITMODE",	quote_splitmode,	1,	0 },
@@ -206,7 +208,7 @@ quote_identtimeout(struct Client *source_p, int newval)
 {
   if (!HasUMode(source_p, UMODE_ADMIN))
   {
-    sendto_one(source_p, ERR_NOPRIVS,
+    sendto_one(source_p, form_str(ERR_NOPRIVS),
                me.name, source_p->name, "set");
     return;
   }
@@ -256,6 +258,22 @@ quote_max(struct Client *source_p, int newval)
                me.name, source_p->name, ServerInfo.max_clients, Count.local);
 }
 
+/* SET MSGLOCALE */
+static void
+quote_msglocale(struct Client *source_p, char *locale)
+{
+  if (locale != NULL)
+  {
+    set_locale(locale);
+    rebuild_isupport_message_line();
+    sendto_one(source_p, ":%s NOTICE %s :Set MSGLOCALE to '%s'",
+               me.name, source_p->name, get_locale());
+  }
+  else
+    sendto_one(source_p, ":%s NOTICE %s :MSGLOCALE is currently '%s'",
+               me.name, source_p->name, get_locale());
+}
+
 /* SET SPAMNUM */
 static void
 quote_spamnum(struct Client *source_p, int newval)
@@ -459,7 +477,7 @@ mo_set(struct Client *client_p, struct Client *source_p,
 
   if (!HasOFlag(source_p, OPER_FLAG_SET))
   {
-    sendto_one(source_p, ERR_NOPRIVS,
+    sendto_one(source_p, form_str(ERR_NOPRIVS),
                me.name, source_p->name, "set");
     return;
   }
@@ -503,7 +521,7 @@ mo_set(struct Client *client_p, struct Client *source_p,
 
         if (!strcmp(tab->name, "AUTOCONN") && (parc < 4))
         {
-          sendto_one(source_p, ERR_NEEDMOREPARAMS,
+          sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                      me.name, source_p->name, "SET");
           return;
         }