* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * 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.
oc = new OperChans(ServerInstance);
if (!ServerInstance->Modes->AddMode(oc))
throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnUserPreJoin };
- ServerInstance->Modules->Attach(eventlist, this, 1);
+ Implementation eventlist[] = { I_OnCheckBan, I_OnUserPreJoin };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
-
virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
{
- bool banned = false;
-
- if (!IS_OPER(user))
- {
- if (chan)
- {
- if (chan->IsModeSet('O'))
- {
- banned = true;
- }
- }
- }
- else
- {
- if (chan && chan->IsExtBanned(user->oper, 'O'))
- {
- banned = true;
- }
- }
-
- if (banned)
+ if (chan && chan->IsModeSet('O') && !IS_OPER(user))
{
- user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+ 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 1;
}
+ return 0;
+ }
+
+ virtual int OnCheckBan(User* user, Channel* chan)
+ {
+ if (IS_OPER(user))
+ return chan->GetExtBanStatus(user->oper, 'O');
return 0;
}
virtual Version GetVersion()
{
- return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+ return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
}
};