X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=17deb586a8962c4ea9e88d67c4113738bd1db57e;hb=697098bb47651b40ed9c768361d1a3b1ca452856;hp=8ec346db25bd07476fe2a70b2ae93aab466f3709;hpb=e21ee18e62aecee6d27a0f9ba497a52688cb8349;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 8ec346db2..17deb586a 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -35,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;
 						}
 					}
@@ -65,14 +65,14 @@ class SSLMode : public ModeHandler
 
 class ModuleSSLModes : public Module
 {
-	
+
 	SSLMode* sslm;
-	
+
  public:
 	ModuleSSLModes(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 
 		sslm = new SSLMode(ServerInstance);
 		if (!ServerInstance->Modes->AddMode(sslm))
@@ -82,7 +82,7 @@ class ModuleSSLModes : public Module
 	}
 
 
-	virtual int OnUserPreJoin(User* user, Channel* 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'))
 		{
@@ -94,11 +94,11 @@ 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;
 	}
 
@@ -107,10 +107,10 @@ class ModuleSSLModes : public Module
 		ServerInstance->Modes->DelMode(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);
 	}
 };