X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=657ad7f443385e80570658adbc045afc3dfd8a28;hb=bcac49dca78631687975771c6d0a76b595171664;hp=8c8bfc00170d73887335ece46663e0149fa2d24a;hpb=33ed72a1dfae595132dd50c760b6a312ef2ce8fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 8c8bfc001..657ad7f44 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -21,78 +21,110 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" typedef std::map censor_t; /* $ModDesc: Provides user and channel +G mode */ -class CensorException : public ModuleException +/** Handles usermode +G + */ +class CensorUser : public ModeHandler { public: - virtual const char* GetReason() + CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - return "Could not find definition in your config file!"; + /* Only opers can change other users modes */ + if ((source != dest) && (!*source->oper)) + return MODEACTION_DENY; + + if (adding) + { + if (!dest->IsModeSet('G')) + { + dest->SetMode('G',true); + return MODEACTION_ALLOW; + } + } + else + { + if (dest->IsModeSet('G')) + { + dest->SetMode('G',false); + return MODEACTION_ALLOW; + } + } + + return MODEACTION_DENY; + } +}; + +/** Handles channel mode +G + */ +class CensorChannel : public ModeHandler +{ + public: + CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + { + if (adding) + { + if (!channel->IsModeSet('G')) + { + channel->SetMode('G',false); + return MODEACTION_ALLOW; + } + } + else + { + if (channel->IsModeSet('G')) + { + channel->SetMode('G',false); + return MODEACTION_ALLOW; + } + } + + return MODEACTION_ALLOW; } }; class ModuleCensor : public Module { - Server *Srv; + censor_t censors; + CensorUser *cu; + CensorChannel *cc; public: - ModuleCensor(Server* Me) + ModuleCensor(InspIRCd* Me) : Module::Module(Me) { - /* - * read the configuration file on startup. - * it is perfectly valid to set to the value of the - * main config file, then append your tags to the bottom - * of the main config... but rather messy. That's why the capability - * of using a seperate config file is provided. - * - * XXX - Really, it'd be nice to scraip this kind of thing, and have something like - * an include directive to include additional configuration files. Might make our lives easier. --w00t - * - * XXX - These module pre-date the include directive which exists since beta 5 -- Brain + /* Read the configuration file on startup. */ - Srv = Me; OnRehash(""); - Srv->AddExtendedMode('G',MT_CHANNEL,false,0,0); - Srv->AddExtendedMode('G',MT_CLIENT,false,0,0); + cu = new CensorUser(ServerInstance); + cc = new CensorChannel(ServerInstance); + ServerInstance->AddMode(cu, 'G'); + ServerInstance->AddMode(cc, 'G'); } void Implements(char* List) { - List[I_OnRehash] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1; + List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; } - - virtual void On005Numeric(std::string &output) - { - InsertMode(output,"G",4); - } - - - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) - { - // check if this is our mode character... - if (modechar == 'G') - { - return 1; - } - else - { - return 0; - } - } - virtual ~ModuleCensor() { + ServerInstance->Modes->DelMode(cu); + ServerInstance->Modes->DelMode(cc); + DELETE(cu); + DELETE(cc); } - + virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace) { if ((pattern != "") && (text != "")) @@ -105,10 +137,9 @@ class ModuleCensor : public Module } } } - + // format of a config entry is - - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) + virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { bool active = false; irc::string text2 = text.c_str(); @@ -119,7 +150,7 @@ class ModuleCensor : public Module if (target_type == TYPE_USER) { userrec* t = (userrec*)dest; - active = t->modes['G'-65]; + active = t->IsModeSet('G'); } else if (target_type == TYPE_CHANNEL) { @@ -137,9 +168,9 @@ class ModuleCensor : public Module return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) + virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { - return OnUserPreMessage(user,dest,target_type,text,status); + return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } virtual void OnRehash(const std::string ¶meter) @@ -148,15 +179,7 @@ class ModuleCensor : public Module * reload our config file on rehash - we must destroy and re-allocate the classes * to call the constructor again and re-read our data. */ - ConfigReader* Conf = new ConfigReader; - std::string Censorfile = Conf->ReadValue("censor","file",0); - // this automatically re-reads the configuration file into the class - ConfigReader* MyConf = new ConfigReader(Censorfile); - if ((Censorfile == "") || (!MyConf->Verify())) - { - CensorException e; - throw(e); - } + ConfigReader* MyConf = new ConfigReader(ServerInstance); censors.clear(); for (int index = 0; index < MyConf->Enumerate("badword"); index++) { @@ -164,14 +187,12 @@ class ModuleCensor : public Module irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str(); censors[pattern] = replace; } - DELETE(Conf); DELETE(MyConf); } virtual Version GetVersion() { - // This is version 2 because version 1.x is the unreleased unrealircd module - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); } }; @@ -189,7 +210,7 @@ class ModuleCensorFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleCensor(Me); } @@ -201,4 +222,3 @@ extern "C" void * init_module( void ) { return new ModuleCensorFactory; } -