X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_notice.cpp;h=5086f3f4fb8b866bfe63c8764777506e70ce479c;hb=cf83031f7bf1c037bf726df84f93686b9631531b;hp=ee9868fb3f9a13b2ad21d3da60a93727ba8f3afb;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_notice.cpp b/src/commands/cmd_notice.cpp
index ee9868fb3..5086f3f4f 100644
--- a/src/commands/cmd_notice.cpp
+++ b/src/commands/cmd_notice.cpp
@@ -20,7 +20,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandNotice(Instance);
 }
 
-CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	User *dest;
 	Channel *chan;
@@ -29,29 +29,30 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 
 	user->idle_lastmsg = ServerInstance->Time();
 	
-	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+	if (ServerInstance->Parser->LoopCall(user, this, parameters, 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_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list));
+		FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, exempt_list));
 		if (MOD_RESULT)
 			return CMD_FAILURE;
 		const char* text = temp.c_str();
-		const char* servermask = parameters[0] + 1;
+		const char* servermask = (parameters[0].c_str()) + 1;
 
-		FOREACH_MOD(I_OnText,OnText(user,(void*)parameters[0],TYPE_SERVER,text,0,exempt_list));
+		FOREACH_MOD(I_OnText,OnText(user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, exempt_list));
 		if (match(ServerInstance->Config->ServerName,servermask))
 		{
 			user->SendAll("NOTICE", "%s", text);
 		}
-		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,text,0,exempt_list));
+		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, exempt_list));
 		return CMD_SUCCESS;
 	}
 	char status = 0;
-	const char* target = parameters[0];
-	if ((*target == '@') || (*target == '%') || (*target == '+'))
+	const char* target = parameters[0].c_str();
+
+	if (ServerInstance->Modes->FindPrefix(*target))
 	{
 		status = *target;
 		target++;
@@ -68,12 +69,12 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 			{
 				if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
 				{
-					user->WriteNumeric(404, "%s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
+					user->WriteNumeric(404, "%s %s :Cannot send to channel (no external messages)", user->nick.c_str(), chan->name.c_str());
 					return CMD_FAILURE;
 				}
 				if ((chan->IsModeSet('m')) && (chan->GetStatus(user) < STATUS_VOICE))
 				{
-					user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick, chan->name);
+					user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick.c_str(), chan->name.c_str());
 					return CMD_FAILURE;
 				}
 			}
@@ -88,7 +89,7 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 
 			if (temp.empty())
 			{
-				user->WriteNumeric(412, "%s :No text to send", user->nick);
+				user->WriteNumeric(412, "%s :No text to send", user->nick.c_str());
 				return CMD_FAILURE;
 			}
 
@@ -98,16 +99,16 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 			{
 				if (ServerInstance->Config->UndernetMsgPrefix)
 				{
-					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, text);
+					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name.c_str(), status, text);
 				}
 				else
 				{
-					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name, text);
+					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name.c_str(), text);
 				}
 			}
 			else
 			{
-				chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name, text);
+				chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name.c_str(), text);
 			}
 
 			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,text,status,exempt_list));
@@ -115,13 +116,13 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 		else
 		{
 			/* no such nick/channel */
-			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, target);
+			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), target);
 			return CMD_FAILURE;
 		}
 		return CMD_SUCCESS;
 	}
 	
-	const char* destnick = parameters[0];
+	const char* destnick = parameters[0].c_str();
 
 	if (IS_LOCAL(user))
 	{
@@ -135,7 +136,7 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 			if (dest && strcasecmp(dest->server, targetserver + 1))
 			{
 				/* Incorrect server for user */
-				user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
+				user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
 				return CMD_FAILURE;
 			}
 		}
@@ -147,9 +148,9 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 
 	if (dest)
 	{
-		if (!*parameters[1])
+		if (parameters[1].empty())
 		{
-			user->WriteNumeric(412, "%s :No text to send", user->nick);
+			user->WriteNumeric(412, "%s :No text to send", user->nick.c_str());
 			return CMD_FAILURE;
 		}
 
@@ -166,7 +167,7 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 		if (IS_LOCAL(dest))
 		{
 			// direct write, same server
-			user->WriteTo(dest, "NOTICE %s :%s", dest->nick, text);
+			user->WriteTo(dest, "NOTICE %s :%s", dest->nick.c_str(), text);
 		}
 
 		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,text,0,exempt_list));
@@ -174,7 +175,7 @@ CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *
 	else
 	{
 		/* no such nick/channel */
-		user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
+		user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
 		return CMD_FAILURE;
 	}