X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=39ba84b9a47537b2c59fa30b992c6e273d7ac988;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=446fd6d6186c019d12c8d60ee0ea24b2c47d1938;hpb=206e3b49c7bfe3e8a7ca972103fe9e30feb3a86a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index 446fd6d61..39ba84b9a 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -2,7 +2,7 @@ * | 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 @@ -11,9 +11,6 @@ * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" /* $ModDesc: Provides channel +S mode (strip ansi colour) */ @@ -25,7 +22,7 @@ class ChannelStripColor : public ModeHandler public: 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) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode) { if (adding) { @@ -55,7 +52,7 @@ class UserStripColor : public ModeHandler public: UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { } - 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 servermode) { /* Only opers can change other users modes */ if (source != dest) @@ -95,74 +92,51 @@ class ModuleStripColor : public Module usc = new UserStripColor(ServerInstance); csc = new ChannelStripColor(ServerInstance); - if (!ServerInstance->AddMode(usc, 'S') || !ServerInstance->AddMode(csc, 'S')) + if (!ServerInstance->Modes->AddMode(usc) || !ServerInstance->Modes->AddMode(csc)) throw ModuleException("Could not add new modes!"); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - void Implements(char* List) - { - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; - } virtual ~ModuleStripColor() { ServerInstance->Modes->DelMode(usc); ServerInstance->Modes->DelMode(csc); - DELETE(usc); - DELETE(csc); + delete usc; + delete csc; } - // ANSI colour stripping based on C example by Doc (Peter Wood) virtual void ReplaceLine(std::string &sentence) { - int i, a, len, remove; - len = sentence.length(); - - for (i = 0; i < len; i++) - { - remove = 0; - - switch (sentence[i]) + /* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */ + int seq = 0; + std::string::iterator i,safei; + for (i = sentence.begin(); i != sentence.end(); ++i) + { + if ((*i == 3)) + seq = 1; + else if (seq && ( (*i >= '0') && (*i <= '9') || (*i == ',') ) ) { - case 2: - case 15: - case 22: - case 21: - case 31: - remove++; - break; - - case 3: - remove = 1; - - if (isdigit(sentence[i + remove])) - remove++; - - if (isdigit(sentence[i + remove])) - remove++; - - if (sentence[i + remove] == ',') - { - remove += 2; - - if (isdigit(sentence[i + remove])) - remove++; - } - break; + seq++; + if ( (seq <= 4) && (*i == ',') ) + seq = 1; + else if (seq > 3) + seq = 0; } - - if (remove != 0) + else + seq = 0; + + if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31))) { - len -= remove; - - for (a = i; a <= len; a++) - sentence[a] = sentence[a + remove]; - i--; + safei = i; + --i; + sentence.erase(safei); } } } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (!IS_LOCAL(user)) return 0; @@ -170,17 +144,21 @@ class ModuleStripColor : public Module bool active = false; if (target_type == TYPE_USER) { - userrec* t = (userrec*)dest; + User* t = (User*)dest; active = t->IsModeSet('S'); } else if (target_type == TYPE_CHANNEL) { - chanrec* t = (chanrec*)dest; + Channel* t = (Channel*)dest; // 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 (CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) == STATUS_OP) + { + return 0; + } + + active = t->IsModeSet('S'); } if (active) @@ -191,41 +169,16 @@ class ModuleStripColor : public Module return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); - } - -}; - -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleStripColorFactory : public ModuleFactory -{ - public: - ModuleStripColorFactory() - { - } - - ~ModuleStripColorFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleStripColor(Me); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } }; - -extern "C" DllExport void * init_module( void ) -{ - return new ModuleStripColorFactory; -} - +MODULE_INIT(ModuleStripColor)