WriteChannel* functions and ChanExceptSender* functions are now methods of chanrec...

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

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 85bb4d6d2e07ab758b0084a9538a23d7601439b9..07b39e96a97ca229dcf6ba50c1471b665387fb2a 100644 (file)
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -14,71 +14,50 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include <string>
 #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 "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_privmsg.h"
+#include "commands/cmd_privmsg.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern ModuleList modules;
+extern FactoryList 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_privmsg::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_privmsg::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] == '$') && (*user->oper))
+
+       if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
        {
+               int MOD_RESULT = 0;
+               std::string temp = parameters[1];
+               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0));
+               if (MOD_RESULT)
+                       return;
+               parameters[1] = (char*)temp.c_str();
                // notice to server mask
-               char* servermask = parameters[0];
-               servermask++;
+               const char* servermask = parameters[0] + 1;
                if (match(Config->ServerName,servermask))
                {
                        ServerPrivmsgAll("%s",parameters[1]);
                }
+               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
                return;
        }
        char status = 0;
@@ -120,7 +99,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
                                return;
                        }
                        
-                       ChanExceptSender(chan, user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
+                       chan->WriteAllExceptSender(user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
                        FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status));
                }
                else
@@ -163,5 +142,3 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
        }
 }
-
-