* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 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.
{
int MOD_RESULT = 0;
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 data != input; // this seems back to front, but returns 0 if they *match*, 1 else
+
+ /* 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.
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
*/
CommandObj->Handle(new_parameters, user);
- dupes[item.c_str()] = true;
+ dupes.insert(item.c_str());
}
}
return 1;
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]);
/* 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,
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);
-
+
+ /* Modify the user's penalty regardless of whether or not the command exists */
+ bool do_more = true;
+ if (!user->HasPrivPermission("users/flood/no-throttle"))
+ {
+ // 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);
+ }
+
+
if (cm == cmdlist.end())
{
int MOD_RESULT = 0;
{
// 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
}
if (MOD_RESULT == 1)
return true;
- /* Modify the user's penalty */
- bool do_more = true;
- if (!user->HasPrivPermission("users/flood/no-throttle"))
- {
- user->IncreasePenalty(cm->second->Penalty);
- do_more = (user->Penalty < 10);
- }
-
/* activity resets the ping pending timer */
if (user->MyClass)
user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
user->nick.c_str(), command.c_str());
}
- ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
+ 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;
}
cmdlist.erase(cmdlist.find(cmd));
RFCCommands.erase(cmd);
- std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower);
delete cmdptr;
dlclose(command->second);
-
- 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 'cmd_%s.so': %s", user->nick.c_str(), cmd.c_str(), 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 std::vector<std::string>& parameters, User *user)
+CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User *user)
{
if (parameters.size() < 1)
return CMD_FAILURE;
if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
{
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());
+ 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.c_str(), parameters[0].c_str());
+ 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;
}
}
}
if (cmdlist.find("RELOAD") == cmdlist.end())
- this->CreateCommand(new cmd_reload(ServerInstance));
+ 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)
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:
return translations;
}
-
-