X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_notice.cpp;h=df0e518b05aa218b157342800fa0fda40bf81fa4;hb=6bc3d71946b339a5a10ca621b029fe8a5b180d68;hp=7cd53aa3db3e5cd6a9f00a59b0a7af9fccfdd420;hpb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 7cd53aa3d..df0e518b0 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -27,22 +24,24 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 	return new cmd_notice(Instance);
 }
 
-void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	userrec *dest;
 	chanrec *chan;
 
+	CUList exempt_list;
+
 	user->idle_lastmsg = ServerInstance->Time();
 	
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
-		return;
+		return CMD_SUCCESS;
 	if ((parameters[0][0] == '$') && ((*user->oper) || (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));
+                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list));
                 if (MOD_RESULT)
-                        return;
+                        return CMD_FAILURE;
                 parameters[1] = (char*)temp.c_str();
                 // notice to server mask
                 const char* servermask = parameters[0] + 1;
@@ -50,8 +49,8 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                 {
                         user->NoticeAll("%s",parameters[1]);
                 }
-                FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
-                return;
+                FOREACH_MOD(I_OnUserMessage,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,6 +61,9 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 	if (*parameters[0] == '#')
 	{
 		chan = ServerInstance->FindChan(parameters[0]);
+
+		exempt_list[user] = user;
+
 		if (chan)
 		{
 			if (IS_LOCAL(user))
@@ -69,40 +71,54 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 				if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
 				{
 					user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
-					return;
+					return CMD_FAILURE;
 				}
 				if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE))
 				{
 					user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
-					return;
+					return CMD_FAILURE;
 				}
 			}
-
 			int MOD_RESULT = 0;
 
 			std::string temp = parameters[1];
-			FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status));
+			FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status, exempt_list));
 			if (MOD_RESULT) {
-				return;
+				return CMD_FAILURE;
 			}
-			parameters[1] = (char*)temp.c_str();
+			parameters[1] = temp.c_str();
 
 			if (temp == "")
 			{
 				user->WriteServ("412 %s No text to send", user->nick);
-				return;
+				return CMD_FAILURE;
 			}
 
-			chan->WriteAllExceptSender(user, status, "NOTICE %s :%s", chan->name, parameters[1]);
+			if (status)
+			{
+				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
+			{
+				chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name, parameters[1]);
+			}
 
-			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status));
+			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status,exempt_list));
 		}
 		else
 		{
 			/* no such nick/channel */
 			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+			return CMD_FAILURE;
 		}
-		return;
+		return CMD_SUCCESS;
 	}
 	
 	dest = ServerInstance->FindNick(parameters[0]);
@@ -111,9 +127,9 @@ void cmd_notice::Handle (const 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,0));
+		FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0,exempt_list));
 		if (MOD_RESULT) {
-			return;
+			return CMD_FAILURE;
 		}
 		parameters[1] = (char*)temp.c_str();
 
@@ -123,11 +139,16 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 			user->WriteTo(dest, "NOTICE %s :%s", dest->nick, parameters[1]);
 		}
 
-		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0));
+		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0,exempt_list));
 	}
 	else
 	{
 		/* no such nick/channel */
 		user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+		return CMD_FAILURE;
 	}
+
+	return CMD_SUCCESS;
+
 }
+