X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=f8130336d711fff2eaabb2ae15a6412619f53778;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=22b1cf7e8d1646f2bfb8947edcf6d223c3025f4e;hpb=ced58c3be3f1da8dcf70c3904e5fe4bdaabf0e3d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index 22b1cf7e8..f8130336d 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -2,79 +2,121 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" /* $ModDesc: Provides channel +S mode (strip ansi colour) */ -class ModuleStripColor : public Module +/** Handles channel mode +S + */ +class ChannelStripColor : public ModeHandler { - Server *Srv; - ConfigReader *Conf, *MyConf; - public: - ModuleStripColor(Server* Me) - : Module::Module(Me) + ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_CHANNEL, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - Srv = Me; + if (adding) + { + if (!channel->IsModeSet('S')) + { + channel->SetMode('S',true); + return MODEACTION_ALLOW; + } + } + else + { + if (channel->IsModeSet('S')) + { + channel->SetMode('S',false); + return MODEACTION_ALLOW; + } + } - Srv->AddExtendedMode('S',MT_CHANNEL,false,0,0); - Srv->AddExtendedMode('S',MT_CLIENT,false,0,0); + return MODEACTION_DENY; } +}; - void Implements(char* List) - { - List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; - } +/** Handles user mode +S + */ +class UserStripColor : public ModeHandler +{ + public: + UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { } - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - // check if this is our mode character... - if (modechar == 'S') - { - return 1; + /* Only opers can change other users modes */ + if (source != dest) + return MODEACTION_DENY; + + if (adding) + { + if (!dest->IsModeSet('S')) + { + dest->SetMode('S',true); + return MODEACTION_ALLOW; + } } else { - return 0; + if (dest->IsModeSet('S')) + { + dest->SetMode('S',false); + return MODEACTION_ALLOW; + } } + + return MODEACTION_DENY; + } +}; + + +class ModuleStripColor : public Module +{ + bool AllowChanOps; + ChannelStripColor *csc; + UserStripColor *usc; + + public: + ModuleStripColor(InspIRCd* Me) : Module(Me) + { + usc = new UserStripColor(ServerInstance); + csc = new ChannelStripColor(ServerInstance); + + if (!ServerInstance->AddMode(usc, 'S') || !ServerInstance->AddMode(csc, 'S')) + throw ModuleException("Could not add new modes!"); + } + + void Implements(char* List) + { + List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; } - virtual void On005Numeric(std::string &output) - { - InsertMode(output,"S",4); - } - virtual ~ModuleStripColor() { + ServerInstance->Modes->DelMode(usc); + ServerInstance->Modes->DelMode(csc); + DELETE(usc); + DELETE(csc); } - // ANSI colour stripping by Doc (Peter Wood) - virtual void ReplaceLine(std::string &text) + // ANSI colour stripping based on C example by Doc (Peter Wood) + virtual void ReplaceLine(std::string &sentence) { int i, a, len, remove; - char sentence[MAXBUF]; - strlcpy(sentence,text.c_str(),MAXBUF); - - len = strlen(sentence); + len = sentence.length(); for (i = 0; i < len; i++) { @@ -100,7 +142,7 @@ class ModuleStripColor : public Module remove++; if (sentence[i + remove] == ',') - { + { remove += 2; if (isdigit(sentence[i + remove])) @@ -118,39 +160,45 @@ class ModuleStripColor : public Module i--; } } - - text = sentence; } - - 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) { + if (!IS_LOCAL(user)) + return 0; + bool active = false; if (target_type == TYPE_USER) { userrec* t = (userrec*)dest; - active = (strchr(t->modes,'S') > 0); + active = t->IsModeSet('S'); } else if (target_type == TYPE_CHANNEL) { chanrec* t = (chanrec*)dest; - active = (t->IsModeSet('S')); + + // check if we allow ops to bypass filtering, if we do, check if they're opped accordingly. + // note: short circut logic here, don't wreck it. -- w00t + if (!CHANOPS_EXEMPT(ServerInstance, 'S') || CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) != STATUS_OP) + active = t->IsModeSet('S'); } + if (active) { this->ReplaceLine(text); } + 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 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); } }; @@ -168,7 +216,7 @@ class ModuleStripColorFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleStripColor(Me); } @@ -176,7 +224,7 @@ class ModuleStripColorFactory : public ModuleFactory }; -extern "C" void * init_module( void ) +extern "C" DllExport void * init_module( void ) { return new ModuleStripColorFactory; }