(sort of..) Revert commit 7736e920fe6ccaf9ad1984afc70db19efd4fb8cd - remove dupe...

[user/henk/code/inspircd.git] / src / commands / cmd_notice.cpp

diff --git a/src/commands/cmd_notice.cpp b/src/commands/cmd_notice.cpp
index 5086f3f4fb8b866bfe63c8764777506e70ce479c..537f8ac784725b90233051b05d95a971a8a7713f 100644 (file)
--- a/src/commands/cmd_notice.cpp
+++ b/src/commands/cmd_notice.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "commands/cmd_notice.h"
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
@@ -31,8 +30,11 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
        
        if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))
                return CMD_SUCCESS;
-       if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server)))
+       if (parameters[0][0] == '$')
        {
+               if (!user->HasPrivPermission("users/mass-message"))
+                       return CMD_SUCCESS;
+
                int MOD_RESULT = 0;
                std::string temp = parameters[1];
                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, exempt_list));
@@ -42,7 +44,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
                const char* servermask = (parameters[0].c_str()) + 1;
 
                FOREACH_MOD(I_OnText,OnText(user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, exempt_list));
-               if (match(ServerInstance->Config->ServerName,servermask))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName,servermask, NULL))
                {
                        user->SendAll("NOTICE", "%s", text);
                }
@@ -130,8 +132,9 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 
                if (targetserver)
                {
-                       char nickonly[NICKMAX+1];
-                       strlcpy(nickonly, destnick, targetserver - destnick + 1);
+                       std::string nickonly;
+
+                       nickonly.assign(destnick, 0, targetserver - destnick + 1);
                        dest = ServerInstance->FindNickOnly(nickonly);
                        if (dest && strcasecmp(dest->server, targetserver + 1))
                        {