* +------------------------------------+
*
* InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
: Module(Me)
{
// read our config options (main config file)
- OnRehash(NULL,"");
+ OnRehash(NULL);
ServerInstance->SNO->EnableSnomask('G', "GODMODE");
if (!ServerInstance->Modules->PublishFeature("Override", this))
{
ServerInstance->Modules->Attach(eventlist, this, 8);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
// on a rehash we delete our classes for good measure and create them again.
- ConfigReader* Conf = new ConfigReader(ServerInstance);
+ ConfigReader Conf(ServerInstance);
// re-read our config options on a rehash
- NoisyOverride = Conf->ReadFlag("override", "noisy", 0);
- RequireKey = Conf->ReadFlag("override", "requirekey", 0);
+ NoisyOverride = Conf.ReadFlag("override", "noisy", 0);
+ RequireKey = Conf.ReadFlag("override", "requirekey", 0);
overrides.clear();
- for (int j =0; j < Conf->Enumerate("type"); j++)
+ for (int j =0; j < Conf.Enumerate("type"); j++)
{
- std::string typen = Conf->ReadValue("type","name",j);
- std::string tokenlist = Conf->ReadValue("type","override",j);
+ std::string typen = Conf.ReadValue("type","name",j);
+ std::string tokenlist = Conf.ReadValue("type","override",j);
overrides[typen] = tokenlist;
}
-
- delete Conf;
}
{
if ((irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS) && !ServerInstance->Modes->GetLastParse().empty())
{
- std::string msg = std::string(user->nick)+" Overriding modes: "+ServerInstance->Modes->GetLastParse()+" [Detail: ";
+ std::string msg = std::string(user->nick)+" overriding modes: "+ServerInstance->Modes->GetLastParse()+" [Detail: ";
if (OverOps)
msg += ConvToStr(OverOps)+" op"+(OverOps != 1 ? "s" : "")+", ";
if (OverDeops)
if (OverOther)
msg += "others, ";
msg.replace(msg.length()-2, 2, 1, ']');
- ServerInstance->SNO->WriteToSnoMask('G',msg);
+ ServerInstance->SNO->WriteGlobalSno('G',msg);
}
OverriddenMode = OverOther = false;
}
- virtual int OnLocalTopicChange(User *source, Channel *channel, const std::string &topic)
+ virtual ModResult OnLocalTopicChange(User *source, Channel *channel, const std::string &topic)
{
if (IS_OPER(source) && CanOverride(source, "TOPIC"))
{
if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetStatus(source) < STATUS_HOP))
{
- ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
+ ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
}
// Explicit allow
- return -1;
+ return MOD_RES_ALLOW;
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual int OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason)
+ virtual ModResult OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason)
{
if (IS_OPER(source) && CanOverride(source,"KICK"))
{
// If the kicker's status is less than the target's, or the kicker's status is less than or equal to voice
if ((chan->GetStatus(source) < chan->GetStatus(user)) || (chan->GetStatus(source) <= STATUS_VOICE))
{
- ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+ ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
}
- /* Returning -1 explicitly allows the kick */
- return -1;
+ return MOD_RES_ALLOW;
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
+ virtual ModResult OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
{
if (!IS_OPER(source))
- return ACR_DEFAULT;
+ return MOD_RES_PASSTHRU;
if (!source || !channel)
- return ACR_DEFAULT;
+ return MOD_RES_PASSTHRU;
int mode = STATUS_NORMAL;
if (channel->HasUser(source))
if (over_this)
{
OverriddenMode = true;
- return ACR_ALLOW;
+ return MOD_RES_ALLOW;
}
else
{
- return ACR_DEFAULT;
+ return MOD_RES_PASSTHRU;
}
}
- virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+ virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
{
if (IS_LOCAL(user) && IS_OPER(user))
{
{
// Can't join normally -- must use a special key to bypass restrictions
user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
- return 1;
+ return MOD_RES_PASSTHRU;
}
if (NoisyOverride)
chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
- ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
+ ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
}
- return -1;
+ return MOD_RES_ALLOW;
}
if ((chan->modes[CM_KEY]) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k'))
{
// Can't join normally -- must use a special key to bypass restrictions
user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
- return 1;
+ return MOD_RES_PASSTHRU;
}
if (NoisyOverride)
chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str());
- ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
- return -1;
+ ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
+ return MOD_RES_ALLOW;
}
if ((chan->modes[CM_LIMIT]) && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT")))
{
// Can't join normally -- must use a special key to bypass restrictions
user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
- return 1;
+ return MOD_RES_PASSTHRU;
}
if (NoisyOverride)
chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str());
- ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
- return -1;
+ ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
+ return MOD_RES_ALLOW;
}
if (chan->IsBanned(user) && CanOverride(user,"BANWALK"))
{
// Can't join normally -- must use a special key to bypass restrictions
user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
- return 1;
+ return MOD_RES_PASSTHRU;
}
if (NoisyOverride)
chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
- ServerInstance->SNO->WriteToSnoMask('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
- return -1;
+ ServerInstance->SNO->WriteGlobalSno('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
+ return MOD_RES_ALLOW;
}
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
virtual const char* OnRequest(Request* request)
projects / user / henk / code / inspircd.git / blobdiff