X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_privmsg.cpp;h=9255b67e3179507a02424dbf2e452832c682c391;hb=dafc021be4f3ad34ca37953de6a0109a161dd165;hp=85bb4d6d2e07ab758b0084a9538a23d7601439b9;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 85bb4d6d2..9255b67e3 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -14,71 +14,49 @@
  * ---------------------------------------------------
  */
 
-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++;
-		if (match(Config->ServerName,servermask))
+		const char* servermask = parameters[0] + 1;
+		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;
@@ -89,19 +67,19 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 	}
 	if (parameters[0][0] == '#')
 	{
-		chan = FindChan(parameters[0]);
+		chan = ServerInstance->FindChan(parameters[0]);
 		if (chan)
 		{
 			if (IS_LOCAL(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))
+				if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < 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;
 				}
 			}
@@ -116,28 +94,28 @@ void cmd_privmsg::Handle (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;
 	}
 
-	dest = Find(parameters[0]);
+	dest = ServerInstance->FindNick(parameters[0]);
 	if (dest)
 	{
 		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;
@@ -152,7 +130,7 @@ void cmd_privmsg::Handle (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));
@@ -160,8 +138,6 @@ void cmd_privmsg::Handle (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]);
 	}
 }
-
-