X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_privmsg.cpp;h=8a2175ecc67e59b68ba9f612fcdce6f9dab2c27b;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=e74495bb667da44a491fc19e22757094d441ec14;hpb=0757a4a495daabf661ac3b7ab79f0a5ee423abe8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index e74495bb6..8a2175ecc 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -26,7 +26,6 @@
 #include "helperfuncs.h"
 #include "commands/cmd_privmsg.h"
 
-extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern ModuleList modules;
@@ -40,16 +39,24 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 
 	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) || (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
 		const char* servermask = parameters[0] + 1;
-		if (match(Config->ServerName,servermask))
+		if (match(ServerInstance->Config->ServerName,servermask))
 		{
-			ServerPrivmsgAll("%s",parameters[1]);
+			ServerInstance->ServerPrivmsgAll("%s",parameters[1]);
 		}
+		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
 		return;
 	}
 	char status = 0;
@@ -67,12 +74,12 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 			{
 				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);
+					user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
 					return;
 				}
 				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);
+					user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
 					return;
 				}
 			}
@@ -87,17 +94,17 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 
 			if (temp == "")
 			{
-				WriteServ(user->fd,"412 %s No text to send", user->nick);
+				user->WriteServ("412 %s No text to send", user->nick);
 				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
 		{
 			/* no such nick/channel */
-			WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 		}
 		return;
 	}
@@ -108,7 +115,7 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 		if ((IS_LOCAL(user)) && (*dest->awaymsg))
 		{
 			/* auto respond with aweh msg */
-			WriteServ(user->fd,"301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
+			user->WriteServ("301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
 		}
 
 		int MOD_RESULT = 0;
@@ -123,7 +130,7 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 		if (dest->fd > -1)
 		{
 			// direct write, same server
-			WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
+			user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
 		}
 
 		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0));
@@ -131,6 +138,6 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 	else
 	{
 		/* no such nick/channel */
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+		user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 	}
 }