Remove unneeded "fd" member of issl_session

[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 ee9868fb3f9a13b2ad21d3da60a93727ba8f3afb..3e249b8641692f1ba1d52a366c6a5ce1202579ee 100644 (file)
--- a/src/commands/cmd_notice.cpp
+++ b/src/commands/cmd_notice.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_notice.h"
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
@@ -20,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandNotice(Instance);
 }
 
-CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, User *user)
 {
        User *dest;
        Channel *chan;
@@ -28,30 +27,34 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
        CUList exempt_list;
 
        user->idle_lastmsg = ServerInstance->Time();
-       
-       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+
+       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],TYPE_SERVER,temp,0,exempt_list));
+               FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, exempt_list));
                if (MOD_RESULT)
                        return CMD_FAILURE;
                const char* text = temp.c_str();
-               const char* servermask = parameters[0] + 1;
+               const char* servermask = (parameters[0].c_str()) + 1;
 
-               FOREACH_MOD(I_OnText,OnText(user,(void*)parameters[0],TYPE_SERVER,text,0,exempt_list));
-               if (match(ServerInstance->Config->ServerName,servermask))
+               FOREACH_MOD(I_OnText,OnText(user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, exempt_list));
+               if (InspIRCd::Match(ServerInstance->Config->ServerName,servermask, NULL))
                {
                        user->SendAll("NOTICE", "%s", text);
                }
-               FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,text,0,exempt_list));
+               FOREACH_MOD(I_OnUserNotice,OnUserNotice(user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, exempt_list));
                return CMD_SUCCESS;
        }
        char status = 0;
-       const char* target = parameters[0];
-       if ((*target == '@') || (*target == '%') || (*target == '+'))
+       const char* target = parameters[0].c_str();
+
+       if (ServerInstance->Modes->FindPrefix(*target))
        {
                status = *target;
                target++;
@@ -68,12 +71,12 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
                        {
                                if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
                                {
-                                       user->WriteNumeric(404, "%s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
+                                       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))
                                {
-                                       user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick, chan->name);
+                                       user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick.c_str(), chan->name.c_str());
                                        return CMD_FAILURE;
                                }
                        }
@@ -88,7 +91,7 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 
                        if (temp.empty())
                        {
-                               user->WriteNumeric(412, "%s :No text to send", user->nick);
+                               user->WriteNumeric(412, "%s :No text to send", user->nick.c_str());
                                return CMD_FAILURE;
                        }
 
@@ -98,16 +101,16 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
                        {
                                if (ServerInstance->Config->UndernetMsgPrefix)
                                {
-                                       chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, text);
+                                       chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name.c_str(), status, text);
                                }
                                else
                                {
-                                       chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name, text);
+                                       chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name.c_str(), text);
                                }
                        }
                        else
                        {
-                               chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name, text);
+                               chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name.c_str(), text);
                        }
 
                        FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,text,status,exempt_list));
@@ -115,13 +118,13 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
                else
                {
                        /* no such nick/channel */
-                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, target);
+                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), target);
                        return CMD_FAILURE;
                }
                return CMD_SUCCESS;
        }
-       
-       const char* destnick = parameters[0];
+
+       const char* destnick = parameters[0].c_str();
 
        if (IS_LOCAL(user))
        {
@@ -129,13 +132,14 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 
                if (targetserver)
                {
-                       char nickonly[NICKMAX+1];
-                       strlcpy(nickonly, destnick, targetserver - destnick + 1);
+                       std::string nickonly;
+
+                       nickonly.assign(destnick, 0, targetserver - destnick);
                        dest = ServerInstance->FindNickOnly(nickonly);
                        if (dest && strcasecmp(dest->server, targetserver + 1))
                        {
                                /* Incorrect server for user */
-                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
                                return CMD_FAILURE;
                        }
                }
@@ -147,9 +151,9 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 
        if (dest)
        {
-               if (!*parameters[1])
+               if (parameters[1].empty())
                {
-                       user->WriteNumeric(412, "%s :No text to send", user->nick);
+                       user->WriteNumeric(412, "%s :No text to send", user->nick.c_str());
                        return CMD_FAILURE;
                }
 
@@ -166,7 +170,7 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
                if (IS_LOCAL(dest))
                {
                        // direct write, same server
-                       user->WriteTo(dest, "NOTICE %s :%s", dest->nick, text);
+                       user->WriteTo(dest, "NOTICE %s :%s", dest->nick.c_str(), text);
                }
 
                FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,text,0,exempt_list));
@@ -174,11 +178,10 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
        else
        {
                /* no such nick/channel */
-               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
+               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 
        return CMD_SUCCESS;
 
 }
-