X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=b446d2b9af9224a8e1f6effc686772087443ab4c;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=0c3f29a25151572ed715b904c0e2c2c17c0756d9;hpb=5b80dc83fdb6b7952e452a8eb2355005fdb5366c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 0c3f29a25..b446d2b9a 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,10 +11,9 @@ * --------------------------------------------------- */ -/* $Core: libIRCDcommand_parse */ +/* $Core */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "socketengine.h" #include "socket.h" @@ -27,15 +26,25 @@ #include #endif -int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) +int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) { int MOD_RESULT = 0; - FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber)) + FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype)) + + /* Module matched */ if (MOD_RESULT == 1) return 0; + + /* Module explicitly didnt match */ if (MOD_RESULT == -1) return 1; - return strcmp(data,input); + + /* We dont handle any hash types except for plaintext - Thanks tra26 */ + if (hashtype != "" && hashtype != "plaintext") + /* See below. 1 because they dont match */ + return 1; + + return (data != input); // this seems back to front, but returns 0 if they *match*, 1 else } /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. @@ -48,19 +57,22 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc. * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam. */ -int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra) +int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere, unsigned int extra) { + if (splithere >= parameters.size()) + return 0; + /* First check if we have more than one item in the list, if we don't we return zero here and the handler * which called us just carries on as it was. */ - if (!strchr(parameters[splithere],',')) + if (parameters[splithere].find(',') == std::string::npos) 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 dupes; + std::set dupes; /* Create two lists, one for channel names, one for keys */ @@ -78,10 +90,10 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parame { if (dupes.find(item.c_str()) == dupes.end()) { - const char* new_parameters[MAXPARAMETERS]; + std::vector new_parameters; - for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) - new_parameters[t] = parameters[t]; + for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) + new_parameters.push_back(parameters[t]); if (!items2.GetToken(extrastuff)) extrastuff = ""; @@ -89,23 +101,26 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parame new_parameters[splithere] = item.c_str(); new_parameters[extra] = extrastuff.c_str(); - CommandObj->Handle(new_parameters,pcnt,user); + CommandObj->Handle(new_parameters, user); - dupes[item.c_str()] = true; + dupes.insert(item.c_str()); } } return 1; } -int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere) +int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere) { + if (splithere >= parameters.size()) + return 0; + /* First check if we have more than one item in the list, if we don't we return zero here and the handler * which called us just carries on as it was. */ - if (!strchr(parameters[splithere],',')) + if (parameters[splithere].find(',') == std::string::npos) return 0; - std::map dupes; + std::set dupes; /* Only one commasepstream here */ irc::commasepstream items1(parameters[splithere]); @@ -120,22 +135,17 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parame { if (dupes.find(item.c_str()) == dupes.end()) { - const char* new_parameters[MAXPARAMETERS]; + std::vector new_parameters; - for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) - new_parameters[t] = parameters[t]; + for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) + new_parameters.push_back(parameters[t]); new_parameters[splithere] = item.c_str(); - parameters[splithere] = item.c_str(); - - /* Execute the command handler over and over. If someone pulls our user - * record out from under us (e.g. if we /kill a comma sep list, and we're - * in that list ourselves) abort if we're gone. - */ - CommandObj->Handle(new_parameters,pcnt,user); + /* 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, @@ -145,13 +155,13 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parame return 1; } -bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, User * user) +bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user) { - Commandable::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if ((pcnt>=n->second->min_params) && (n->second->source != "")) + if ((pcnt >= n->second->min_params) && (n->second->source != "")) { if (IS_LOCAL(user) && n->second->flags_needed) { @@ -171,7 +181,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, Use Command* CommandParser::GetHandler(const std::string &commandname) { - Commandable::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) return n->second; @@ -180,13 +190,13 @@ Command* CommandParser::GetHandler(const std::string &commandname) // calls a handler function for a command -CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user) +CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector& parameters, User *user) { - Commandable::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if (pcnt >= n->second->min_params) + if (parameters.size() >= n->second->min_params) { bool bOkay = false; @@ -209,7 +219,7 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char** if (bOkay) { - return n->second->Handle(parameters,pcnt,user); + return n->second->Handle(parameters,user); } } } @@ -218,29 +228,8 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char** void CommandParser::DoLines(User* current, bool one_only) { - // while there are complete lines to process... - int floodlines = 0; - while (current->BufferIsReady()) { - if (ServerInstance->Time() > current->reset_due) - { - current->reset_due = ServerInstance->Time() + current->MyClass->GetThreshold(); - current->lines_in = 0; - } - - if (++current->lines_in > current->MyClass->GetFlood() && current->MyClass->GetFlood()) - { - ServerInstance->FloodQuitUser(current); - return; - } - - if ((++floodlines > current->MyClass->GetFlood()) && (current->MyClass->GetFlood() != 0)) - { - ServerInstance->FloodQuitUser(current); - return; - } - // use GetBuffer to copy single lines into the sanitized string std::string single_line = current->GetBuffer(); current->bytes_in += single_line.length(); @@ -256,10 +245,9 @@ void CommandParser::DoLines(User* current, bool one_only) bool CommandParser::ProcessCommand(User *user, std::string &cmd) { - const char *command_p[MAXPARAMETERS]; - int items = 0; + std::vector command_p; irc::tokenstream tokens(cmd); - std::string command; + std::string command, token; tokens.GetToken(command); /* A client sent a nick prefix on their command (ick) @@ -267,90 +255,141 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) * the rfc says they shouldnt but also says the ircd should * discard it if they do. */ - if (*command.c_str() == ':') + if (command[0] == ':') tokens.GetToken(command); - while (tokens.GetToken(para[items]) && (items < MAXPARAMETERS)) - { - command_p[items] = para[items].c_str(); - items++; - } + while (tokens.GetToken(token) && (command_p.size() <= MAXPARAMETERS)) + command_p.push_back(token); std::transform(command.begin(), command.end(), command.begin(), ::toupper); - - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd)); - if (MOD_RESULT == 1) { - return true; - } - if (!user) + /* find the command, check it exists */ + Commandtable::iterator cm = cmdlist.find(command); + + /* Modify the user's penalty regardless of whether or not the command exists */ + bool do_more = true; + if (!user->HasPrivPermission("users/flood/no-throttle")) { - /* - * before, we went and found the command even with no user.. seems nonsensical. - * I'm not entirely sure when we would be passed NULL, but let's handle it - * anyway, by dropping it like a hot potato. -- w00t - */ - return true; + // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap + user->IncreasePenalty(cm != cmdlist.end() ? cm->second->Penalty : 2); + do_more = (user->Penalty < 10); } - /* find the command, check it exists */ - Commandable::iterator cm = cmdlist.find(command); - + if (cm == cmdlist.end()) { - ServerInstance->stats->statsUnknown++; - user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); - return true; + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); + if (MOD_RESULT == 1) + return true; + + /* + * This double lookup is in case a module (abbreviation) wishes to change a command. + * Sure, the double lookup is a bit painful, but bear in mind this only happens for unknowns anyway. + * + * Thanks dz for making me actually understand why this is necessary! + * -- w00t + */ + cm = cmdlist.find(command); + if (cm == cmdlist.end()) + { + if (user->registered == REG_ALL) + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); + ServerInstance->stats->statsUnknown++; + return true; + } } - /* Modify the user's penalty */ - bool do_more = true; - if (!user->ExemptFromPenalty) + if (cm->second->max_params && command_p.size() > cm->second->max_params) { - user->IncreasePenalty(cm->second->Penalty); - ServerInstance->Log(DEBUG,"Penalty for %s is now incremented to %d (%d added on)", user->nick, user->Penalty, cm->second->Penalty); - do_more = (user->Penalty < 10); - if (!do_more) + /* + * command_p input (assuming max_params 1): + * this + * is + * a + * test + */ + std::string lparam = ""; + + /* + * The '-1' here is a clever trick, we'll go backwards throwing everything into a temporary param + * and then just toss that into the array. + * -- w00t + */ + while (command_p.size() > (cm->second->max_params - 1)) { - user->OverPenalty = true; - ServerInstance->Log(DEBUG,"User %s now OVER penalty of 10", user->nick); + // BE CAREFUL: .end() returns past the end of the vector, hence decrement. + std::vector::iterator it = --command_p.end(); + + lparam.insert(0, " " + *(it)); + command_p.erase(it); // remove last element } + + /* we now have (each iteration): + * ' test' + * ' a test' + * ' is a test' <-- final string + * ...now remove the ' ' at the start... + */ + lparam.erase(lparam.begin()); + + /* param is now 'is a test', which is exactly what we wanted! */ + command_p.push_back(lparam); } + /* + * We call OnPreCommand here seperately if the command exists, so the magic above can + * truncate to max_params if necessary. -- w00t + */ + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); + if (MOD_RESULT == 1) + return true; + /* activity resets the ping pending timer */ - user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); + if (user->MyClass) + user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); + if (cm->second->flags_needed) { if (!user->IsModeSet(cm->second->flags_needed)) { - user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick); + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str()); return do_more; } if (!user->HasPermission(command)) { - user->WriteServ("481 %s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str()); + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick.c_str(),user->oper.c_str(),command.c_str()); return do_more; } } if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) { /* command is disabled! */ - user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str()); - ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)", - command.c_str(), user->nick, user->ident, user->host); + if (ServerInstance->Config->DisabledDontExist) + { + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); + } + else + { + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :This command has been disabled.", + user->nick.c_str(), command.c_str()); + } + + ServerInstance->SNO->WriteToSnoMask('t', "%s denied for %s (%s@%s)", + command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str()); return do_more; } - if (items < cm->second->min_params) + if (command_p.size() < cm->second->min_params) { - user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str()); + user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str()); if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length())) - user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str()); + user->WriteNumeric(RPL_SYNTAX, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->command.c_str(), cm->second->syntax.c_str()); return do_more; } if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg())) { - user->WriteServ("451 %s :You have not registered",command.c_str()); + user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str()); return do_more; } else @@ -360,48 +399,38 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) cm->second->total_bytes += cmd.length(); /* module calls too */ - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd)); + MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, true, cmd)); if (MOD_RESULT == 1) return do_more; /* * WARNING: be careful, the user may be deleted soon */ - CmdResult result = cm->second->Handle(command_p,items,user); + CmdResult result = cm->second->Handle(command_p, user); - FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd)); return do_more; } } -bool CommandParser::RemoveCommands(const char* source) +void CommandParser::RemoveCommands(const char* source) { - Commandable::iterator i,safei; - for (i = cmdlist.begin(); i != cmdlist.end(); i++) + Commandtable::iterator i,safei; + for (i = cmdlist.begin(); i != cmdlist.end();) { safei = i; - safei++; - if (safei != cmdlist.end()) - { - RemoveCommand(safei, source); - } - } - safei = cmdlist.begin(); - if (safei != cmdlist.end()) - { + i++; RemoveCommand(safei, source); } - return true; } -void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source) +void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source) { Command* x = safei->second; if (x->source == std::string(source)) { cmdlist.erase(safei); - delete x; } } @@ -419,12 +448,10 @@ bool CommandParser::ProcessBuffer(std::string &buffer,User *user) if (buffer.length()) { - if (!user->muted) - { - ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str()); - return this->ProcessCommand(user,buffer); - } + ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick.c_str(), buffer.c_str()); + return this->ProcessCommand(user,buffer); } + return true; } @@ -436,7 +463,7 @@ bool CommandParser::CreateCommand(Command *f, void* so_handle) RFCCommands[f->command] = so_handle; else { - ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); + ServerInstance->Logs->Log("COMMAND",DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); return false; } } @@ -461,65 +488,56 @@ bool CommandParser::FindSym(void** v, void* h, const std::string &name) const char* err = dlerror(); if (err && !(*v)) { - ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); + ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); return false; } return true; } -bool CommandParser::ReloadCommand(const char* cmd, User* user) +bool CommandParser::ReloadCommand(std::string cmd, User* user) { char filename[MAXBUF]; - char commandname[MAXBUF]; - int y = 0; - - for (const char* x = cmd; *x; x++, y++) - commandname[y] = toupper(*x); - - commandname[y] = 0; + std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::toupper); - SharedObjectList::iterator command = RFCCommands.find(commandname); + SharedObjectList::iterator command = RFCCommands.find(cmd); if (command != RFCCommands.end()) { - Command* cmdptr = cmdlist.find(commandname)->second; - cmdlist.erase(cmdlist.find(commandname)); - - for (char* x = commandname; *x; x++) - *x = tolower(*x); - + Command* cmdptr = cmdlist.find(cmd)->second; + cmdlist.erase(cmdlist.find(cmd)); + RFCCommands.erase(cmd); delete cmdptr; dlclose(command->second); - RFCCommands.erase(command); - - snprintf(filename, MAXBUF, "cmd_%s.so", commandname); - const char* err = this->LoadCommand(filename); - if (err) - { - if (user) - user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick, cmd, err); - return false; - } - - return true; } - return false; + std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower); + snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str()); + const char* err = this->LoadCommand(filename); + if (err) + { + if (user) + user->WriteServ("NOTICE %s :*** Error loading '%s': %s", user->nick.c_str(), filename, err); + return false; + } + return true; } -CmdResult cmd_reload::Handle(const char** parameters, int /* pcnt */, User *user) +CmdResult CommandReload::Handle(const std::vector& parameters, User *user) { - user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); + if (parameters.size() < 1) + return CMD_FAILURE; + + user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick.c_str(), parameters[0].c_str()); if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) { - user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]); - ServerInstance->WriteOpers("*** RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]); + user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str()); return CMD_SUCCESS; } else { - user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick, parameters[0]); + user->WriteServ("NOTICE %s :*** Could not reload command '%s'. The command will not work until reloaded successfully.", user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } } @@ -533,7 +551,7 @@ const char* CommandParser::LoadCommand(const char* name) /* Command already exists? Succeed silently - this is needed for REHASH */ if (RFCCommands.find(name) != RFCCommands.end()) { - ServerInstance->Log(DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); + ServerInstance->Logs->Log("COMMAND",DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); return NULL; } @@ -543,7 +561,7 @@ const char* CommandParser::LoadCommand(const char* name) if (!h) { const char* n = dlerror(); - ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n); + ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s", name, n); return n; } @@ -555,51 +573,82 @@ const char* CommandParser::LoadCommand(const char* name) return NULL; } -void CommandParser::SetupCommandTable(User* user) +/** This is only invoked on startup + */ +void CommandParser::SetupCommandTable() { - RFCCommands.clear(); - - if (!user) - { - printf("\nLoading core commands"); - fflush(stdout); - } + printf("\nLoading core commands"); + fflush(stdout); DIR* library = opendir(LIBRARYDIR); if (library) { dirent* entry = NULL; - while ((entry = readdir(library))) + while (0 != (entry = readdir(library))) { - if (match(entry->d_name, "cmd_*.so")) + if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map)) { - if (!user) - { - printf("."); - fflush(stdout); - } + printf("."); + fflush(stdout); + const char* err = this->LoadCommand(entry->d_name); if (err) { - if (user) - { - user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick, entry->d_name, err); - } - else - { - printf("Error loading %s: %s", entry->d_name, err); - exit(EXIT_STATUS_BADHANDLER); - } + printf("Error loading %s: %s", entry->d_name, err); + exit(EXIT_STATUS_BADHANDLER); } } } closedir(library); - if (!user) - printf("\n"); + printf("\n"); } if (cmdlist.find("RELOAD") == cmdlist.end()) - this->CreateCommand(new cmd_reload(ServerInstance)); + this->CreateCommand(new CommandReload(ServerInstance)); +} + +int CommandParser::TranslateUIDs(const std::vector to, const std::vector &source, std::string &dest) +{ + std::vector::const_iterator items = source.begin(); + std::vector::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) @@ -622,46 +671,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: @@ -672,4 +681,3 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st return translations; } -