Get rid of Server::GetUsers(chanrec) - a throwback to before chanrec could do this...

[user/henk/code/inspircd.git] / src / modules / m_sslmodes.cpp

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index e0b3126e4e83161fdc8b72e8a6a515214771faf7..0d4b0e515bc37c629870d91d54cd32d93cc1267a 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -5,6 +5,8 @@
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
 
+static char* dummy;
+
 class SSLMode : public ModeHandler
 {
        Server* Srv;
@@ -17,13 +19,16 @@ 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->second->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);
@@ -76,7 +81,7 @@ class ModuleSSLModes : public Module
        {
                if(chan && chan->IsModeSet('z'))
                {
-                       if(user->GetExt("ssl"))
+                       if(user->GetExt("ssl", dummy))
                        {
                                // Let them in
                                return 0;
@@ -84,7 +89,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 (+z)", user->nick, cname);
                                return 1;
                        }
                }