Sync helpop chmodes s and p with docs

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

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 4aec8bcdff932dbe22af8def4c2162d7717e172c..c7960c836d0ca6a5a77d7143440b21b3c7d59c5c 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -1,16 +1,17 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2020 Michael <michaelhazell@hotmail.com>
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 John Brooks <special@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2005, 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * 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
@@ -36,6 +37,10 @@ enum
        ERR_BADCHANNEL = 926
 };
 
+// Compatibility: Use glob matching?
+// InspIRCd versions 3.7.0 and below use only exact matching
+static bool glob = false;
+
 /** Holds a CBAN item
  */
 class CBan : public XLine
@@ -58,7 +63,10 @@ public:
 
        bool Matches(const std::string& s) CXX11_OVERRIDE
        {
-               return irc::equals(matchtext, s);
+               if (glob)
+                       return InspIRCd::Match(s, matchtext);
+               else
+                       return irc::equals(matchtext, s);
        }
 
        const std::string& Displayable() CXX11_OVERRIDE
@@ -75,7 +83,7 @@ class CBanFactory : public XLineFactory
        CBanFactory() : XLineFactory("CBAN") { }
 
        /** Generate a CBAN
-       */
+       */
        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
        {
                return new CBan(set_time, duration, source, reason, xline_specific_mask);
@@ -94,7 +102,8 @@ class CommandCBan : public Command
  public:
        CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3)
        {
-               flags_needed = 'o'; this->syntax = "<channel> [<duration> [:<reason>]]";
+               flags_needed = 'o';
+               this->syntax = "<channelmask> [<duration> [:<reason>]]";
        }
 
        CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
@@ -183,6 +192,14 @@ class ModuleCBan : public Module, public Stats::EventListener
                ServerInstance->XLines->UnregisterFactory(&f);
        }
 
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("cban");
+
+               // XXX: Consider changing default behavior on the next major version
+               glob = tag->getBool("glob", false);
+       }
+
        ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE
        {
                if (stats.GetSymbol() != 'C')
@@ -201,7 +218,7 @@ class ModuleCBan : public Module, public Stats::EventListener
                        // Channel is banned.
                        user->WriteNumeric(ERR_BADCHANNEL, cname, InspIRCd::Format("Channel %s is CBANed: %s", cname.c_str(), rl->reason.c_str()));
                        ServerInstance->SNO->WriteGlobalSno('a', "%s tried to join %s which is CBANed (%s)",
-                                user->nick.c_str(), cname.c_str(), rl->reason.c_str());
+                               user->nick.c_str(), cname.c_str(), rl->reason.c_str());
                        return MOD_RES_DENY;
                }
 
@@ -210,7 +227,7 @@ class ModuleCBan : public Module, public Stats::EventListener
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Adds the /CBAN command which allows server operators to prevent channels matching a glob from being created.", VF_COMMON | VF_VENDOR);
+               return Version("Adds the /CBAN command which allows server operators to prevent channels matching a glob from being created.", VF_COMMON | VF_VENDOR, glob ? "glob" : "");
        }
 };