Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters

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

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index e811b8e67c1c5a9c8e1df8fd01482481448644b0..d4da3e95139b251dc5f8b7add2321d5c55579c6c 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -1,103 +1,80 @@
-/*       +------------------------------------+
- *       | 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) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   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 channel mode +N & extban +b N: which prevents nick changes on channel */
+#include "inspircd.h"
 
-class NoNicks : public ModeHandler
+class NoNicks : public SimpleChannelModeHandler
 {
  public:
-       NoNicks(Module* Creator) : ModeHandler(Creator, "nonick", 'N', PARAM_NONE, MODETYPE_CHANNEL) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('N'))
-                       {
-                               channel->SetMode('N',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('N'))
-                       {
-                               channel->SetMode('N',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       NoNicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nonick", 'N') { }
 };
 
 class ModuleNoNickChange : public Module
 {
        NoNicks nn;
+       bool override;
  public:
        ModuleNoNickChange() : nn(this)
        {
-               ServerInstance->Modes->AddMode(&nn);
-               Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual ~ModuleNoNickChange()
+       Version GetVersion() CXX11_OVERRIDE
        {
+               return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
        }
 
-       virtual Version GetVersion()
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR, API_VERSION);
+               tokens["EXTBAN"].push_back('N');
        }
 
-
-       virtual void On005Numeric(std::string &output)
+       ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('N');
-       }
-
-       virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
-       {
-               if (!IS_LOCAL(user))
-                       return MOD_RES_PASSTHRU;
-
-               if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
-                       return MOD_RES_PASSTHRU;
+               for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
+               {
+                       Channel* curr = (*i)->chan;
 
-               // Allow forced nick changes.
-               if (User::NICKForced.get(user))
-                       return MOD_RES_PASSTHRU;
+                       ModResult res = ServerInstance->OnCheckExemption(user,curr,"nonick");
 
-               for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
-               {
-                       Channel* curr = *i;
+                       if (res == MOD_RES_ALLOW)
+                               continue;
 
-                       if (CHANOPS_EXEMPT('N') && curr->GetPrefixValue(user) == OP_VALUE)
+                       if (override && user->IsOper())
                                continue;
 
-                       if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
+                       if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn)))
                        {
-                               user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)",
-                                       user->nick.c_str(), curr->name.c_str());
+                               user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Can't change nickname while on %s (+N is set)",
+                                       curr->name.c_str()));
                                return MOD_RES_DENY;
                        }
                }
 
                return MOD_RES_PASSTHRU;
        }
+
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               override = ServerInstance->Config->ConfValue("nonicks")->getBool("operoverride", false);
+       }
 };
 
 MODULE_INIT(ModuleNoNickChange)