Include untranslated user/channel metadata in CHECK output

[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 263f87113d7b9097967f439e56603ee86820fe37..ccedd5aa29c56ca3f1434db31460039d1c3061ef 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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,24 +65,21 @@ class SSLMode : public ModeHandler
 
 class ModuleSSLModes : public Module
 {
-       
-       SSLMode* sslm;
-       
+
+       SSLMode sslm;
+
  public:
        ModuleSSLModes(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), sslm(Me)
        {
-               
-
-               sslm = new SSLMode(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(sslm))
+               if (!ServerInstance->Modes->AddMode(&sslm))
                        throw ModuleException("Could not add new modes!");
                Implementation eventlist[] = { I_OnUserPreJoin };
                ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
 
-       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,23 +91,22 @@ 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;
+               ServerInstance->Modes->DelMode(&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);
        }
 };