Some more text fixes and improvements (#1618).

[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 d9b4515674139be3c9fb53aa7e4905a36b2f3a09..8484d7dcc25cc658362d4d63768b5db0330a1b4e 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,86 +1,79 @@
-/*       +------------------------------------+
- *       | 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) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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 */
+enum
+{
+       // From UnrealIRCd.
+       ERR_CANTJOINOPERSONLY = 520
+};
 
-class OperChans : public ModeHandler
+class OperChans : public SimpleChannelModeHandler
 {
  public:
        /* This is an oper-only mode */
-       OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       OperChans(Module* Creator) : SimpleChannelModeHandler(Creator, "operonly", 'O')
        {
-               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;
+               oper = true;
        }
 };
 
 class ModuleOperChans : public Module
 {
-
-       OperChans* oc;
+       OperChans oc;
  public:
-       ModuleOperChans(InspIRCd* Me)
-               : Module(Me)
+       ModuleOperChans() : oc(this)
        {
-
-               oc = new OperChans(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(oc))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnCheckBan };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-
-       virtual int OnCheckBan(User* user, Channel* chan)
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
-               if (IS_OPER(user))
-                       return chan->GetExtBanStatus(user->oper, 'O');
-
-               if (chan->IsModeSet('O'))
-                       return -1;
+               if (chan && chan->IsModeSet(oc) && !user->IsOper())
+               {
+                       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;
+       }
 
-               return 0;
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
+       {
+               if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':'))
+               {
+                       if (user->IsOper() && InspIRCd::Match(user->oper->name, mask.substr(2)))
+                               return MOD_RES_DENY;
+               }
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleOperChans()
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               ServerInstance->Modes->DelMode(oc);
-               delete oc;
+               tokens["EXTBAN"].push_back('O');
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+               return Version("Provides support for oper-only channels via channel mode +O and extban 'O'", VF_VENDOR);
        }
 };