Some more text fixes and improvements (#1618).

[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 f4eb7f2a7042b0b4b6979559f76cd15884b5f8d0..a796495a81d95a0b6e72fb883a85a8efe996251c 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -1,97 +1,71 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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 which prevents nick changes on channel */
 
-class NoNicks : public ModeHandler
-{
- public:
-       NoNicks(InspIRCd* Instance) : ModeHandler(Instance, 'N', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-       {
-               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;
-       }
-};
+#include "inspircd.h"
+#include "modules/exemption.h"
 
 class ModuleNoNickChange : public Module
 {
-       NoNicks* nn;
+       CheckExemption::EventProvider exemptionprov;
+       SimpleChannelModeHandler nn;
  public:
-       ModuleNoNickChange(InspIRCd* Me)
-               : Module(Me)
+       ModuleNoNickChange()
+               : exemptionprov(this)
+               , nn(this, "nonick", 'N')
        {
-               
-               nn = new NoNicks(ServerInstance);
-               ServerInstance->Modes->AddMode(nn);
-               Implementation eventlist[] = { I_OnUserPreNick };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
-       
-       virtual ~ModuleNoNickChange()
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               ServerInstance->Modes->DelMode(nn);
-               delete nn;
+               return Version("Provides channel mode +N and extban 'N' which prevents nick changes on the channel", VF_VENDOR);
        }
-       
-       virtual Version GetVersion()
+
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
+               tokens["EXTBAN"].push_back('N');
        }
 
-
-       virtual int OnUserPreNick(User* user, const std::string &newnick)
+       ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
        {
-               if (IS_LOCAL(user))
+               for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
                {
-                       if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
-                               return 0;
+                       Channel* curr = (*i)->chan;
 
-                       for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
-                       {
-                               Channel* curr = i->first;
+                       ModResult res = CheckExemption::Call(exemptionprov, user, curr, "nonick");
+
+                       if (res == MOD_RES_ALLOW)
+                               continue;
 
-                               if (curr->IsModeSet('N'))
-                               {
-                                       if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
-                                               continue;
+                       if (user->HasPrivPermission("channels/ignore-nonicks"))
+                               continue;
 
-                                       user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
-                                       return 1;
-                               }
+                       if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn)))
+                       {
+                               user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Cannot change nickname while on %s (+N is set)",
+                                       curr->name.c_str()));
+                               return MOD_RES_DENY;
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 };