X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=aa764b18b67ca50f5c4cadf4e706edfcb76b1628;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=a416c059859127d2dfdc1e78f8504a27ae10cf3f;hpb=6985fb2b69872dd641f9f48ffae1c0ac4f185a2d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index a416c0598..aa764b18b 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -24,9 +24,38 @@ using namespace std;
 
 /* $ModDesc: Provides support for unreal-style channel mode +Q */
 
+class NoKicks : public ModeHandler
+{
+ public:
+	NoKicks() : ModeHandler('Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		if (adding)
+		{
+			if (!channel->IsModeSet('Q'))
+			{
+				channel->SetMode('Q',true);
+				return MODEACTION_ALLOW;
+			}
+		}
+		else
+		{
+			if (channel->IsModeSet('Q'))
+			{
+				channel->SetMode('Q',false);
+				return MODEACTION_ALLOW;
+			}
+		}
+
+		return MODEACTION_DENY;
+	}
+};
+
 class ModuleNoKicks : public Module
 {
 	Server *Srv;
+	NoKicks* nk;
 	
  public:
  
@@ -34,38 +63,25 @@ class ModuleNoKicks : public Module
 		: Module::Module(Me)
 	{
 		Srv = Me;
-		Srv->AddExtendedMode('Q',MT_CHANNEL,false,0,0);
+		nk = new NoKicks();
+		Srv->AddMode(nk, 'Q');
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnAccessCheck] = List[I_OnExtendedMode] = 1;
+		List[I_On005Numeric] = List[I_OnAccessCheck] = 1;
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "Q";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
-        }
+	virtual void On005Numeric(std::string &output)
+	{
+		InsertMode(output,"Q",4);
+	}
 
 	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
 	{
 		if (access_type == AC_KICK)
 		{
-			if (channel->IsCustomModeSet('Q'))
+			if (channel->IsModeSet('Q'))
 			{
 				if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")))
 				{
@@ -82,22 +98,10 @@ class ModuleNoKicks : public Module
 		}
 		return ACR_DEFAULT;
 	}
-	
-	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 == 'Q') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
 
 	virtual ~ModuleNoKicks()
 	{
+		DELETE(nk);
 	}
 	
 	virtual Version GetVersion()