Remove completed XXX: override is now only checked locally, snotices are automaticall...

[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 7f40c4ac9c9ccd1cfcdb170cda8faaa5b0d63072..6d63918941b3ff3be9331507855031cb724d54cb 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,11 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "configreader.h"
 
 /* $ModDesc: Provides support for channel mode +N which prevents nick changes on channel */
 
@@ -25,7 +20,7 @@ class NoNicks : public ModeHandler
  public:
        NoNicks(InspIRCd* Instance) : ModeHandler(Instance, 'N', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -57,39 +52,40 @@ class ModuleNoNickChange : public Module
        {
                
                nn = new NoNicks(ServerInstance);
-               ServerInstance->AddMode(nn, 'N');
+               ServerInstance->Modes->AddMode(nn);
+               Implementation eventlist[] = { I_OnUserPreNick };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
        
        virtual ~ModuleNoNickChange()
        {
                ServerInstance->Modes->DelMode(nn);
-               DELETE(nn);
+               delete nn;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreNick] = 1;
-       }
 
-       virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+       virtual int OnUserPreNick(User* user, const std::string &newnick)
        {
                if (IS_LOCAL(user))
                {
+                       if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
+                               return 0;
+
                        for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                        {
-                               chanrec* curr = i->first;
+                               Channel* curr = i->first;
 
                                if (curr->IsModeSet('N'))
                                {
                                        if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
                                                continue;
 
-                                       user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
+                                       user->WriteNumeric(447, "%s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
                                        return 1;
                                }
                        }
@@ -99,4 +95,4 @@ class ModuleNoNickChange : public Module
        }
 };
 
-MODULE_INIT(ModuleNoNickChange);
+MODULE_INIT(ModuleNoNickChange)