Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

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

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 2a7656f2f81fce569685845b292f0e1730a7d645..f32964a44147102612baeffd0a368357d667d602 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -16,13 +16,9 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include <string>
-#include "helperfuncs.h"
-#include "hashcomp.h"
 #include "inspircd.h"
 
 static bool kludgeme = false;
@@ -31,22 +27,22 @@ static bool kludgeme = false;
 
 class Channel_r : public ModeHandler
 {
-       Server* Srv;
+       
  public:
-       Channel_r(Server* srv) : ModeHandler('r', 0, 0, false, MODETYPE_CHANNEL, false), Srv(srv) { }
+       Channel_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
                // only a u-lined server may add or remove the +r mode.
-               if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
+               if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
                {
-                       log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server);
+                       ServerInstance->Log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server);
                        channel->SetMode('r',adding);
                        return MODEACTION_ALLOW;
                }
                else
                {
-                       log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server);
+                       ServerInstance->Log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server);
                        source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r channel mode");
                        return MODEACTION_DENY;
                }
@@ -55,21 +51,21 @@ class Channel_r : public ModeHandler
 
 class User_r : public ModeHandler
 {
-       Server* Srv;
+       
  public:
-       User_r(Server* srv) : ModeHandler('r', 0, 0, false, MODETYPE_USER, false), Srv(srv) { }
+       User_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_USER, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
-               if ((kludgeme) || (Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
+               if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
                {
-                       log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server);
+                       ServerInstance->Log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server);
                        dest->SetMode('r',adding);
                        return MODEACTION_ALLOW;
                }
                else
                {
-                       log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server);
+                       ServerInstance->Log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server);
                        source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r user mode");
                        return MODEACTION_DENY;
                }
@@ -79,7 +75,7 @@ class User_r : public ModeHandler
 class Channel_R : public ModeHandler
 {
  public:
-       Channel_R() : ModeHandler('R', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       Channel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -107,7 +103,7 @@ class Channel_R : public ModeHandler
 class User_R : public ModeHandler
 {
  public:
-       User_R() : ModeHandler('R', 0, 0, false, MODETYPE_USER, false) { }
+       User_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -135,7 +131,7 @@ class User_R : public ModeHandler
 class Channel_M : public ModeHandler
 {
  public:
-       Channel_M() : ModeHandler('M', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       Channel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -162,35 +158,30 @@ class Channel_M : public ModeHandler
 
 class ModuleServices : public Module
 {
-       Server *Srv;
+       
        Channel_r* m1;
        Channel_R* m2;
        Channel_M* m3;
        User_r* m4;
        User_R* m5;
  public:
-       ModuleServices(Server* Me)
+       ModuleServices(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               m1 = new Channel_r(Me);
-               m2 = new Channel_R();
-               m3 = new Channel_M();
-               m4 = new User_r(Me);
-               m5 = new User_R();
-               Srv->AddMode(m1, 'r');
-               Srv->AddMode(m2, 'R');
-               Srv->AddMode(m3, 'M');
-               Srv->AddMode(m4, 'r');
-               Srv->AddMode(m5, 'R');
+               
+               m1 = new Channel_r(ServerInstance);
+               m2 = new Channel_R(ServerInstance);
+               m3 = new Channel_M(ServerInstance);
+               m4 = new User_r(ServerInstance);
+               m5 = new User_R(ServerInstance);
+               ServerInstance->AddMode(m1, 'r');
+               ServerInstance->AddMode(m2, 'R');
+               ServerInstance->AddMode(m3, 'M');
+               ServerInstance->AddMode(m4, 'r');
+               ServerInstance->AddMode(m5, 'R');
                kludgeme = false;
        }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output, "rRM", 4);
-       }
-
        /* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
        virtual void OnWhois(userrec* source, userrec* dest)
        {
@@ -203,7 +194,7 @@ class ModuleServices : public Module
 
        void Implements(char* List)
        {
-               List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
+               List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
        }
 
        virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
@@ -215,7 +206,7 @@ class ModuleServices : public Module
                        modechange[0] = user->nick;
                        modechange[1] = "-r";
                        kludgeme = true;
-                       Srv->SendMode(modechange,2,user);
+                       ServerInstance->SendMode(modechange,2,user);
                        kludgeme = false;
                }
        }
@@ -227,7 +218,7 @@ class ModuleServices : public Module
                        chanrec* c = (chanrec*)dest;
                        if ((c->IsModeSet('M')) && (!user->IsModeSet('r')))
                        {
-                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
+                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
@@ -242,7 +233,7 @@ class ModuleServices : public Module
                        userrec* u = (userrec*)dest;
                        if ((u->IsModeSet('R')) && (user->IsModeSet('r')))
                        {
-                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
@@ -268,7 +259,7 @@ class ModuleServices : public Module
                        {
                                if (user->IsModeSet('r'))
                                {
-                                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+                                       if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
                                        {
                                                // user is ulined, won't be stopped from joining
                                                return 0;
@@ -309,7 +300,7 @@ class ModuleServicesFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleServices(Me);
        }