X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=c8eee5a0362fceade3cc1ae5615f1e4f22bb6e14;hb=fed58f5c25915d60d40c0f407914ff7381902f9d;hp=dbcf194fac04c3eb6a500d874a13db02b5235deb;hpb=afe6632ff046feb91884c89e61587e94863d21cd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index dbcf194fa..c8eee5a03 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,37 +1,97 @@
+/*       +------------------------------------+
+ *       | 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"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
 
+static char* dummy;
+
+/** Handle channel mode +z
+ */
+class SSLMode : public ModeHandler
+{
+ public:
+	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)
+	{
+		if (adding)
+		{
+			if (!channel->IsModeSet('z'))
+			{
+				if (IS_LOCAL(source))
+				{
+					CUList* userlist = channel->GetUsers();
+					for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
+					{
+						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
+			{
+				return MODEACTION_DENY;
+			}
+		}
+		else
+		{
+			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;
-		Srv->AddExtendedMode('z', MT_CHANNEL, false, 0, 0);
+		
+
+		sslm = new SSLMode(ServerInstance);
+		if (!ServerInstance->AddMode(sslm, 'z'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+		List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
 	{
-		output.insert(output.find(" ", output.find("CHANMODES=", 0)), "z");
-	}
-	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
-	{
-		if(chan && chan->IsCustomModeSet('z'))
+		if(chan && chan->IsModeSet('z'))
 		{
-			if(user->GetExt("ssl"))
+			if(user->GetExt("ssl", dummy))
 			{
 				// Let them in
 				return 0;
@@ -39,47 +99,23 @@ 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;
 			}
 		}
 		
 		return 0;
 	}
-	
-	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 == 'z') && (type == MT_CHANNEL))
-  		{
-  			chanrec* chan = (chanrec*)target;
-  			
-  			chanuserlist userlist = Srv->GetUsers(chan);
-  			
-  			for(unsigned int i = 0; i < userlist.size(); i++)
-  			{
-  				if(!userlist[i]->GetExt("ssl"))
-  				{
-  					WriteServ(user->fd, "974 %s %s :all members must be connected via SSL", user->nick, chan->name);
-  					return 0;
-  				}
-  			}
-  			
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
 
 	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);
 	}
 };
 
@@ -95,7 +131,7 @@ class ModuleSSLModesFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module* CreateModule(Server* Me)
+	virtual Module* CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSSLModes(Me);
 	}
@@ -103,7 +139,7 @@ class ModuleSSLModesFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleSSLModesFactory;
 }