X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=ed4b4b6b618e36f90b6f6d0bfb523724fc53b9b8;hb=cf83031f7bf1c037bf726df84f93686b9631531b;hp=8712e63b532d2a4d01d8b33452f2dd281723c6b9;hpb=787c16487e8b13ba973501d88fe381d1528e68de;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index 8712e63b5..ed4b4b6b6 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -251,7 +251,7 @@ User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int)
 	d = ServerInstance->FindNick(dest);
 	if (!d)
 	{
-		user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, dest);
+		user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), dest);
 		return NULL;
 	}
 	return d;
@@ -282,7 +282,7 @@ const char* ModeParser::Grant(User *d,Channel *chan,int MASK)
 				n->first->AddVoicedUser(d);
 			break;
 		}
-		return d->nick;
+		return d->nick.c_str();
 	}
 	return "";
 }
@@ -312,7 +312,7 @@ const char* ModeParser::Revoke(User *d,Channel *chan,int MASK)
 				n->first->DelVoicedUser(d);
 			break;
 		}
-		return d->nick;
+		return d->nick.c_str();
 	}
 	return "";
 }
@@ -322,39 +322,39 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
 	if (targetchannel)
 	{
 		/* Display channel's current mode string */
-		user->WriteNumeric(324, "%s %s +%s",user->nick, targetchannel->name, targetchannel->ChanModes(targetchannel->HasUser(user)));
-		user->WriteNumeric(329, "%s %s %lu", user->nick, targetchannel->name, (unsigned long)targetchannel->age);
+		user->WriteNumeric(324, "%s %s +%s",user->nick.c_str(), targetchannel->name.c_str(), targetchannel->ChanModes(targetchannel->HasUser(user)));
+		user->WriteNumeric(329, "%s %s %lu", user->nick.c_str(), targetchannel->name.c_str(), (unsigned long)targetchannel->age);
 		return;
 	}
 	else if (targetuser)
 	{
 		if (targetuser->Visibility && !targetuser->Visibility->VisibleTo(user))
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, text);
+			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), text);
 			return;
 		}
 
 		if ((targetuser == user) || (IS_OPER(user)))
 		{
 			/* Display user's current mode string */
-			user->WriteNumeric(221, "%s :+%s",targetuser->nick,targetuser->FormatModes());
+			user->WriteNumeric(221, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
 			if (IS_OPER(targetuser))
-				user->WriteNumeric(8, "%s +%s :Server notice mask", targetuser->nick, targetuser->FormatNoticeMasks());
+				user->WriteNumeric(8, "%s +%s :Server notice mask", targetuser->nick.c_str(), targetuser->FormatNoticeMasks());
 			return;
 		}
 		else
 		{
-			user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick);
+			user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick.c_str());
 			return;
 		}
 	}
 
 	/* No such nick/channel */
-	user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, text);
+	user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), text);
 	return;
 }
 
-void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bool servermode)
+void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool servermode)
 {
 	std::string target = parameters[0];
 	ModeType type = MODETYPE_USER;
@@ -367,9 +367,9 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 	/* Special case for displaying the list for listmodes,
 	 * e.g. MODE #chan b, or MODE #chan +b without a parameter
 	 */
-	if ((targetchannel) && (pcnt == 2))
+	if ((targetchannel) && (parameters.size() == 2))
 	{
-		const char* mode = parameters[1];
+		const char* mode = parameters[1].c_str();
 		int nonlistmodes_found = 0;
 
 		seq++;
@@ -414,7 +414,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 
 				if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
 				{
-					user->WriteNumeric(482, "%s %s :Only half-operators and above may view the +%c list",user->nick, targetchannel->name, *mode++);
+					user->WriteNumeric(482, "%s %s :Only half-operators and above may view the +%c list",user->nick.c_str(), targetchannel->name.c_str(), *mode++);
 					mh->DisplayEmptyList(user, targetchannel);
 					continue;
 				}
@@ -445,11 +445,11 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 			return;
 	}
 
-	if (pcnt == 1)
+	if (parameters.size() == 1)
 	{
-		this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]);
+		this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0].c_str());
 	}
-	else if (pcnt > 1)
+	else if (parameters.size() > 1)
 	{
 		bool SkipAccessChecks = false;
 
@@ -478,14 +478,14 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 			mask = MASK_USER;
 			if ((user != targetuser) && (!ServerInstance->ULine(user->server)))
 			{
-				user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick);
+				user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick.c_str());
 				return;
 			}
 		}
 		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;
 		}
 
@@ -495,8 +495,8 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 		std::string output_sequence;
 		bool adding = true, state_change = false;
 		unsigned char handler_id = 0;
-		int parameter_counter = 2; /* Index of first parameter */
-		int parameter_count = 0;
+		unsigned int parameter_counter = 2; /* Index of first parameter */
+		unsigned int parameter_count = 0;
 		bool last_successful_state_change = false;
 
 		/* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */
@@ -559,7 +559,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 							if (modehandlers[handler_id]->GetNumParams(adding))
 							{
 								/* This mode expects a parameter, do we have any parameters left in our list to use? */
-								if (parameter_counter < pcnt)
+								if (parameter_counter < parameters.size())
 								{
 									parameter = parameters[parameter_counter++];
 
@@ -612,7 +612,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 									{
 										/* Bog off */
 										user->WriteNumeric(482, "%s %s :You must have channel privilege %c or above to %sset channel mode %c",
-												user->nick, targetchannel->name, needed, adding ? "" : "un", modechar);
+												user->nick.c_str(), targetchannel->name.c_str(), needed, adding ? "" : "un", modechar);
 										continue;
 									}
 								}
@@ -646,15 +646,15 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 								if (IS_OPER(user))
 								{
 									user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c",
-											user->nick,
-											user->oper,
+											user->nick.c_str(),
+											user->oper.c_str(),
 											type == MODETYPE_CHANNEL ? "channel" : "user",
 											modehandlers[handler_id]->GetModeChar());
 								}
 								else
 								{
 									user->WriteNumeric(481, "%s :Permission Denied - Only operators may set %s mode %c",
-											user->nick,
+											user->nick.c_str(),
 											type == MODETYPE_CHANNEL ? "channel" : "user",
 											modehandlers[handler_id]->GetModeChar());
 								}
@@ -723,7 +723,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 					else
 					{
 						/* No mode handler? Unknown mode character then. */
-						user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick, modechar);
+						user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick.c_str(), modechar);
 					}
 				break;
 			}
@@ -736,12 +736,12 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 			{
 				if (type == MODETYPE_CHANNEL)
 				{
-					targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str());
+					targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
 					this->LastParse = targetchannel->name;
 				}
 				else
 				{
-					targetuser->WriteServ("MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
+					targetuser->WriteServ("MODE %s %s%s",targetuser->nick.c_str(),output_sequence.c_str(), parameter_list.str().c_str());
 					this->LastParse = targetuser->nick;
 				}
 			}
@@ -749,13 +749,13 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 			{
 				if (type == MODETYPE_CHANNEL)
 				{
-					targetchannel->WriteChannel(user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+					targetchannel->WriteChannel(user, "MODE %s %s%s", targetchannel->name.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
 					FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str()));
 					this->LastParse = targetchannel->name;
 				}
 				else
 				{
-					user->WriteTo(targetuser,"MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
+					user->WriteTo(targetuser, "MODE %s %s%s", targetuser->nick.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
 					FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence + parameter_list.str()));
 					this->LastParse = targetuser->nick;
 				}
@@ -1127,7 +1127,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
 void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 {
 	char moderemove[MAXBUF];
-	const char* parameters[] = { user->nick, moderemove };
+	std::vector<std::string> parameters;
 
 	if (user->IsModeSet(this->GetModeChar()))
 	{
@@ -1138,7 +1138,9 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 		else
 		{
 			sprintf(moderemove,"-%c",this->GetModeChar());
-			ServerInstance->Parser->CallHandler("MODE", parameters, 2, user);
+			parameters.push_back(user->nick);
+			parameters.push_back(moderemove);
+			ServerInstance->Parser->CallHandler("MODE", parameters, user);
 		}
 	}
 }
@@ -1149,7 +1151,7 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
 	char moderemove[MAXBUF];
-	const char* parameters[] = { channel->name, moderemove };
+	std::vector<std::string> parameters;
 
 	if (channel->IsModeSet(this->GetModeChar()))
 	{
@@ -1160,7 +1162,9 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack)
 		else
 		{
 			sprintf(moderemove,"-%c",this->GetModeChar());
-			ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient);
+			parameters.push_back(channel->name);
+			parameters.push_back(moderemove);
+			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 		}
 	}
 }