kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 6dcab95534dc79dd7fd91d789d14429c883e2d60..fbbeafec014c8ee1224cf46b5cc2127d438b041c 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -14,40 +14,20 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <map>
 #include <sstream>
 #include <vector>
 #include <deque>
+#include "configreader.h"
+#include "hash_map.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
 #include "message.h"
+#include "wildcard.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_notice.h"
+#include "commands/cmd_notice.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
@@ -55,31 +35,32 @@ extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
-void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
        chanrec *chan;
 
        user->idle_lastmsg = TIME;
        
-       if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
-       if (parameters[0][0] == '$')
+       if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
        {
-               // notice to server mask
-               char* servermask = parameters[0];
-               servermask++;
-               if (match(Config->ServerName,servermask))
-               {
-                       NoticeAll(user, true, "%s",parameters[1]);
-               }
-               return;
+               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;
+                parameters[1] = (char*)temp.c_str();
+                // notice to server mask
+                const char* servermask = parameters[0] + 1;
+                if (match(Config->ServerName,servermask))
+                {
+                        NoticeAll(user, true, "%s",parameters[1]);
+                }
+                FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
+                return;
        }
        char status = 0;
        if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
@@ -94,12 +75,12 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
                {
                        if (IS_LOCAL(user))
                        {
-                               if ((chan->binarymodes & CM_NOEXTERNAL) && (!has_channel(user,chan)))
+                               if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
                                {
                                        WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
                                        return;
                                }
-                               if ((chan->binarymodes & CM_MODERATED) && (cstatus(user,chan)<STATUS_VOICE))
+                               if ((chan->modes[CM_MODERATED]) && (cstatus(user,chan)<STATUS_VOICE))
                                {
                                        WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
                                        return;
@@ -115,11 +96,11 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
                        }
                        parameters[1] = (char*)temp.c_str();
 
-                        if (temp == "")
-                        {
-                                WriteServ(user->fd,"412 %s No text to send", user->nick);
-                                return;
-                        }
+                       if (temp == "")
+                       {
+                               WriteServ(user->fd,"412 %s No text to send", user->nick);
+                               return;
+                       }
 
                        ChanExceptSender(chan, user, status, "NOTICE %s :%s", chan->name, parameters[1]);
 
@@ -159,5 +140,3 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
        }
 }
-
-