Move file inclusion logic into calcdep, and complain about ambiguous #include directi...

[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 9cf4800a437200aa4e9f418cdbf9abde0db511f3..13ffd6c752ccf020a4f89b0459526a29ed5559b9 100644 (file)
--- a/src/commands/cmd_notice.cpp
+++ b/src/commands/cmd_notice.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "commands/cmd_notice.h"
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
@@ -28,11 +27,14 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
        CUList exempt_list;
 
        user->idle_lastmsg = ServerInstance->Time();
-       
+
        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);
                }
@@ -121,7 +123,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
                }
                return CMD_SUCCESS;
        }
-       
+
        const char* destnick = parameters[0].c_str();
 
        if (IS_LOCAL(user))
@@ -132,7 +134,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
                {
                        std::string nickonly;
 
-                       nickonly.assign(destnick, 0, targetserver - destnick + 1);
+                       nickonly.assign(destnick, 0, targetserver - destnick);
                        dest = ServerInstance->FindNickOnly(nickonly);
                        if (dest && strcasecmp(dest->server, targetserver + 1))
                        {
@@ -183,4 +185,3 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
        return CMD_SUCCESS;
 
 }
-