X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_notice.cpp;h=d5ef7ba1d0f2cf36f97f45c3ff01605dc1e314f8;hb=69cb65b695ca9f29e35f95551d4146265934e003;hp=e10d6286d0ec2aae568aa631501666e0536d832a;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_notice.cpp b/src/commands/cmd_notice.cpp
index e10d6286d..d5ef7ba1d 100644
--- a/src/commands/cmd_notice.cpp
+++ b/src/commands/cmd_notice.cpp
@@ -110,6 +110,15 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 					user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick.c_str(), chan->name.c_str());
 					return CMD_FAILURE;
 				}
+
+				if (ServerInstance->Config->RestrictBannedUsers)
+				{
+					if (chan->IsBanned(user))
+					{
+						user->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", user->nick.c_str(), chan->name.c_str());
+						return CMD_FAILURE;
+					}
+				}
 			}
 			ModResult MOD_RESULT;
 
@@ -180,7 +189,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 	else
 		dest = ServerInstance->FindNick(destnick);
 
-	if (dest)
+	if ((dest) && (dest->registered == REG_ALL))
 	{
 		if (parameters[1].empty())
 		{