X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fprivmsg.cpp;h=2682dd932488116e92c419fc34641061e6fc06f4;hb=eacd707421be4f2612df9bde4517649061bb062e;hp=b73ba15fbf08cb45ffa92ec100bea8d556c2afd8;hpb=f7a28a7800d934b3bcd630a97bb6471eb1007140;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/privmsg.cpp b/src/modules/m_spanningtree/privmsg.cpp
index b73ba15fb..2682dd932 100644
--- a/src/modules/m_spanningtree/privmsg.cpp
+++ b/src/modules/m_spanningtree/privmsg.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -32,29 +32,57 @@ bool TreeSocket::ServerMessage(const std::string &messagetype, const std::string
 		const char* target = params[0].c_str();
 		std::string text = params[1].c_str();
 
-		if ((*target == '@') || (*target == '%') || (*target == '+'))
+		if (ServerInstance->Modes->FindPrefix(*target))
 		{
 			status = *target;
 			target++;
 		}
 
-		Channel* channel = Instance->FindChan(target);
-		
-		if (target)
+		Channel* channel = ServerInstance->FindChan(target);
+
+		if (channel)
 		{
 			if (messagetype == "PRIVMSG")
 			{
-				FOREACH_MOD_I(Instance, I_OnUserMessage, OnUserMessage(NULL, channel, TYPE_SERVER, text, status, except_list));
+				FOREACH_MOD_I(ServerInstance, I_OnUserMessage, OnUserMessage(NULL, channel, TYPE_CHANNEL, text, status, except_list));
 			}
 			else
 			{
-				FOREACH_MOD_I(Instance, I_OnUserNotice, OnUserNotice(NULL, channel, TYPE_SERVER, text, status, except_list));
+				FOREACH_MOD_I(ServerInstance, I_OnUserNotice, OnUserNotice(NULL, channel, TYPE_CHANNEL, text, status, except_list));
+			}
+			TreeServer* s = Utils->FindServer(prefix);
+			if (s)
+			{
+				FOREACH_MOD_I(ServerInstance, I_OnText, OnText(NULL, channel, TYPE_CHANNEL, text, status, except_list));
+				channel->WriteChannelWithServ(s->GetName().c_str(), "%s %s :%s", messagetype.c_str(), channel->name.c_str(), text.c_str());
+			}
+		}
+		else
+		{
+			User* user = ServerInstance->FindNick(target);
+
+			if (user)
+			{
+				if (messagetype == "PRIVMSG")
+				{
+					FOREACH_MOD_I(ServerInstance, I_OnUserMessage, OnUserMessage(NULL, user, TYPE_USER, text, 0, except_list));
+				}
+				else
+				{
+					FOREACH_MOD_I(ServerInstance, I_OnUserNotice, OnUserNotice(NULL, user, TYPE_USER, text, 0, except_list));
+				}
+				TreeServer* s = Utils->FindServer(prefix);
+				if (s)
+				{
+					FOREACH_MOD_I(ServerInstance, I_OnText, OnText(NULL, user, TYPE_USER, text, status, except_list));
+					user->Write(":%s %s %s :%s", s->GetName().c_str(), messagetype.c_str(), user->nick.c_str(), text.c_str());
+				}
+
 			}
-			channel->WriteChannelWithServ(prefix.c_str(), "%s %s :%s", messagetype.c_str(), channel->name, text.c_str());
 		}
 
 		/* Propogate as channel privmsg */
-		return Utils->DoOneToAllButSenderRaw(":" + prefix + " " + messagetype + " " + channel->name + " :" + text, sourceserv, prefix, assign(messagetype), params);
+		return Utils->DoOneToAllButSenderRaw(":" + prefix + " " + messagetype + " " + target + " :" + text, sourceserv, prefix, assign(messagetype), params);
 	}
 	return true;
 }