Tidy up strlens which are not required

[user/henk/code/inspircd.git] / src / cmd_notice.cpp

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 006036145097c627b1f0294460808847817aa01d..d947c70be49dea3e114b53c56f5630fdfe2837fb 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -14,21 +14,20 @@
  * ---------------------------------------------------
  */
 
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "configreader.h"
-#include "hash_map.h"
 #include "users.h"
 #include "modules.h"
 #include "wildcard.h"
-#include "commands.h"
-
-#include "hashcomp.h"
 #include "commands/cmd_notice.h"
 
-void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_notice(Instance);
+}
+
+CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
        chanrec *chan;
@@ -36,14 +35,14 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        user->idle_lastmsg = ServerInstance->Time();
        
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
-               return;
+               return CMD_SUCCESS;
        if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
        {
                int MOD_RESULT = 0;
                 std::string temp = parameters[1];
                 FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0));
                 if (MOD_RESULT)
-                        return;
+                        return CMD_FAILURE;
                 parameters[1] = (char*)temp.c_str();
                 // notice to server mask
                 const char* servermask = parameters[0] + 1;
@@ -52,7 +51,7 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                         user->NoticeAll("%s",parameters[1]);
                 }
                 FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
-                return;
+                return CMD_SUCCESS;
        }
        char status = 0;
        if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
@@ -70,12 +69,12 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                                if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
                                {
                                        user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
-                                       return;
+                                       return CMD_FAILURE;
                                }
                                if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE))
                                {
                                        user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
-                                       return;
+                                       return CMD_FAILURE;
                                }
                        }
 
@@ -84,17 +83,17 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                        std::string temp = parameters[1];
                        FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status));
                        if (MOD_RESULT) {
-                               return;
+                               return CMD_FAILURE;
                        }
-                       parameters[1] = (char*)temp.c_str();
+                       parameters[1] = temp.c_str();
 
                        if (temp == "")
                        {
                                user->WriteServ("412 %s No text to send", user->nick);
-                               return;
+                               return CMD_FAILURE;
                        }
 
-                       chan->WriteAllExceptSender(user, status, "NOTICE %s :%s", chan->name, parameters[1]);
+                       chan->WriteAllExceptSender(user, false, status, "NOTICE %s :%s", chan->name, parameters[1]);
 
                        FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status));
                }
@@ -102,8 +101,9 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                {
                        /* no such nick/channel */
                        user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       return CMD_FAILURE;
                }
-               return;
+               return CMD_SUCCESS;
        }
        
        dest = ServerInstance->FindNick(parameters[0]);
@@ -114,7 +114,7 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                std::string temp = parameters[1];
                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0));
                if (MOD_RESULT) {
-                       return;
+                       return CMD_FAILURE;
                }
                parameters[1] = (char*)temp.c_str();
 
@@ -130,5 +130,10 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        {
                /* no such nick/channel */
                user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               return CMD_FAILURE;
        }
+
+       return CMD_SUCCESS;
+
 }
+