X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=e772e212d40691903a656e62dc8bc8ee372f93b6;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=b97f099b9d39147526a96d6c9d88c8d377472d95;hpb=7aaae3c8425cbe963947f12092742d9044a36dac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index b97f099b9..e772e212d 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,14 +1,28 @@
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
 
+static char* dummy;
+
+/** Handle channel mode +z
+ */
 class SSLMode : public ModeHandler
 {
  public:
-	SSLMode() : ModeHandler('z', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	SSLMode(InspIRCd* Instance) : ModeHandler(Instance, 'z', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
@@ -16,15 +30,19 @@ class SSLMode : public ModeHandler
 		{
 			if (!channel->IsModeSet('z'))
 			{
-				chanuserlist userlist = Srv->GetUsers(channel);
-				for(unsigned int i = 0; i < userlist.size(); i++)
+				if (IS_LOCAL(source))
 				{
-					if(!userlist[i]->GetExt("ssl"))
+					CUList* userlist = channel->GetUsers();
+					for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
 					{
-						WriteServ(source->fd, "490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
-						return MODEACTION_DENY;
+						if(!i->first->GetExt("ssl", dummy))
+						{
+							source->WriteServ("490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
+							return MODEACTION_DENY;
+						}
 					}
 				}
+				channel->SetMode('z',true);
 				return MODEACTION_ALLOW;
 			}
 			else
@@ -34,41 +52,43 @@ class SSLMode : public ModeHandler
 		}
 		else
 		{
-			(channel->IsModeSet('z')) ? return MODEACTION_DENY : return MODEACTION_ALLOW;
+			if (channel->IsModeSet('z'))
+			{
+				channel->SetMode('z',false);
+				return MODEACTION_ALLOW;
+			}
+
+			return MODEACTION_DENY;
 		}
 	}
 };
 
 class ModuleSSLModes : public Module
 {
-	Server *Srv;
+	
 	SSLMode* sslm;
 	
  public:
-	ModuleSSLModes(Server* Me)
-		: Module::Module(Me)
+	ModuleSSLModes(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = Me;
+		
 
-		sslm = new SSLMode();
-		Srv->AddMode(sslm, 'z');
+		sslm = new SSLMode(ServerInstance);
+		if (!ServerInstance->AddMode(sslm, 'z'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+		List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output, "z", 4);
-	}
-	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
 	{
 		if(chan && chan->IsModeSet('z'))
 		{
-			if(user->GetExt("ssl"))
+			if(user->GetExt("ssl", dummy))
 			{
 				// Let them in
 				return 0;
@@ -76,7 +96,7 @@ class ModuleSSLModes : public Module
 			else
 			{
 				// Deny
-				WriteServ(user->fd, "489 %s %s :Cannot join channel (+z)", user->nick, cname);
+				user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick, cname);
 				return 1;
 			}
 		}
@@ -86,12 +106,13 @@ class ModuleSSLModes : public Module
 
 	virtual ~ModuleSSLModes()
 	{
+		ServerInstance->Modes->DelMode(sslm);
 		DELETE(sslm);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
@@ -107,7 +128,7 @@ class ModuleSSLModesFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module* CreateModule(Server* Me)
+	virtual Module* CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSSLModes(Me);
 	}
@@ -115,7 +136,7 @@ class ModuleSSLModesFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleSSLModesFactory;
 }