X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_stripcolor.cpp;h=34662c45b1e1761d868a9396365d525b26d786f7;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=9ba8775b985c8a7f241ad519447a96eb2d89f2a3;hpb=33d11457b46d8757142b3ab4bcac890619183c98;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 9ba8775b9..34662c45b 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -20,7 +20,7 @@
 class ChannelStripColor : public SimpleChannelModeHandler
 {
  public:
-	ChannelStripColor(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'S') { }
+	ChannelStripColor(Module* Creator) : SimpleChannelModeHandler(Creator, 'S') { }
 };
 
 /** Handles user mode +S
@@ -28,23 +28,20 @@ class ChannelStripColor : public SimpleChannelModeHandler
 class UserStripColor : public SimpleUserModeHandler
 {
  public:
-	UserStripColor(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'S') { }
+	UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, 'S') { }
 };
 
 
 class ModuleStripColor : public Module
 {
 	bool AllowChanOps;
-	ChannelStripColor *csc;
-	UserStripColor *usc;
+	ChannelStripColor csc;
+	UserStripColor usc;
 
  public:
-	ModuleStripColor(InspIRCd* Me) : Module(Me)
+	ModuleStripColor() : csc(this), usc(this)
 	{
-		usc = new UserStripColor(ServerInstance);
-		csc = new ChannelStripColor(ServerInstance);
-
-		if (!ServerInstance->Modes->AddMode(usc) || !ServerInstance->Modes->AddMode(csc))
+		if (!ServerInstance->Modes->AddMode(&usc) || !ServerInstance->Modes->AddMode(&csc))
 			throw ModuleException("Could not add new modes!");
 		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
@@ -52,10 +49,8 @@ class ModuleStripColor : public Module
 
 	virtual ~ModuleStripColor()
 	{
-		ServerInstance->Modes->DelMode(usc);
-		ServerInstance->Modes->DelMode(csc);
-		delete usc;
-		delete csc;
+		ServerInstance->Modes->DelMode(&usc);
+		ServerInstance->Modes->DelMode(&csc);
 	}
 
 	virtual void On005Numeric(std::string &output)
@@ -103,10 +98,10 @@ class ModuleStripColor : public Module
 		}
 	}
 
-	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (!IS_LOCAL(user))
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		bool active = false;
 		if (target_type == TYPE_USER)
@@ -120,12 +115,12 @@ class ModuleStripColor : public Module
 
 			// 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') && t->GetStatus(user) == STATUS_OP)
+			if (CHANOPS_EXEMPT('S') && t->GetPrefixValue(user) == OP_VALUE)
 			{
-				return 0;
+				return MOD_RES_PASSTHRU;
 			}
 
-			active = t->IsModeSet('S') || t->IsExtBanned(user, 'S');
+			active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S'));
 		}
 
 		if (active)
@@ -133,17 +128,17 @@ class ModuleStripColor : public Module
 			this->ReplaceLine(text);
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult 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, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel +S mode (strip ansi colour)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 };