X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_privmsg.cpp;h=81e5ee016c93ac220091aba33b3b2c45c6726876;hb=db07867e945deb72ce103f796e20104a27c5f68a;hp=ae17a226955623377f2b66b01da8c136b3a1901e;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index ae17a2269..81e5ee016 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -14,53 +14,24 @@
  * ---------------------------------------------------
  */
 
-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 whowas_hash whowas;
-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)
 {
@@ -71,37 +42,45 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 	
 	if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,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))
-                {
+		{
 			ServerPrivmsgAll("%s",parameters[1]);
-                }
+		}
 		return;
-        }
-        else if (parameters[0][0] == '#')
+	}
+	char status = 0;
+	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
+	{
+		status = *parameters[0];
+		parameters[0]++;
+	}
+	if (parameters[0][0] == '#')
 	{
 		chan = FindChan(parameters[0]);
 		if (chan)
 		{
-			if ((chan->binarymodes & CM_NOEXTERNAL) && (!has_channel(user,chan)))
-			{
-				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 (IS_LOCAL(user))
 			{
-				WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
-				return;
+				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->modes[CM_MODERATED]) && (cstatus(user,chan)<STATUS_VOICE))
+				{
+					WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
+					return;
+				}
 			}
-			
 			int MOD_RESULT = 0;
 
 			std::string temp = parameters[1];
-			FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp));
+			FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status));
 			if (MOD_RESULT) {
 				return;
 			}
@@ -113,8 +92,8 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 				return;
 			}
 			
-			ChanExceptSender(chan, user, "PRIVMSG %s :%s", chan->name, parameters[1]);
-			FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1]));
+			ChanExceptSender(chan, user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
+			FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status));
 		}
 		else
 		{
@@ -127,7 +106,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 	dest = Find(parameters[0]);
 	if (dest)
 	{
-		if (*dest->awaymsg)
+		if ((IS_LOCAL(user)) && (*dest->awaymsg))
 		{
 			/* auto respond with aweh msg */
 			WriteServ(user->fd,"301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
@@ -136,7 +115,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 		int MOD_RESULT = 0;
 		
 		std::string temp = parameters[1];
-		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp));
+		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp,0));
 		if (MOD_RESULT) {
 			return;
 		}
@@ -148,7 +127,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 			WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
 		}
 
-		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1]));
+		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0));
 	}
 	else
 	{
@@ -156,5 +135,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]);
 	}
 }
-
-