Fix the cloaking module on C++98 compilers.

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

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index d216bd11f87a87accdccc74b8b79a9be9db40158..bd63809ed5bfab1d282bc196708b6d5c619acbac 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -7,9 +7,9 @@
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2005, 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004, 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -51,7 +51,6 @@ class ModuleCensor : public Module
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
 
-               int numeric = 0;
                switch (target.type)
                {
                        case MessageTarget::TYPE_USER:
@@ -59,8 +58,6 @@ class ModuleCensor : public Module
                                User* targuser = target.Get<User>();
                                if (!targuser->IsModeSet(cu))
                                        return MOD_RES_PASSTHRU;
-
-                               numeric = ERR_CANTSENDTOUSER;
                                break;
                        }
 
@@ -73,8 +70,6 @@ class ModuleCensor : public Module
                                ModResult result = CheckExemption::Call(exemptionprov, user, targchan, "censor");
                                if (result == MOD_RES_ALLOW)
                                        return MOD_RES_PASSTHRU;
-
-                               numeric = ERR_CANNOTSENDTOCHAN;
                                break;
                        }
 
@@ -89,7 +84,11 @@ class ModuleCensor : public Module
                        {
                                if (index->second.empty())
                                {
-                                       user->WriteNumeric(numeric, target.GetName(), "Your message contained a censored word (" + index->first + "), and was blocked");
+                                       const std::string msg = InspIRCd::Format("Your message to this channel contained a banned phrase (%s) and was blocked.", index->first.c_str());
+                                       if (target.type == MessageTarget::TYPE_CHANNEL)
+                                               user->WriteNumeric(Numerics::CannotSendTo(target.Get<Channel>(), msg));
+                                       else
+                                               user->WriteNumeric(Numerics::CannotSendTo(target.Get<User>(), msg));
                                        return MOD_RES_DENY;
                                }
 
@@ -123,7 +122,7 @@ class ModuleCensor : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides user and channel mode +G", VF_VENDOR);
+               return Version("Allows the server administrator to define inappropriate phrases that are not allowed to be used in private or channel messages.", VF_VENDOR);
        }
 
 };