Sync helpop chmodes s and p with docs

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

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index edafcd0712e982f83c4f7526772870dd0969dc59..9e30ceca2a95dc6a9b72a38ff7dc696728bedb5f 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,80 +1,88 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004, 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides support for oper-only chans via the +O channel mode */
+#include "inspircd.h"
 
-class OperChans : public ModeHandler
+enum
 {
- public:
-       /* This is an oper-only mode */
-       OperChans(Module* Creator) : ModeHandler(Creator, 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('O'))
-                       {
-                               channel->SetMode('O',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('O'))
-                       {
-                               channel->SetMode('O',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       // From UnrealIRCd.
+       ERR_CANTJOINOPERSONLY = 520
 };
 
 class ModuleOperChans : public Module
 {
-       OperChans oc;
+ private:
+       SimpleChannelModeHandler oc;
+       std::string space;
+       std::string underscore;
+
  public:
        ModuleOperChans()
-               : oc(this)
+               : oc(this, "operonly", 'O', true)
+               , space(" ")
+               , underscore("_")
        {
-               if (!ServerInstance->Modes->AddMode(&oc))
-                       throw ModuleException("Could not add new modes!");
-               ServerInstance->Modules->Attach(I_OnUserPreJoin, this);
        }
 
-       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
-               if (chan && chan->IsModeSet('O') && !IS_OPER(user))
+               if (chan && chan->IsModeSet(oc) && !user->IsOper())
                {
-                       user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join %s (+O is set)",
-                               user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+                       user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only server operators may join %s (+O is set)", chan->name.c_str()));
                        return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }
 
-       ~ModuleOperChans()
+       ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE
+       {
+               // Check whether the entry is an extban.
+               if (mask.length() <= 2 || mask[0] != 'O' || mask[1] != ':')
+                       return MOD_RES_PASSTHRU;
+
+               // If the user is not an oper they can't match this.
+               if (!user->IsOper())
+                       return MOD_RES_PASSTHRU;
+
+               // Replace spaces with underscores as they're prohibited in mode parameters.
+               std::string opername(user->oper->name);
+               stdalgo::string::replace_all(opername, space, underscore);
+               if (InspIRCd::Match(opername, mask.substr(2)))
+                       return MOD_RES_DENY;
+
+               return MOD_RES_PASSTHRU;
+       }
+
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               ServerInstance->Modes->DelMode(&oc);
+               tokens["EXTBAN"].push_back('O');
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for oper-only chans via the +O channel mode", VF_VENDOR | VF_COMMON, API_VERSION);
+               return Version("Adds channel mode O (operonly) which prevents non-server operators from joining the channel.", VF_VENDOR);
        }
 };