X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_notice.cpp;h=fe7fea5ca07ac2f1dff2cc71b2441e121a7f8801;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=581e49d1d682fad3a5bed85509ea33b8afb80c36;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 581e49d1d..fe7fea5ca 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -82,26 +82,35 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 		}
 		return;
 	}
-	else if (parameters[0][0] == '#')
+	char status = 0;
+	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
+	{
+		status = *parameters[0];
+		parameters[0]++;
+	}
+	if (*parameters[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->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))
+				{
+					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_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp));
+			FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status));
 			if (MOD_RESULT) {
 				return;
 			}
@@ -113,9 +122,9 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
                                 return;
                         }
 
-			ChanExceptSender(chan, user, "NOTICE %s :%s", chan->name, parameters[1]);
+			ChanExceptSender(chan, user, status, "NOTICE %s :%s", chan->name, parameters[1]);
 
-			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1]));
+			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status));
 		}
 		else
 		{
@@ -131,7 +140,7 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 		int MOD_RESULT = 0;
 		
 		std::string temp = parameters[1];
-		FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp));
+		FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0));
 		if (MOD_RESULT) {
 			return;
 		}
@@ -143,7 +152,7 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 			WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]);
 		}
 
-		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1]));
+		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0));
 	}
 	else
 	{