Add extra parameter to MySQLresult and SQLresult

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 6a9af4a4046c055d1c6d36cb3a4b562ab9c200ed..b9bd536d06d0726a29c395549397ef94dcf6ace3 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -27,7 +27,7 @@
 #include "commands.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "cmd_notice.h"
+#include "commands/cmd_notice.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
@@ -36,20 +36,19 @@ extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern time_t TIME;
 
-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] == '$') && (*user->oper))
+       if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
        {
                // notice to server mask
-               char* servermask = parameters[0];
-               servermask++;
+               const char* servermask = parameters[0] + 1;
                if (match(Config->ServerName,servermask))
                {
                        NoticeAll(user, true, "%s",parameters[1]);