X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_notice.cpp;h=d97743a43622245d0ea3c10d5e77942cd91d07ea;hb=bcf2e57d8125fceb2f573fe77ac122158aa75a13;hp=f43b6cd208793bdb09326abc90396b7cb41057f6;hpb=11554b8626d8b421cc9cf2c6f6cc3fe2467e0441;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index f43b6cd20..d97743a43 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"
 
@@ -48,7 +45,7 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 		{
 			user->SendAll("NOTICE", "%s", parameters[1]);
 		}
-		FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
+		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
 		return CMD_SUCCESS;
 	}
 	char status = 0;
@@ -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;
@@ -89,7 +86,7 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 
 			if (temp.empty())
 			{
-				user->WriteServ("412 %s No text to send", user->nick);
+				user->WriteServ("412 %s :No text to send", user->nick);
 				return CMD_FAILURE;
 			}
 
@@ -123,8 +120,13 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 	dest = ServerInstance->FindNick(parameters[0]);
 	if (dest)
 	{
+		if (!*parameters[1])
+		{
+			user->WriteServ("412 %s :No text to send", user->nick);
+			return CMD_FAILURE;
+		}
+
 		int MOD_RESULT = 0;
-		
 		std::string temp = parameters[1];
 		FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0,exempt_list));
 		if (MOD_RESULT) {