* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
#include "inspircd.h"
#include "wildcard.h"
public:
ModuleOverride(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
// read our config options (main config file)
- OnRehash("");
+ OnRehash(NULL,"");
ServerInstance->SNO->EnableSnomask('O',"OVERRIDE");
OverriddenMode = false;
OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
+ Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand };
+ ServerInstance->Modules->Attach(eventlist, this, 6);
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
// on a rehash we delete our classes for good measure and create them again.
ConfigReader* Conf = new ConfigReader(ServerInstance);
overrides[typen] = tokenlist;
}
- DELETE(Conf);
+ delete Conf;
}
- void Implements(char* List)
- {
- List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = List[I_OnPostCommand] = 1;
- }
- virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
+ virtual void OnPostCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, CmdResult result, const std::string &original_line)
{
if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
{
output.append(" OVERRIDE");
}
- virtual bool CanOverride(userrec* source, char* token)
+ virtual bool CanOverride(User* source, const char* token)
{
// checks to see if the oper's type has <type:override>
override_t::iterator j = overrides.find(source->oper);
return false;
}
- virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
+ virtual int OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason)
{
- if ((*source->oper) && (CanOverride(source,"KICK")))
+ if (IS_OPER(source) && CanOverride(source,"KICK"))
{
if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE))
{
return 0;
}
- virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+ virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
{
- if (*source->oper)
+ if (IS_OPER(source))
{
if (source && channel)
{
switch (access_type)
{
case AC_DEOP:
- ServerInstance->Log(DEBUG,"Override access check AC_DEOP");
if (CanOverride(source,"MODEDEOP"))
{
if (NoisyOverride)
}
break;
case AC_OP:
- ServerInstance->Log(DEBUG,"Override access check AC_OP");
if (CanOverride(source,"MODEOP"))
{
if (NoisyOverride)
}
break;
case AC_VOICE:
- ServerInstance->Log(DEBUG,"Override access check AC_VOICE");
if (CanOverride(source,"MODEVOICE"))
{
if (NoisyOverride)
}
break;
case AC_DEVOICE:
- ServerInstance->Log(DEBUG,"Override access check AC_DEVOICE");
if (CanOverride(source,"MODEDEVOICE"))
{
if (NoisyOverride)
}
break;
case AC_HALFOP:
- ServerInstance->Log(DEBUG,"Override access check AC_HALFOP");
if (CanOverride(source,"MODEHALFOP"))
{
if (NoisyOverride)
}
break;
case AC_DEHALFOP:
- ServerInstance->Log(DEBUG,"Override access check AC_DEHALFOP");
if (CanOverride(source,"MODEDEHALFOP"))
{
if (NoisyOverride)
if (NoisyOverride)
if ((!channel->HasUser(source)) || (mode < STATUS_OP))
{
- ServerInstance->Log(DEBUG,"Overridden mode");
OverriddenMode = true;
OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
}
return ACR_DEFAULT;
}
- virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+ virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
{
- if (*user->oper)
+ if (IS_OPER(user))
{
if (chan)
{
if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE")))
{
- if (NoisyOverride)
+ irc::string x = chan->name;
+ if (!user->IsInvited(x))
{
- irc::string x = chan->name;
- if (!user->IsInvited(x))
- {
- /* XXX - Ugly cast for a parameter that isn't used? :< - Om */
+ /* XXX - Ugly cast for a parameter that isn't used? :< - Om */
+ if (NoisyOverride)
chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass invite-only", cname, user->nick);
- }
+ ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname));
}
- ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname));
return -1;
}
- if ((chan->key[0]) && (CanOverride(user,"KEY")))
+ if ((*chan->key) && (CanOverride(user,"KEY")))
{
if (NoisyOverride)
chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel key", cname, user->nick);
{
if (NoisyOverride)
chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel ban", cname, user->nick);
- ServerInstance->SNO->WriteToSnoMask('O',"%s used oper-override to bypass channel ban", user->nick);
+ ServerInstance->SNO->WriteToSnoMask('O',"%s used oper-override to bypass channel ban on %s", user->nick, cname);
}
return -1;
}
virtual Version GetVersion()
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version(1,2,0,1,VF_VENDOR,API_VERSION);
}
};
-
-class ModuleOverrideFactory : public ModuleFactory
-{
- public:
- ModuleOverrideFactory()
- {
- }
-
- ~ModuleOverrideFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleOverride(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleOverrideFactory;
-}
+MODULE_INIT(ModuleOverride)