X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=b4e535d9b269505fe64c3bad2759cc778d8a17cc;hb=3a7023f2c595d14778b3f1f7e53d3914698dd500;hp=156695be9284b1888cf1d20e51fb7c2d7bbf9965;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 156695be9..b4e535d9b 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -25,7 +25,7 @@ using namespace std;
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-Server *Srv;
+static Server *Srv;
 
 class cmd_knock : public command_t
 {
@@ -35,23 +35,31 @@ class cmd_knock : public command_t
 		this->source = "m_knock.so";
 	}
 	
-	void Handle (char **parameters, int pcnt, userrec *user)
+	void Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		chanrec* c = Srv->FindChannel(parameters[0]);
-		std::string line = "";
 
-		for (int i = 1; i < pcnt - 1; i++)
+		if (!c)
 		{
-			line = line + std::string(parameters[i]) + " ";
+			WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]);
+			return;
 		}
-		line = line + std::string(parameters[pcnt-1]);
 
-		if (c->IsCustomModeSet('K'))
+		std::string line = "";
+
+		if (c->IsModeSet('K'))
 		{
 			WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
 			return;
 		}
-		if (c->binarymodes & CM_INVITEONLY)
+
+		for (int i = 1; i < pcnt - 1; i++)
+		{
+			line = line + std::string(parameters[i]) + " ";
+		}
+		line = line + std::string(parameters[pcnt-1]);
+
+		if (c->modes[CM_INVITEONLY])
 		{
 			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);
@@ -65,68 +73,67 @@ class cmd_knock : public command_t
 	}
 };
 
+class Knock : public ModeHandler
+{
+ public:
+	Knock() : ModeHandler('K', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		if (adding)
+		{
+			if (!channel->IsModeSet('K'))
+			{
+				channel->SetMode('K',true);
+				return MODEACTION_ALLOW;
+			}
+		}
+		else
+		{
+			if (channel->IsModeSet('K'))
+			{
+				channel->SetMode('K',false);
+				return MODEACTION_ALLOW;
+			}
+		}
+
+		return MODEACTION_DENY;
+	}
+};
+
 class ModuleKnock : public Module
 {
 	cmd_knock* mycommand;
+	Knock* kn;
  public:
-	ModuleKnock(Server* Me)
-		: Module::Module(Me)
+	ModuleKnock(Server* Me) : Module::Module(Me)
 	{
 		Srv = Me;
-		Srv->AddExtendedMode('K',MT_CHANNEL,false,0,0);
+		kn = new Knock();
+		Srv->AddMode(kn, 'K');
 		mycommand = new cmd_knock();
 		Srv->AddCommand(mycommand);
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
+		List[I_On005Numeric] = 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 + "K";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-		{
-	                output = temp2.substr(0,temp2.length()-1) + std::string(" KNOCK");
-		}
-		else output = output + std::string(" KNOCK");
-        }
+	virtual void On005Numeric(std::string &output)
+	{
+		InsertMode(output,"K",4);
+	}
 
 	virtual ~ModuleKnock()
 	{
+		DELETE(kn);
 	}
-	
+
 	virtual Version GetVersion()
 	{
 		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)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'K') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.