X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommand_parse.cpp;h=92428fd32b5842f32a3abf48f40edbdc6480c86f;hb=96a4a1d41e42dba806c2e9954e148ed838262511;hp=f427b478c6fc027ad3f263b406c3541ba7c7125a;hpb=187544bfd00c340492924f8238109ff7929c555d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index f427b478c..92428fd32 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.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
@@ -69,10 +69,10 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 		return 0;
 
 	/** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm.
-	 * By using std::map (thanks for the idea w00t) we can cut this down a ton.
+	 * By using std::set (thanks for the idea w00t) we can cut this down a ton.
 	 * ...VOOODOOOO!
 	 */
-	std::map<irc::string, bool> dupes;
+	std::set<irc::string> dupes;
 
 	/* Create two lists, one for channel names, one for keys
 	 */
@@ -103,7 +103,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 
 			CommandObj->Handle(new_parameters, user);
 
-			dupes[item.c_str()] = true;
+			dupes.insert(item.c_str());
 		}
 	}
 	return 1;
@@ -120,7 +120,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 	if (parameters[splithere].find(',') == std::string::npos)
 		return 0;
 
-	std::map<irc::string, bool> dupes;
+	std::set<irc::string> dupes;
 
 	/* Only one commasepstream here */
 	irc::commasepstream items1(parameters[splithere]);
@@ -145,7 +145,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 			/* Execute the command handler. */
 			CommandObj->Handle(new_parameters, user);
 
-			dupes[item.c_str()] = true;
+			dupes.insert(item.c_str());
 		}
 	}
 	/* By returning 1 we tell our caller that nothing is to be done,
@@ -262,10 +262,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 		command_p.push_back(token);
 
 	std::transform(command.begin(), command.end(), command.begin(), ::toupper);
-		
+
 	/* find the command, check it exists */
 	Commandtable::iterator cm = cmdlist.find(command);
-	
+
 	if (cm == cmdlist.end())
 	{
 		int MOD_RESULT = 0;
@@ -310,7 +310,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 		{
 			// BE CAREFUL: .end() returns past the end of the vector, hence decrement.
 			std::vector<std::string>::iterator it = --command_p.end();
-		
+
 			lparam.insert(0, " " + *(it));
 			command_p.erase(it); // remove last element
 		}
@@ -609,6 +609,50 @@ void CommandParser::SetupCommandTable()
 		this->CreateCommand(new CommandReload(ServerInstance));
 }
 
+int CommandParser::TranslateUIDs(const std::deque<TranslateType> to, const std::deque<std::string> &source, std::string &dest)
+{
+	std::deque<std::string>::const_iterator items = source.begin();
+	std::deque<TranslateType>::const_iterator types = to.begin();
+	User* user = NULL;
+	int translations = 0;
+	dest.clear();
+
+	while (items != source.end() && types != to.end())
+	{
+		TranslateType t = *types;
+		std::string item = *items;
+		types++;
+		items++;
+
+		switch (t)
+		{
+			case TR_NICK:
+				/* Translate single nickname */
+				user = ServerInstance->FindNick(item);
+				if (user)
+				{
+					dest.append(user->uuid);
+					translations++;
+				}
+				else
+					dest.append(item);
+			break;
+			break;
+			case TR_END:
+			case TR_TEXT:
+			default:
+				/* Do nothing */
+				dest.append(item);
+			break;
+		}
+		dest.append(" ");
+	}
+
+	if (!dest.empty())
+		dest.erase(dest.end() - 1);
+	return translations;
+}
+
 int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
 {
 	User* user = NULL;
@@ -629,46 +673,6 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
 			else
 				dest = source;
 		break;
-		case TR_NICKLIST:
-		{
-			/* Translate comma seperated list of nicknames */
-			irc::commasepstream items(source);
-			while (items.GetToken(item))
-			{
-				user = ServerInstance->FindNick(item);
-				if (user)
-				{
-					dest.append(user->uuid);
-					translations++;
-				}
-				else
-					dest.append(item);
-				dest.append(",");
-			}
-			if (!dest.empty())
-				dest.erase(dest.end() - 1);
-		}
-		break;
-		case TR_SPACENICKLIST:
-		{
-			/* Translate space seperated list of nicknames */
-			irc::spacesepstream items(source);
-			while (items.GetToken(item))
-			{
-				user = ServerInstance->FindNick(item);
-				if (user)
-				{
-					dest.append(user->uuid);
-					translations++;
-				}
-				else
-					dest.append(item);
-				dest.append(" ");
-			}
-			if (!dest.empty())
-				dest.erase(dest.end() - 1);
-		}
-		break;
 		case TR_END:
 		case TR_TEXT:
 		default:
@@ -679,5 +683,3 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
 
 	return translations;
 }
-
-