* +------------------------------------+
*
* 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.
{
public:
/* This is an oper-only mode */
- OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
+ OperChans(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
if (adding)
{
class ModuleOperChans : public Module
{
- OperChans* oc;
+ OperChans oc;
public:
ModuleOperChans(InspIRCd* Me)
- : Module(Me)
+ : Module(Me), oc(Me, this)
{
-
- oc = new OperChans(ServerInstance);
- if (!ServerInstance->Modes->AddMode(oc))
+ if (!ServerInstance->Modes->AddMode(&oc))
throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnCheckBan };
- ServerInstance->Modules->Attach(eventlist, this, 1);
+ Implementation eventlist[] = { I_OnCheckBan, I_OnUserPreJoin };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
+ virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+ {
+ if (chan && chan->IsModeSet('O') && !IS_OPER(user))
+ {
+ user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join %s (+O is set)",
+ user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+ return MOD_RES_DENY;
+ }
+ return MOD_RES_PASSTHRU;
+ }
- virtual int OnCheckBan(User* user, Channel* chan)
+ virtual ModResult OnCheckBan(User* user, Channel* chan)
{
if (IS_OPER(user))
return chan->GetExtBanStatus(user->oper, 'O');
- if (chan->IsModeSet('O'))
- return -1;
-
- return 0;
+ return MOD_RES_PASSTHRU;
}
virtual ~ModuleOperChans()
{
- ServerInstance->Modes->DelMode(oc);
- delete oc;
+ ServerInstance->Modes->DelMode(&oc);
}
virtual Version GetVersion()