Update the exemptchanops module section in modules.conf.example with missing exemptions.

[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 f162ceb87d25c097895edac583e74aead037a896..67128e6bd59596076437feb3288f0e09034c52ae 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -23,6 +23,7 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 #include "modules/ssl.h"
 
 enum
@@ -134,7 +135,9 @@ class SSLModeUser : public ModeHandler
        }
 };
 
-class ModuleSSLModes : public Module
+class ModuleSSLModes
+       : public Module
+       , public CTCTags::EventListener
 {
  private:
        UserCertificateAPI api;
@@ -143,7 +146,8 @@ class ModuleSSLModes : public Module
 
  public:
        ModuleSSLModes()
-               : api(this)
+               : CTCTags::EventListener(this)
+               , api(this)
                , sslm(this, api)
                , sslquery(this, api)
        {
@@ -155,13 +159,13 @@ class ModuleSSLModes : public Module
                {
                        if (!api)
                        {
-                               user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; unable to determine if you are a SSL user (+z)");
+                               user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; unable to determine if you are an SSL user (+z is set)");
                                return MOD_RES_DENY;
                        }
 
                        if (!api->GetCertificate(user))
                        {
-                               user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; SSL users only (+z)");
+                               user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; SSL users only (+z is set)");
                                return MOD_RES_DENY;
                        }
                }
@@ -169,7 +173,7 @@ class ModuleSSLModes : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnUserPreMessage(User* user, const MessageTarget& msgtarget, MessageDetails& details) CXX11_OVERRIDE
+       ModResult HandleMessage(User* user, const MessageTarget& msgtarget)
        {
                if (msgtarget.type != MessageTarget::TYPE_USER)
                        return MOD_RES_PASSTHRU;
@@ -186,7 +190,7 @@ class ModuleSSLModes : public Module
                        if (!api || !api->GetCertificate(user))
                        {
                                /* The sending user is not on an SSL connection */
-                               user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You are not permitted to send private messages to this user (+z set)");
+                               user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You are not permitted to send private messages to this user (+z is set)");
                                return MOD_RES_DENY;
                        }
                }
@@ -195,7 +199,7 @@ class ModuleSSLModes : public Module
                {
                        if (!api || !api->GetCertificate(target))
                        {
-                               user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You must remove usermode 'z' before you are able to send private messages to a non-ssl user.");
+                               user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You must remove user mode 'z' before you are able to send private messages to a non-SSL user.");
                                return MOD_RES_DENY;
                        }
                }
@@ -203,6 +207,16 @@ class ModuleSSLModes : public Module
                return MOD_RES_PASSTHRU;
        }
 
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target);
+       }
+
+       ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target);
+       }
+
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
        {
                if ((mask.length() > 2) && (mask[0] == 'z') && (mask[1] == ':'))
@@ -221,7 +235,7 @@ class ModuleSSLModes : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides user and channel mode +z to allow for SSL-only channels, queries and notices.", VF_VENDOR);
+               return Version("Provides user and channel mode +z to allow for SSL-only channels, queries and notices", VF_VENDOR);
        }
 };