The module hook is kinda required.

[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 8e043916906fdec702e963b6a445da5fbfd4d763..17deb586a8962c4ea9e88d67c4113738bd1db57e 100644 (file)
--- 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->WriteNumeric(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))
@@ -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, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };