X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_notice.cpp;h=cf4d7b44acaf64322620d3d46abb79a6a8de10fd;hb=4487dde76ffbdb21e7dc319b3b87d09c3cf60d8c;hp=69ca449180c394cd94cb5cb049118ba0a53c0857;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 69ca44918..cf4d7b44a 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -11,23 +11,19 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "wildcard.h"
 #include "commands/cmd_notice.h"
 
-
-
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_notice(Instance);
 }
 
-CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_notice::Handle (const char** parameters, int pcnt, User *user)
 {
-	userrec *dest;
-	chanrec *chan;
+	User *dest;
+	Channel *chan;
 
 	CUList exempt_list;
 
@@ -35,22 +31,22 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 	
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
 		return CMD_SUCCESS;
-	if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
+	if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server)))
 	{
 		int MOD_RESULT = 0;
-                std::string temp = parameters[1];
-                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list));
-                if (MOD_RESULT)
-                        return CMD_FAILURE;
-                parameters[1] = (char*)temp.c_str();
-                // notice to server mask
-                const char* servermask = parameters[0] + 1;
-                if (match(ServerInstance->Config->ServerName,servermask))
-                {
-                        user->NoticeAll("%s",parameters[1]);
-                }
-                FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
-                return CMD_SUCCESS;
+		std::string temp = parameters[1];
+		FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list));
+		if (MOD_RESULT)
+			return CMD_FAILURE;
+		parameters[1] = temp.c_str();
+		// notice to server mask
+		const char* servermask = parameters[0] + 1;
+		if (match(ServerInstance->Config->ServerName,servermask))
+		{
+			user->SendAll("NOTICE", "%s", parameters[1]);
+		}
+		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
+		return CMD_SUCCESS;
 	}
 	char status = 0;
 	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
@@ -62,24 +58,23 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		chan = ServerInstance->FindChan(parameters[0]);
 
-		exempt_list[user] = user;
+		exempt_list[user] = user->nick;
 
 		if (chan)
 		{
 			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;
 				}
 			}
-
 			int MOD_RESULT = 0;
 
 			std::string temp = parameters[1];
@@ -89,15 +84,22 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 			}
 			parameters[1] = temp.c_str();
 
-			if (temp == "")
+			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;
 			}
 
 			if (status)
 			{
-				chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, parameters[1]);
+				if (ServerInstance->Config->UndernetMsgPrefix)
+				{
+					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, parameters[1]);
+				}
+				else
+				{
+					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name, parameters[1]);
+				}
 			}
 			else
 			{
@@ -115,11 +117,20 @@ 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])
+		{
+			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) {