Add s2s backward compatability for protocol changes

[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 135ab809e81718667bee64a7810758a654a3895d..c6e74db8b134ab32053baca2cedddd016d75f10d 100644 (file)
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.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.
@@ -26,16 +26,19 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        CUList except_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] == '$')
        {
-               int MOD_RESULT = 0;
+               if (!user->HasPrivPermission("users/mass-message"))
+                       return CMD_SUCCESS;
+
+               ModResult MOD_RESULT;
                std::string temp = parameters[1];
-               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list));
-               if (MOD_RESULT)
+               FIRST_MOD_RESULT(ServerInstance, OnUserPreMessage, MOD_RESULT, (user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list));
+               if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
 
                const char* text = temp.c_str();
@@ -65,26 +68,36 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
 
                if (chan)
                {
-                       if (IS_LOCAL(user))
+                       if (IS_LOCAL(user) && chan->GetStatus(user) < STATUS_VOICE)
                        {
-                               if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
+                               if (chan->IsModeSet('n') && !chan->HasUser(user))
                                {
                                        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'))
                                {
                                        user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick.c_str(), chan->name.c_str());
                                        return CMD_FAILURE;
                                }
+
+                               if (ServerInstance->Config->RestrictBannedUsers)
+                               {
+                                       if (chan->IsBanned(user))
+                                       {
+                                               user->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", user->nick.c_str(), chan->name.c_str());
+                                               return CMD_FAILURE;
+                                       }
+                               }
                        }
-                       int MOD_RESULT = 0;
+                       ModResult MOD_RESULT;
 
                        std::string temp = parameters[1];
-                       FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status,except_list));
-                       if (MOD_RESULT) {
+                       FIRST_MOD_RESULT(ServerInstance, OnUserPreMessage, MOD_RESULT, (user,chan,TYPE_CHANNEL,temp,status,except_list));
+                       if (MOD_RESULT == MOD_RES_DENY)
                                return CMD_FAILURE;
-                       }
+
                        const char* text = temp.c_str();
 
                        /* Check again, a module may have zapped the input string */
@@ -107,7 +120,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                                        chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name.c_str(), text);
                                }
                        }
-                       else 
+                       else
                        {
                                chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name.c_str(), text);
                        }
@@ -128,12 +141,12 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        if (IS_LOCAL(user))
        {
                const char* targetserver = strchr(destnick, '@');
-       
+
                if (targetserver)
                {
                        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))
                        {
@@ -162,13 +175,13 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                        user->WriteNumeric(301, "%s %s :%s", user->nick.c_str(), dest->nick.c_str(), dest->awaymsg.c_str());
                }
 
-               int MOD_RESULT = 0;
-               
+               ModResult MOD_RESULT;
+
                std::string temp = parameters[1];
-               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user, dest, TYPE_USER, temp, 0, except_list));
-               if (MOD_RESULT) {
+               FIRST_MOD_RESULT(ServerInstance, OnUserPreMessage, MOD_RESULT, (user, dest, TYPE_USER, temp, 0, except_list));
+               if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
-               }
+
                const char* text = temp.c_str();
 
                FOREACH_MOD(I_OnText,OnText(user, dest, TYPE_USER, text, 0, except_list));
@@ -189,4 +202,3 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        }
        return CMD_SUCCESS;
 }
-