X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=1a596f5e0424b0332b344566e965ef9011132425;hb=aa05a6fd4d5c11dc8e8adc469134a2802446fe9f;hp=1d29bb5e137333b1c2f73ffe2772fc20b3b58f33;hpb=54d10d53c730ab81ca6464fe2f0e0ecbcd435672;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 1d29bb5e1..1a596f5e0 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -48,13 +48,13 @@ class SSLMode : public ModeHandler
 					if (!API)
 						return MODEACTION_DENY;
 
-					const UserMembList* userlist = channel->GetUsers();
-					for(UserMembCIter i = userlist->begin(); i != userlist->end(); i++)
+					const Channel::MemberMap& userlist = channel->GetUsers();
+					for (Channel::MemberMap::const_iterator i = userlist.begin(); i != userlist.end(); ++i)
 					{
 						ssl_cert* cert = API->GetCertificate(i->first);
-						if (!cert && !ServerInstance->ULine(i->first->server))
+						if (!cert && !i->first->server->IsULine())
 						{
-							source->WriteNumeric(ERR_ALLMUSTSSL, "%s %s :all members of the channel must be connected via SSL", source->nick.c_str(), channel->name.c_str());
+							source->WriteNumeric(ERR_ALLMUSTSSL, "%s :all members of the channel must be connected via SSL", channel->name.c_str());
 							return MODEACTION_DENY;
 						}
 					}
@@ -91,13 +91,6 @@ class ModuleSSLModes : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(sslm);
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnCheckBan, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if(chan && chan->IsModeSet(sslm))
@@ -114,7 +107,7 @@ class ModuleSSLModes : public Module
 			else
 			{
 				// Deny
-				user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick.c_str(), cname.c_str());
+				user->WriteNumeric(489, "%s :Cannot join channel; SSL users only (+z)", cname.c_str());
 				return MOD_RES_DENY;
 			}
 		}