X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_notice.cpp;h=6a9af4a4046c055d1c6d36cb3a4b562ab9c200ed;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=581e49d1d682fad3a5bed85509ea33b8afb80c36;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 581e49d1d..6a9af4a40 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -14,39 +14,19 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <map>
 #include <sstream>
 #include <vector>
 #include <deque>
+#include "configreader.h"
+#include "hash_map.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
 #include "message.h"
+#include "wildcard.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
 #include "cmd_notice.h"
 
 extern ServerConfig* Config;
@@ -55,12 +35,6 @@ extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -71,7 +45,7 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 	
 	if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0))
 		return;
-	if (parameters[0][0] == '$')
+	if ((parameters[0][0] == '$') && (*user->oper))
 	{
 		// notice to server mask
 		char* servermask = parameters[0];
@@ -82,40 +56,49 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 		}
 		return;
 	}
-	else if (parameters[0][0] == '#')
+	char status = 0;
+	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
+	{
+		status = *parameters[0];
+		parameters[0]++;
+	}
+	if (*parameters[0] == '#')
 	{
 		chan = FindChan(parameters[0]);
 		if (chan)
 		{
-			if ((chan->binarymodes & CM_NOEXTERNAL) && (!has_channel(user,chan)))
-			{
-				WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
-				return;
-			}
-			if ((chan->binarymodes & CM_MODERATED) && (cstatus(user,chan)<STATUS_VOICE))
+			if (IS_LOCAL(user))
 			{
-				WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
-				return;
+				if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
+				{
+					WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
+					return;
+				}
+				if ((chan->modes[CM_MODERATED]) && (cstatus(user,chan)<STATUS_VOICE))
+				{
+					WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
+					return;
+				}
 			}
 
 			int MOD_RESULT = 0;
 
 			std::string temp = parameters[1];
-			FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp));
+			FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status));
 			if (MOD_RESULT) {
 				return;
 			}
 			parameters[1] = (char*)temp.c_str();
 
-                        if (temp == "")
-                        {
-                                WriteServ(user->fd,"412 %s No text to send", user->nick);
-                                return;
-                        }
+			if (temp == "")
+			{
+				WriteServ(user->fd,"412 %s No text to send", user->nick);
+				return;
+			}
 
-			ChanExceptSender(chan, user, "NOTICE %s :%s", chan->name, parameters[1]);
+			ChanExceptSender(chan, user, status, "NOTICE %s :%s", chan->name, parameters[1]);
 
-			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1]));
+			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status));
 		}
 		else
 		{
@@ -131,7 +114,7 @@ void cmd_notice::Handle (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));
+		FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0));
 		if (MOD_RESULT) {
 			return;
 		}
@@ -143,7 +126,7 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 			WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]);
 		}
 
-		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1]));
+		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0));
 	}
 	else
 	{
@@ -151,5 +134,3 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
 	}
 }
-
-