OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7456 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 164 insertions, 1 deletions

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 3fdc12090..f3295df07 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -1 +1,164 @@
-/*       +------------------------------------+
 *       | Inspire Internet Relay Chat Daemon |
 *       +------------------------------------+
 *
 *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
 * See: http://www.inspircd.org/wiki/index.php/Credits
 *
 * This program is free but copyrighted software; see
 *            the file COPYING for details.
 *
 * ---------------------------------------------------
 */

#include "inspircd.h"
#include "configreader.h"
#include "users.h"
#include "modules.h"
#include "wildcard.h"
#include "commands/cmd_privmsg.h"

extern "C" DllExport  command_t* init_command(InspIRCd* Instance)
{
	return new cmd_privmsg(Instance);
}

CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
{
	userrec *dest;
	chanrec *chan;
	CUList except_list;

	user->idle_lastmsg = ServerInstance->Time();
	
	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
		return CMD_SUCCESS;

	if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server)))
	{
		int MOD_RESULT = 0;
		std::string temp = parameters[1];
		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0,except_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("PRIVMSG", "%s", parameters[1]);
		}
		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
		return CMD_SUCCESS;
	}
	char status = 0;
	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
	{
		status = *parameters[0];
		parameters[0]++;
	}
	if (parameters[0][0] == '#')
	{
		chan = ServerInstance->FindChan(parameters[0]);

		except_list[user] = user->nick;

		if (chan)
		{
			if (IS_LOCAL(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 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 CMD_FAILURE;
				}
			}
			int MOD_RESULT = 0;

			std::string temp = parameters[1];
			FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status,except_list));
			if (MOD_RESULT) {
				return CMD_FAILURE;
			}
			parameters[1] = temp.c_str();

			/* Check again, a module may have zapped the input string */
			if (temp.empty())
			{
				user->WriteServ("412 %s :No text to send", user->nick);
				return CMD_FAILURE;
			}

			if (status)
			{
				if (ServerInstance->Config->UndernetMsgPrefix)
				{
					chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, parameters[1]);
				}
				else
				{
					chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name, parameters[1]);
				}
			}
			else 
			{
				chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name, parameters[1]);
			}

			FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status,except_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;
	}

	dest = ServerInstance->FindNick(parameters[0]);
	if (dest)
	{
		if (!*parameters[1])
		{
			user->WriteServ("412 %s :No text to send", user->nick);
			return CMD_FAILURE;
		}

		if (IS_AWAY(dest))
		{
			/* auto respond with aweh msg */
			user->WriteServ("301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
		}

		int MOD_RESULT = 0;
		
		std::string temp = parameters[1];
		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp,0,except_list));
		if (MOD_RESULT) {
			return CMD_FAILURE;
		}
		parameters[1] = (char*)temp.c_str();

		if (IS_LOCAL(dest))
		{
			// direct write, same server
			user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
		}

		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0,except_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;
}

\ No newline at end of file
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "configreader.h"
+#include "users.h"
+#include "modules.h"
+#include "wildcard.h"
+#include "commands/cmd_privmsg.h"
+
+extern "C" DllExport  command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_privmsg(Instance);
+}
+
+CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
+{
+	userrec *dest;
+	chanrec *chan;
+	CUList except_list;
+
+	user->idle_lastmsg = ServerInstance->Time();
+	
+	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+		return CMD_SUCCESS;
+
+	if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server)))
+	{
+		int MOD_RESULT = 0;
+		std::string temp = parameters[1];
+		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0,except_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("PRIVMSG", "%s", parameters[1]);
+		}
+		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
+		return CMD_SUCCESS;
+	}
+	char status = 0;
+	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
+	{
+		status = *parameters[0];
+		parameters[0]++;
+	}
+	if (parameters[0][0] == '#')
+	{
+		chan = ServerInstance->FindChan(parameters[0]);
+
+		except_list[user] = user->nick;
+
+		if (chan)
+		{
+			if (IS_LOCAL(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 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 CMD_FAILURE;
+				}
+			}
+			int MOD_RESULT = 0;
+
+			std::string temp = parameters[1];
+			FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status,except_list));
+			if (MOD_RESULT) {
+				return CMD_FAILURE;
+			}
+			parameters[1] = temp.c_str();
+
+			/* Check again, a module may have zapped the input string */
+			if (temp.empty())
+			{
+				user->WriteServ("412 %s :No text to send", user->nick);
+				return CMD_FAILURE;
+			}
+
+			if (status)
+			{
+				if (ServerInstance->Config->UndernetMsgPrefix)
+				{
+					chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, parameters[1]);
+				}
+				else
+				{
+					chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name, parameters[1]);
+				}
+			}
+			else 
+			{
+				chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name, parameters[1]);
+			}
+
+			FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status,except_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;
+	}
+
+	dest = ServerInstance->FindNick(parameters[0]);
+	if (dest)
+	{
+		if (!*parameters[1])
+		{
+			user->WriteServ("412 %s :No text to send", user->nick);
+			return CMD_FAILURE;
+		}
+
+		if (IS_AWAY(dest))
+		{
+			/* auto respond with aweh msg */
+			user->WriteServ("301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
+		}
+
+		int MOD_RESULT = 0;
+		
+		std::string temp = parameters[1];
+		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp,0,except_list));
+		if (MOD_RESULT) {
+			return CMD_FAILURE;
+		}
+		parameters[1] = (char*)temp.c_str();
+
+		if (IS_LOCAL(dest))
+		{
+			// direct write, same server
+			user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
+		}
+
+		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0,except_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;
+}
+