Fix for bug found by danieldg, where remote nicks were truncated to NICKMAX, but...

[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 842635ae27bbfe8cad5aed1a97b2ed8c0c7718ab..13c81a5a1a3ed4ccb9d0f300cecad0ad8d63a744 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-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "commands/cmd_privmsg.h"
 
 extern "C" DllExport  Command* init_command(InspIRCd* Instance)
@@ -31,8 +30,11 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        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_OnUserPreMessage,OnUserPreMessage(user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list));
@@ -43,7 +45,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                const char* servermask = (parameters[0].c_str()) + 1;
 
                FOREACH_MOD(I_OnText,OnText(user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, except_list));
-               if (match(ServerInstance->Config->ServerName,servermask))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, servermask, NULL))
                {
                        user->SendAll("PRIVMSG", "%s", text);
                }
@@ -66,18 +68,28 @@ 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;
 
@@ -132,8 +144,9 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        
                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))
                        {