+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * 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.
+ *
+ * ---------------------------------------------------
+ */
+
#include "inspircd.h"
#include "xline.h"
void DisplayExpiry()
{
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time));
}
const char* Displayable()
else
{
// XXX todo implement stats
- user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick.c_str(),parameters[0].c_str());
+ user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats S.",user->nick.c_str(),parameters[0].c_str());
}
return CMD_SUCCESS;
else if (parameters.size() >= 2)
{
// Adding - XXX todo make this respect <insane> tag perhaps..
- long duration = ServerInstance->Duration(parameters[1]);
+ long duration;
+ std::string expr;
+ if (parameters.size() > 2)
+ {
+ duration = ServerInstance->Duration(parameters[1]);
+ expr = parameters[2];
+ }
+ else
+ {
+ duration = 0;
+ expr = parameters[1];
+ }
Shun *r = NULL;
try
{
- r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
+ r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), parameters[0].c_str());
}
catch (...)
{
{
if (!duration)
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s",
+ user->nick.c_str(), parameters[0].c_str(), expr.c_str());
}
else
{
time_t c_requires_crap = duration + ServerInstance->Time();
- ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+ ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s: %s",
+ user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), expr.c_str());
}
ServerInstance->XLines->ApplyLines();
else
{
delete r;
- user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), parameters[0].c_str());
+ user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), expr.c_str());
}
}
}
{
CommandShun* mycommand;
ShunFactory *f;
- std::map<std::string, bool> ShunEnabledCommands;
+ std::set<std::string> ShunEnabledCommands;
bool NotifyOfShun;
+ bool affectopers;
public:
ModuleShun(InspIRCd* Me) : Module(Me)
ShunEnabledCommands.clear();
NotifyOfShun = true;
+ affectopers = false;
std::stringstream dcmds(cmds);
std::string thiscmd;
while (dcmds >> thiscmd)
{
- ShunEnabledCommands[thiscmd] = true;
+ ShunEnabledCommands.insert(thiscmd);
}
NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
+ affectopers = MyConf.ReadFlag("shun", "affectopers", "no", 0);
}
virtual void OnUserConnect(User* user)
return 0;
}
- std::map<std::string, bool>::iterator i = ShunEnabledCommands.find(command);
+ if (!affectopers && IS_OPER(user))
+ {
+ /* Don't do anything if the user is an operator and affectopers isn't set */
+ return 0;
+ }
+
+ std::set<std::string>::iterator i = ShunEnabledCommands.find(command);
if (i == ShunEnabledCommands.end())
{
- user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
+ if (NotifyOfShun)
+ user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
return 1;
}
parameters.clear();
}
- return 1;
+ /* if we're here, allow the command. */
+ return 0;
}
virtual Version GetVersion()