Only assign NewServices once the duplicate check is done.

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

diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
index 16b71e83e1744fa4fdac48b430c6c16e2c1ef913..2856579870839a2441b0f2a0b9e9b466ce932ad3 100644 (file)
--- a/src/modules/m_ircv3_ctctags.cpp
+++ b/src/modules/m_ircv3_ctctags.cpp
@@ -109,7 +109,10 @@ class CommandTagMsg : public Command
                // If the source isn't allowed to mass message users then reject
                // the attempt to mass-message users.
                if (!source->HasPrivPermission("users/mass-message"))
+               {
+                       source->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges");
                        return CMD_FAILURE;
+               }
 
                // Extract the server glob match from the target parameter.
                std::string servername(parameters[0], 1);
@@ -261,6 +264,7 @@ class C2CTags : public ClientProtocol::MessageTagProvider
        Cap::Capability& cap;
 
  public:
+       bool allowclientonlytags;
        C2CTags(Module* Creator, Cap::Capability& Cap)
                : ClientProtocol::MessageTagProvider(Creator)
                , cap(Cap)
@@ -271,7 +275,7 @@ class C2CTags : public ClientProtocol::MessageTagProvider
        {
                // A client-only tag is prefixed with a plus sign (+) and otherwise conforms
                // to the format specified in IRCv3.2 tags.
-               if (tagname[0] != '+' || tagname.length() < 2)
+               if (tagname[0] != '+' || tagname.length() < 2 || !allowclientonlytags)
                        return MOD_RES_PASSTHRU;
 
                // If the user is local then we check whether they have the message-tags cap
@@ -323,6 +327,17 @@ class ModuleIRCv3CTCTags
        {
        }
 
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               c2ctags.allowclientonlytags = ServerInstance->Config->ConfValue("ctctags")->getBool("allowclientonlytags", true);
+       }
+
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+       {
+               if (!c2ctags.allowclientonlytags)
+                       tokens["CLIENTTAGDENY"] = "*";
+       }
+
        ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
                return CopyClientTags(details.tags_in, details.tags_out);