* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Provides support for oper-only chans via the +O channel mode */
/* This is an oper-only mode */
OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
- ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
if (adding)
{
class ModuleOperChans : public Module
{
-
+
OperChans* oc;
public:
ModuleOperChans(InspIRCd* Me)
: Module(Me)
{
-
+
oc = new OperChans(ServerInstance);
- if (!ServerInstance->AddMode(oc, 'O'))
+ if (!ServerInstance->Modes->AddMode(oc))
throw ModuleException("Could not add new modes!");
+ Implementation eventlist[] = { I_OnUserPreJoin };
+ ServerInstance->Modules->Attach(eventlist, this, 1);
}
- void Implements(char* List)
- {
- List[I_OnUserPreJoin] = 1;
- }
- 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, const std::string &keygiven)
{
if (!IS_OPER(user))
{
{
if (chan->IsModeSet('O'))
{
- user->WriteServ("520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
+ 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());
return 1;
}
}
}
+ else
+ {
+ if (chan && chan->IsExtBanned(user->oper, 'O'))
+ {
+ user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(), chan->name.c_str());
+ return 1;
+ }
+ }
+
return 0;
}
-
+
virtual ~ModuleOperChans()
{
ServerInstance->Modes->DelMode(oc);
- DELETE(oc);
+ delete oc;
}
-
+
virtual Version GetVersion()
{
- return Version(1,1,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+ return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
}
};
-MODULE_INIT(ModuleOperChans);
+MODULE_INIT(ModuleOperChans)