X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_notice.cpp;h=f6634184638d3c9c596254c33ddec2e1946c9d10;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=a797fefabc509c1cdcf136666dc377416ae434e7;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index a797fefab..f66341846 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_notice.h"
 
@@ -67,12 +64,12 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 		{
 			if (IS_LOCAL(user))
 			{
-				if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
+				if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
 				{
 					user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
 					return CMD_FAILURE;
 				}
-				if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE))
+				if ((chan->IsModeSet('m')) && (chan->GetStatus(user) < STATUS_VOICE))
 				{
 					user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
 					return CMD_FAILURE;
@@ -120,7 +117,11 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 		return CMD_SUCCESS;
 	}
 	
-	dest = ServerInstance->FindNick(parameters[0]);
+	if (IS_LOCAL(user))
+		dest = ServerInstance->FindNickOnly(parameters[0]);
+	else
+		dest = ServerInstance->FindNick(parameters[0]);
+
 	if (dest)
 	{
 		if (!*parameters[1])