X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=171e7045aa3ff051462375c694279c26bc471c48;hb=d70ae11ab22d10e40cae525ff28022e596a7c6f0;hp=dc4263335ef719d9afc0baa29c2b4dc55be6083f;hpb=740b09e2aee345c6fde199986d8eab6e0db224e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index dc4263335..171e7045a 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -14,11 +14,14 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
@@ -40,9 +43,9 @@ void handle_knock(char **parameters, int pcnt, userrec *user)
 		WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
 		return;
 	}
-	if (c->inviteonly)
+	if (c->binarymodes & CM_INVITEONLY)
 	{
-		WriteChannelWithServ((char*)Srv->GetServerName().c_str(),c,user,"NOTICE %s :User %s is KNOCKing on %s (%s)",c->name,user->nick,c->name,line.c_str());
+		WriteChannelWithServ((char*)Srv->GetServerName().c_str(),c,"NOTICE %s :User %s is KNOCKing on %s (%s)",c->name,user->nick,c->name,line.c_str());
 		WriteServ(user->fd,"NOTICE %s :KNOCKing on %s",user->nick,c->name);
 		return;
 	}
@@ -62,9 +65,31 @@ class ModuleKnock : public Module
 		Srv = new Server;
 		
 		Srv->AddExtendedMode('K',MT_CHANNEL,false,0,0);
-		Srv->AddCommand("KNOCK",handle_knock,0,2);
+		Srv->AddCommand("KNOCK",handle_knock,0,2,"m_knock.so");
 	}
-	
+
+        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 + "K";
+                        }
+                        temp2 = temp2 + temp1 + " ";
+                }
+		if (temp2.length())
+		{
+	                output = temp2.substr(0,temp2.length()-1) + std::string(" KNOCK");
+		}
+		else output = output + std::string(" KNOCK");
+        }
+
 	virtual ~ModuleKnock()
 	{
 		delete Srv;
@@ -72,7 +97,7 @@ class ModuleKnock : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1);
+		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
 	}
 	
 	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)