X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_privmsg.cpp;h=35707d5a3b3f7b0848dd459921ecf72c322f20d5;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=a620770972a963dd7dce668c15cb38d68721da7f;hpb=c8240fcba32a3467bebbbcc43084979bdeb6c278;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index a62077097..35707d5a3 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -60,7 +60,7 @@ 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[65536];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -82,26 +82,34 @@ void cmd_privmsg::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][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->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))
+				{
+					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(OnUserPreMessage(user,chan,TYPE_CHANNEL,temp));
+			FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status));
 			if (MOD_RESULT) {
 				return;
 			}
@@ -113,8 +121,8 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 				return;
 			}
 			
-			ChanExceptSender(chan, user, "PRIVMSG %s :%s", chan->name, parameters[1]);
-			FOREACH_MOD OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1]);
+			ChanExceptSender(chan, user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
+			FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status));
 		}
 		else
 		{
@@ -127,7 +135,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 	dest = Find(parameters[0]);
 	if (dest)
 	{
-		if (strcmp(dest->awaymsg,""))
+		if ((IS_LOCAL(user)) && (*dest->awaymsg))
 		{
 			/* auto respond with aweh msg */
 			WriteServ(user->fd,"301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
@@ -136,7 +144,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 		int MOD_RESULT = 0;
 		
 		std::string temp = parameters[1];
-		FOREACH_RESULT(OnUserPreMessage(user,dest,TYPE_USER,temp));
+		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp,0));
 		if (MOD_RESULT) {
 			return;
 		}
@@ -148,7 +156,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 			WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
 		}
 
-		FOREACH_MOD OnUserMessage(user,dest,TYPE_USER,parameters[1]);
+		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0));
 	}
 	else
 	{