X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=1a2fd3a84eda764cfdfd8b12ea1bb9d760588176;hb=a98d2f5086f3ac27f5d311cb0ac5307dce85ed4f;hp=7d8247530592c8f8cc32351479efe8e9a83e33d7;hpb=6c7a3ceb6c674a9af09da955ee0238e9291cf29a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 7d8247530..1a2fd3a84 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -158,7 +158,7 @@ class CommandAccept : public Command
 	 */
 	typedef std::pair<User*, bool> ACCEPTAction;
 
-	ACCEPTAction GetTargetAndAction(std::string& tok)
+	static ACCEPTAction GetTargetAndAction(std::string& tok)
 	{
 		bool remove = (tok[0] == '-');
 		if ((remove) || (tok[0] == '+'))
@@ -402,8 +402,8 @@ public:
 			if (now > (dat->lastnotify + (time_t)notify_cooldown))
 			{
 				user->WriteNumeric(RPL_TARGNOTIFY, "%s :has been informed that you messaged them.", dest->nick.c_str());
-				dest->WriteNumeric(RPL_UMODEGMSG, "%s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
-						user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str());
+				dest->SendText(":%s %03d %s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
+						ServerInstance->Config->ServerName.c_str(), RPL_UMODEGMSG, dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str());
 				dat->lastnotify = now;
 			}
 			return MOD_RES_DENY;