X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_privmsg.cpp;h=96aff839246ae6c00a621ea031e0a6401391fec8;hb=4cc6e5e14fdbde499481dbab5ab2ad1257b8af9c;hp=b1216567006d1330f6a29548d3fbffc88b61e792;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index b12165670..96aff8392 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -12,24 +12,18 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_privmsg.h"
 
-
-
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport  Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_privmsg(Instance);
+	return new CommandPrivmsg(Instance);
 }
 
-CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
 {
-	userrec *dest;
-	chanrec *chan;
-
+	User *dest;
+	Channel *chan;
 	CUList except_list;
 
 	user->idle_lastmsg = ServerInstance->Time();
@@ -37,19 +31,19 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
 		return CMD_SUCCESS;
 
-	if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
+	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] = (char*)temp.c_str();
+		parameters[1] = temp.c_str();
 		// notice to server mask
 		const char* servermask = parameters[0] + 1;
 		if (match(ServerInstance->Config->ServerName,servermask))
 		{
-			ServerInstance->ServerPrivmsgAll("%s",parameters[1]);
+			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;
@@ -64,18 +58,18 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		chan = ServerInstance->FindChan(parameters[0]);
 
-		except_list[user] = user;
+		except_list[user] = user->nick;
 
 		if (chan)
 		{
 			if (IS_LOCAL(user))
 			{
-				if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
+				if ((chan->IsModeSet('n')) && (!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))
+				if ((chan->IsModeSet('m')) && (chan->GetStatus(user) < STATUS_VOICE))
 				{
 					user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
 					return CMD_FAILURE;
@@ -90,15 +84,23 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 			}
 			parameters[1] = temp.c_str();
 
-			if (temp == "")
+			/* Check again, a module may have zapped the input string */
+			if (temp.empty())
 			{
-				user->WriteServ("412 %s No text to send", user->nick);
+				user->WriteServ("412 %s :No text to send", user->nick);
 				return CMD_FAILURE;
 			}
 
 			if (status)
 			{
-				chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, parameters[1]);
+				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 
 			{
@@ -116,10 +118,20 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 		return CMD_SUCCESS;
 	}
 
-	dest = ServerInstance->FindNick(parameters[0]);
+	if (IS_LOCAL(user))
+		dest = ServerInstance->FindNickOnly(parameters[0]);
+	else
+		dest = ServerInstance->FindNick(parameters[0]);
+
 	if (dest)
 	{
-		if ((IS_LOCAL(user)) && (*dest->awaymsg))
+		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);