X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_sslmodes.cpp;h=14bd748567b7597f6c4b7a2c51de0c90eeb52731;hb=563ad5acb0fb3d1aee5094989377d8b284d33d92;hp=36f1e428ab2d5f5b053aad24c0f2094e8c9a9f02;hpb=ce533b67e6c58c02f25b2f26214ab9cd2c7c99b6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 36f1e428a..14bd74856 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
@@ -27,7 +24,7 @@ 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)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
@@ -38,9 +35,9 @@ class SSLMode : public ModeHandler
 					CUList* userlist = channel->GetUsers();
 					for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
 					{
-						if(!i->first->GetExt("ssl", dummy))
+						if(!i->first->GetExt("ssl", dummy) && !ServerInstance->ULine(i->first->server))
 						{
-							source->WriteServ("490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
+							source->WriteNumeric(ERR_ALLMUSTSSL, "%s %s :all members of the channel must be connected via SSL", source->nick.c_str(), channel->name.c_str());
 							return MODEACTION_DENY;
 						}
 					}
@@ -68,26 +65,24 @@ class SSLMode : public ModeHandler
 
 class ModuleSSLModes : public Module
 {
-	
+
 	SSLMode* sslm;
-	
+
  public:
 	ModuleSSLModes(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-		
+
 
 		sslm = new SSLMode(ServerInstance);
-		if (!ServerInstance->AddMode(sslm, 'z'))
+		if (!ServerInstance->Modes->AddMode(sslm))
 			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreJoin] = 1;
-	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
 		if(chan && chan->IsModeSet('z'))
 		{
@@ -99,47 +94,26 @@ class ModuleSSLModes : public Module
 			else
 			{
 				// Deny
-				user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick, cname);
+				user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick.c_str(), cname);
 				return 1;
 			}
 		}
-		
+
 		return 0;
 	}
 
 	virtual ~ModuleSSLModes()
 	{
 		ServerInstance->Modes->DelMode(sslm);
-		DELETE(sslm);
+		delete sslm;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
 
-class ModuleSSLModesFactory : public ModuleFactory
-{
- public:
-	ModuleSSLModesFactory()
-	{
-	}
-	
-	~ModuleSSLModesFactory()
-	{
-	}
-	
-	virtual Module* CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSSLModes(Me);
-	}
-	
-};
-
+MODULE_INIT(ModuleSSLModes)
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSSLModesFactory;
-}