* ---------------------------------------------------
*/
-/* $Core */
-
#include "inspircd.h"
#include "xline.h"
#include "socketengine.h"
/* 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 (IS_LOCAL(user) && !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);
+ IS_LOCAL(user)->Penalty += cm != cmdlist.end() ? cm->second->Penalty : 2;
}
return true;
/* activity resets the ping pending timer */
- if (user->MyClass)
- user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+ LocalUser* luser = IS_LOCAL(user);
+ if (luser)
+ luser->nping = ServerInstance->Time() + luser->MyClass->GetPingTime();
if (cm->second->flags_needed)
{
}
}
-void CommandParser::RemoveCommands(Module* source)
+void CommandParser::RemoveCommand(Command* x)
{
- Commandtable::iterator i,safei;
- for (i = cmdlist.begin(); i != cmdlist.end();)
- {
- safei = i;
- i++;
- RemoveCommand(safei, source);
- }
+ Commandtable::iterator n = cmdlist.find(x->command);
+ if (n != cmdlist.end() && n->second == x)
+ cmdlist.erase(n);
}
-void CommandParser::RemoveCommand(Commandtable::iterator safei, Module* source)
+Command::~Command()
{
- Command* x = safei->second;
- if (x->creator == source)
- {
- cmdlist.erase(safei);
- }
+ ServerInstance->Parser->RemoveCommand(this);
}
bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
return ProcessCommand(user,buffer);
}
-bool CommandParser::CreateCommand(Command *f)
+bool CommandParser::AddCommand(Command *f)
{
/* create the command and push it onto the table */
if (cmdlist.find(f->command) == cmdlist.end())