Sync helpop chmodes s and p with docs

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

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index cc4172529c53e18ca29908fdbc86911858065344..04962558c027a70d55c8b9932aa81ca2b9aecef6 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -1,11 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *.  Copyright (C) 2018 Peter Powell <petpow@saberuk.com>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2005 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2005, 2007, 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
@@ -120,9 +124,18 @@ class ModuleDenyChannels : public Module
                                continue;
 
                        // If the redirect channel is whitelisted then it is okay.
+                       bool whitelisted = false;
                        for (GoodChannels::const_iterator j = goodchans.begin(); j != goodchans.end(); ++j)
+                       {
                                if (InspIRCd::Match(badchan.redirect, *j))
-                                       continue;
+                               {
+                                       whitelisted = true;
+                                       break;
+                               }
+                       }
+
+                       if (whitelisted)
+                               continue;
 
                        // If the redirect channel is not blacklisted then it is okay.
                        for (BadChannels::const_iterator j = badchans.begin(); j != badchans.end(); ++j)
@@ -137,7 +150,7 @@ class ModuleDenyChannels : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR);
+               return Version("Allows the server administrator to prevent users from joining channels matching a glob.", VF_VENDOR);
        }