Just to mess with om's head, remove helperfuncs.h from everywhere

[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 a252dc6da2cd7fb2c641d87801497f0126dd0ad0..9d2a3d9eb666c9122ce70ca807b653b53873acb8 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -5,7 +5,7 @@
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *                <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -21,26 +21,60 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
+#include "configreader.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
 
+
+
+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)
+       {
+               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;
+       }
+};
+
 class ModuleNoNickChange : public Module
 {
-       Server *Srv;
+       
+       NoNicks* nn;
        
  public:
-       ModuleNoNickChange(Server* Me)
+       ModuleNoNickChange(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
                
-               Srv->AddExtendedMode('N',MT_CHANNEL,false,0,0);
+               nn = new NoNicks(ServerInstance);
+               ServerInstance->AddMode(nn, 'N');
        }
        
        virtual ~ModuleNoNickChange()
        {
+               DELETE(nn);
        }
        
        virtual Version GetVersion()
@@ -50,18 +84,18 @@ class ModuleNoNickChange : public Module
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreNick] = List[I_OnExtendedMode] = 1;
+               List[I_On005Numeric] = List[I_OnUserPreNick] = 1;
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
-               InsertMode(output,"N",4);
-        }
+       virtual void On005Numeric(std::string &output)
+       {
+               ServerInstance->Modes->InsertMode(output,"N",4);
+       }
        
-       virtual int OnUserPreNick(userrec* user, std::string newnick)
+       virtual int OnUserPreNick(userrec* user, const std::string &newnick)
        {
                irc::string server = user->server;
-               irc::string me = Srv->GetServerName().c_str();
+               irc::string me = ServerInstance->Config->ServerName;
                if (server == me)
                {
                        for (std::vector<ucrec*>::iterator i = user->chans.begin(); i != user->chans.end(); i++)
@@ -69,11 +103,11 @@ class ModuleNoNickChange : public Module
                                if (((ucrec*)(*i))->channel != NULL)
                                {
                                        chanrec* curr = ((ucrec*)(*i))->channel;
-                                       if ((curr->IsCustomModeSet('N')) && (!*user->oper))
+                                       if ((curr->IsModeSet('N')) && (!*user->oper))
                                        {
                                                // don't allow the nickchange, theyre on at least one channel with +N set
                                                // and theyre not an oper
-                                               WriteServ(user->fd,"447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
+                                               user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
                                                return 1;
                                        }
                                }
@@ -81,20 +115,6 @@ class ModuleNoNickChange : public Module
                }
                return 0;
        }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // check if this is our mode character...
-               if ((modechar == 'N') && (type == MT_CHANNEL))
-               {
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
-
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.
@@ -110,7 +130,7 @@ class ModuleNoNickChangeFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleNoNickChange(Me);
        }