X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=0f5d457834ba33538a28abb713c193751b9f6d71;hb=8e5237cca1bf70ffe00291f48484d87b485908c8;hp=2a32dfac27defefabea4c9c7ec7c46956efcc6f5;hpb=f75a0d5482a09fffc0cc6cfece80bb2f1e4de815;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index 2a32dfac2..0f5d45783 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -470,7 +470,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 		{
 			parameter = parameters[param_at++];
 			/* Make sure the user isn't trying to slip in an invalid parameter */
-			if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
+			if ((parameter.empty()) || (parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
 				continue;
 			if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode())
 			{
@@ -837,11 +837,19 @@ std::string ModeParser::GiveModeList(ModeMasks m)
 	return type1 + "," + type2 + "," + type3 + "," + type4;
 }
 
+struct PrefixModeSorter
+{
+	bool operator()(ModeHandler* lhs, ModeHandler* rhs)
+	{
+		return lhs->GetPrefixRank() < rhs->GetPrefixRank();
+	}
+};
+
 std::string ModeParser::BuildPrefixes(bool lettersAndModes)
 {
 	std::string mletters;
 	std::string mprefixes;
-	std::map<int,std::pair<char,char> > prefixes;
+	std::vector<ModeHandler*> prefixes;
 
 	for (unsigned char mode = 'A'; mode <= 'z'; mode++)
 	{
@@ -849,15 +857,15 @@ std::string ModeParser::BuildPrefixes(bool lettersAndModes)
 
 		if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix()))
 		{
-			prefixes[modehandlers[pos]->GetPrefixRank()] = std::make_pair(
-				modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetModeChar());
+			prefixes.push_back(modehandlers[pos]);
 		}
 	}
 
-	for(std::map<int,std::pair<char,char> >::reverse_iterator n = prefixes.rbegin(); n != prefixes.rend(); n++)
+	std::sort(prefixes.begin(), prefixes.end(), PrefixModeSorter());
+	for (std::vector<ModeHandler*>::const_reverse_iterator n = prefixes.rbegin(); n != prefixes.rend(); ++n)
 	{
-		mletters = mletters + n->second.first;
-		mprefixes = mprefixes + n->second.second;
+		mletters += (*n)->GetPrefix();
+		mprefixes += (*n)->GetModeChar();
 	}
 
 	return lettersAndModes ? "(" + mprefixes + ")" + mletters : mletters;