Update m_cloaking to use free-form keys instead of weakening the hash IV

[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 c94dbc87a4f7737e24006b80bca8af9ca3d60012..ae1f6d83b0bae89bbcb2d92729b3b3c31935170b 100644 (file)
--- a/src/commands/cmd_notice.cpp
+++ b/src/commands/cmd_notice.cpp
@@ -12,15 +12,6 @@
  */
 
 #include "inspircd.h"
-
-#ifndef __CMD_NOTICE_H__
-#define __CMD_NOTICE_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** Handle /NOTICE. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -31,7 +22,7 @@ class CommandNotice : public Command
  public:
        /** Constructor for notice.
         */
-       CommandNotice (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"NOTICE",0,2) { syntax = "<target>{,<target>} <message>"; }
+       CommandNotice ( Module* parent) : Command(parent,"NOTICE",2,2) { syntax = "<target>{,<target>} <message>"; }
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -39,9 +30,16 @@ class CommandNotice : public Command
         * @return A value from CmdResult to indicate command success or failure.
         */
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
-};
 
-#endif
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               if (IS_LOCAL(user))
+                       // This is handled by the OnUserNotice hook to split the LoopCall pieces
+                       return ROUTE_LOCALONLY;
+               else
+                       return ROUTE_MESSAGE(parameters[0]);
+       }
+};
 
 
 CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, User *user)
@@ -62,7 +60,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 
                ModResult MOD_RESULT;
                std::string temp = parameters[1];
-               FIRST_MOD_RESULT(ServerInstance, OnUserPreNotice, MOD_RESULT, (user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, exempt_list));
+               FIRST_MOD_RESULT(OnUserPreNotice, MOD_RESULT, (user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, exempt_list));
                if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
                const char* text = temp.c_str();
@@ -88,7 +86,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
        {
                chan = ServerInstance->FindChan(target);
 
-               exempt_list[user] = user->nick;
+               exempt_list.insert(user);
 
                if (chan)
                {
@@ -99,7 +97,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
                                        user->WriteNumeric(404, "%s %s :Cannot send to channel (no external messages)", user->nick.c_str(), chan->name.c_str());
                                        return CMD_FAILURE;
                                }
-                               if ((chan->IsModeSet('m')) && (chan->GetStatus(user) < STATUS_VOICE))
+                               if ((chan->IsModeSet('m')) && (chan->GetPrefixValue(user) < VOICE_VALUE))
                                {
                                        user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick.c_str(), chan->name.c_str());
                                        return CMD_FAILURE;
@@ -108,7 +106,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
                        ModResult MOD_RESULT;
 
                        std::string temp = parameters[1];
-                       FIRST_MOD_RESULT(ServerInstance, OnUserPreNotice, MOD_RESULT, (user,chan,TYPE_CHANNEL,temp,status, exempt_list));
+                       FIRST_MOD_RESULT(OnUserPreNotice, MOD_RESULT, (user,chan,TYPE_CHANNEL,temp,status, exempt_list));
                        if (MOD_RESULT == MOD_RES_DENY)
                                return CMD_FAILURE;
 
@@ -161,7 +159,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 
                        nickonly.assign(destnick, 0, targetserver - destnick);
                        dest = ServerInstance->FindNickOnly(nickonly);
-                       if (dest && strcasecmp(dest->server, targetserver + 1))
+                       if (dest && strcasecmp(dest->server.c_str(), targetserver + 1))
                        {
                                /* Incorrect server for user */
                                user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
@@ -184,7 +182,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 
                ModResult MOD_RESULT;
                std::string temp = parameters[1];
-               FIRST_MOD_RESULT(ServerInstance, OnUserPreNotice, MOD_RESULT, (user,dest,TYPE_USER,temp,0,exempt_list));
+               FIRST_MOD_RESULT(OnUserPreNotice, MOD_RESULT, (user,dest,TYPE_USER,temp,0,exempt_list));
                if (MOD_RESULT == MOD_RES_DENY) {
                        return CMD_FAILURE;
                }