summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/modules.cpp2
-rw-r--r--src/modules/m_blockcaps.cpp47
2 files changed, 31 insertions, 18 deletions
diff --git a/src/modules.cpp b/src/modules.cpp
index e53f0c775..2c72943ec 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -134,7 +134,6 @@ void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &par
void Module::OnRehash(const std::string &parameter) { }
void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
-int Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params) { return false; }
void Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { };
Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
void Module::OnOper(userrec* user, const std::string &opertype) { };
@@ -152,7 +151,6 @@ int Module::OnKill(userrec* source, userrec* dest, const std::string &reason) {
void Module::OnLoadModule(Module* mod,const std::string &name) { };
void Module::OnUnloadModule(Module* mod,const std::string &name) { };
void Module::OnBackgroundTimer(time_t curtime) { };
-void Module::OnSendList(userrec* user, chanrec* channel, char mode) { };
int Module::OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) { return 0; };
bool Module::OnCheckReady(userrec* user) { return true; };
void Module::OnUserRegister(userrec* user) { };
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index f23726c58..8e5685398 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -22,20 +22,49 @@
/* $ModDesc: Provides support for channel mode +P to block all-CAPS channel messages and notices */
+class BlockCaps : public ModeHandler
+{
+ BlockCaps() : ModeHandler('P', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+ ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ {
+ if (adding)
+ {
+ if (!channel->IsModeSet('P'))
+ {
+ channel->SetCustomMode('P',true);
+ return MODEACTION_ALLOW;
+ }
+ }
+ else
+ {
+ if (channel->IsModeSet('P'))
+ {
+ channel->SetCustomMode('P',false);
+ return MODEACTION_ALLOW;
+ }
+ }
+
+ return MODEACTION_DENY;
+ }
+};
+
class ModuleBlockCAPS : public Module
{
Server *Srv;
+ BlockCaps* bc;
public:
ModuleBlockCAPS(Server* Me) : Module::Module(Me)
{
Srv = Me;
- Srv->AddExtendedMode('P', MT_CHANNEL, false, 0, 0);
+ bc = new BlockCaps;
+ Srv->AddMode(bc, 'P');
}
void Implements(char* List)
{
- List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1;
+ List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
}
virtual void On005Numeric(std::string &output)
@@ -72,20 +101,6 @@ public:
return OnUserPreMessage(user,dest,target_type,text,status);
}
- virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
- {
- // check if this is our mode character...
- if ((modechar == 'P') && (type == MT_CHANNEL))
- {
- log(DEBUG,"Allowing P change");
- return 1;
- }
- else
- {
- return 0;
- }
- }
-
virtual ~ModuleBlockCAPS()
{
}