X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=6c164f03a4f366ea6f1201efd91417df9caa5189;hb=43fe72edad4c5dfd1a3a700bea17c8ee7a7c3d8e;hp=07b26d8e7e66bdab5f6bbdba546cd30138b6bce5;hpb=5b949866d429203ae48f2088e4f97592755592c6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 07b26d8e7..6c164f03a 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,25 +1,61 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *           	  <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
 
+#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +Q */
 
 class ModuleNoKicks : public Module
 {
 	Server *Srv;
-	bool NoisyNoKicks;
-	ConfigReader *Conf;
 	
  public:
  
-	ModuleNoKicks()
+	ModuleNoKicks(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
+		Srv = Me;
 		Srv->AddExtendedMode('Q',MT_CHANNEL,false,0,0);
 	}
-	
+
+        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 int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
 	{
 		if (access_type == AC_KICK)
@@ -34,6 +70,7 @@ class ModuleNoKicks : public Module
 				else
 				{
 					// nobody else can (not even opers with override, and founders)
+					WriteServ(source->fd,"484 %s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
 					return ACR_DENY;
 				}
 			}
@@ -41,14 +78,26 @@ 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 Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
 	}
 };
 
@@ -64,9 +113,9 @@ class ModuleNoKicksFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleNoKicks;
+		return new ModuleNoKicks(Me);
 	}
 	
 };