X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcmd_notice.cpp;h=2099724006ebeb6ba9f275387ee453e54a232c24;hb=6050df73f498d05597fb37c6157868df1f6f4db2;hp=1adb43923004829673ea243f73ed19f6cc434ea6;hpb=ced58c3be3f1da8dcf70c3904e5fe4bdaabf0e3d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 1adb43923..209972400 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -14,72 +14,45 @@
  * ---------------------------------------------------
  */
 
-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 "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;
-extern InspIRCd* ServerInstance;
-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 std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+#include "hashcomp.h"
+#include "commands/cmd_notice.h"
 
-void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	userrec *dest;
 	chanrec *chan;
 
-	user->idle_lastmsg = TIME;
+	user->idle_lastmsg = ServerInstance->Time();
 	
-	if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0))
+	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
 		return;
-	if (parameters[0][0] == '$')
+	if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
 	{
-		// notice to server mask
-		char* servermask = parameters[0];
-		servermask++;
-		if (match(Config->ServerName,servermask))
-		{
-			NoticeAll(user, true, "%s",parameters[1]);
-		}
-		return;
+		int MOD_RESULT = 0;
+                std::string temp = parameters[1];
+                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0));
+                if (MOD_RESULT)
+                        return;
+                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));
+                return;
 	}
 	char status = 0;
 	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
@@ -89,19 +62,19 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 	}
 	if (*parameters[0] == '#')
 	{
-		chan = FindChan(parameters[0]);
+		chan = ServerInstance->FindChan(parameters[0]);
 		if (chan)
 		{
 			if (IS_LOCAL(user))
 			{
 				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);
+					user->WriteServ("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))
+				if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE))
 				{
-					WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
+					user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
 					return;
 				}
 			}
@@ -115,25 +88,25 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 			}
 			parameters[1] = (char*)temp.c_str();
 
-                        if (temp == "")
-                        {
-                                WriteServ(user->fd,"412 %s No text to send", user->nick);
-                                return;
-                        }
+			if (temp == "")
+			{
+				user->WriteServ("412 %s No text to send", user->nick);
+				return;
+			}
 
-			ChanExceptSender(chan, user, status, "NOTICE %s :%s", chan->name, parameters[1]);
+			chan->WriteAllExceptSender(user, status, "NOTICE %s :%s", chan->name, parameters[1]);
 
 			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status));
 		}
 		else
 		{
 			/* no such nick/channel */
-			WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 		}
 		return;
 	}
 	
-	dest = Find(parameters[0]);
+	dest = ServerInstance->FindNick(parameters[0]);
 	if (dest)
 	{
 		int MOD_RESULT = 0;
@@ -148,7 +121,7 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 		if (dest->fd > -1)
 		{
 			// direct write, same server
-			WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]);
+			user->WriteTo(dest, "NOTICE %s :%s", dest->nick, parameters[1]);
 		}
 
 		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0));
@@ -156,8 +129,6 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
 	else
 	{
 		/* no such nick/channel */
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+		user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 	}
 }
-
-