Merge pull request #35 from pcarrier/insp20ldap

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

diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
index de2ef5a1b8dd2c77c8dece6d05b4b8f4cc7bc1a0..09eb2caf2fdec4ee60f09bada3e959abf647eb9a 100644 (file)
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -23,7 +23,7 @@ class CommandPrivmsg : public Command
  public:
        /** Constructor for privmsg.
         */
-       CommandPrivmsg ( Module* parent) : Command(parent,"PRIVMSG",0,2) { syntax = "<target>{,<target>} <message>"; }
+       CommandPrivmsg ( Module* parent) : Command(parent,"PRIVMSG",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
@@ -31,6 +31,15 @@ class CommandPrivmsg : public Command
         * @return A value from CmdResult to indicate command success or failure.
         */
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               if (IS_LOCAL(user))
+                       // This is handled by the OnUserMessage hook to split the LoopCall pieces
+                       return ROUTE_LOCALONLY;
+               else
+                       return ROUTE_MESSAGE(parameters[0]);
+       }
 };
 
 CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, User *user)
@@ -51,7 +60,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
 
                ModResult MOD_RESULT;
                std::string temp = parameters[1];
-               FIRST_MOD_RESULT(ServerInstance, OnUserPreMessage, MOD_RESULT, (user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list));
+               FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list));
                if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
 
@@ -108,7 +117,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                        ModResult MOD_RESULT;
 
                        std::string temp = parameters[1];
-                       FIRST_MOD_RESULT(ServerInstance, OnUserPreMessage, MOD_RESULT, (user,chan,TYPE_CHANNEL,temp,status,except_list));
+                       FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user,chan,TYPE_CHANNEL,temp,status,except_list));
                        if (MOD_RESULT == MOD_RES_DENY)
                                return CMD_FAILURE;
 
@@ -162,7 +171,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
 
                        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());
@@ -192,7 +201,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                ModResult MOD_RESULT;
 
                std::string temp = parameters[1];
-               FIRST_MOD_RESULT(ServerInstance, OnUserPreMessage, MOD_RESULT, (user, dest, TYPE_USER, temp, 0, except_list));
+               FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user, dest, TYPE_USER, temp, 0, except_list));
                if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;