None of the modules use an extern InspIRCd* any more

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 64ea36c48dcfd531f72c894589cd82f72752956e..efcf7629ad33c008de7ad5c3611f2f68c5915999 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -23,13 +23,16 @@ using namespace std;
 #include <string>
 #include "helperfuncs.h"
 #include "hashcomp.h"
+#include "inspircd.h"
 
 /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */
 
+
+
 class AChannel_R : public ModeHandler
 {
  public:
-       AChannel_R() : ModeHandler('R', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       AChannel_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)
        {
@@ -57,7 +60,7 @@ class AChannel_R : public ModeHandler
 class AUser_R : public ModeHandler
 {
  public:
-       AUser_R() : ModeHandler('R', 0, 0, false, MODETYPE_USER, false) { }
+       AUser_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)
        {
@@ -85,7 +88,7 @@ class AUser_R : public ModeHandler
 class AChannel_M : public ModeHandler
 {
  public:
-       AChannel_M() : ModeHandler('M', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       AChannel_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)
        {
@@ -112,25 +115,25 @@ class AChannel_M : public ModeHandler
 
 class ModuleServicesAccount : public Module
 {
-       Server *Srv; 
+        
        AChannel_R* m1;
        AChannel_M* m2;
        AUser_R* m3;
  public:
-       ModuleServicesAccount(Server* Me) : Module::Module(Me)
+       ModuleServicesAccount(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               m1 = new AChannel_R();
-               m2 = new AChannel_M();
-               m3 = new AUser_R();
-               Srv->AddMode(m1, 'R');
-               Srv->AddMode(m2, 'M');
-               Srv->AddMode(m3, 'R');
+               
+               m1 = new AChannel_R(ServerInstance);
+               m2 = new AChannel_M(ServerInstance);
+               m3 = new AUser_R(ServerInstance);
+               ServerInstance->AddMode(m1, 'R');
+               ServerInstance->AddMode(m2, 'M');
+               ServerInstance->AddMode(m3, 'R');
        }
 
        virtual void On005Numeric(std::string &output)
        {
-               InsertMode(output, "RM", 4);
+               ServerInstance->ModeGrok->InsertMode(output, "RM", 4);
        }
 
        /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
@@ -141,7 +144,7 @@ class ModuleServicesAccount : public Module
 
                if (account)
                {
-                       WriteServ(source->fd, "330 %s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
+                       source->WriteServ("330 %s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
                }
        }
 
@@ -162,14 +165,14 @@ class ModuleServicesAccount : public Module
                        
                        if ((c->IsModeSet('M')) && (!account))
                        {
-                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
+                               if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)) || (!strcmp(user->server,"")))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
                                }
 
                                // user messaging a +M channel and is not registered
-                               Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
+                               user->WriteServ("477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
                                return 1;
                        }
                }
@@ -179,14 +182,14 @@ class ModuleServicesAccount : public Module
                        
                        if ((u->modes['R'-65]) && (!account))
                        {
-                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+                               if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
                                }
 
                                // user messaging a +R user and is not registered
-                               Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
+                               user->WriteServ("477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
                                return 1;
                        }
                }
@@ -209,13 +212,13 @@ class ModuleServicesAccount : public Module
                        {
                                if (!account)
                                {
-                                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+                                       if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)))
                                        {
                                                // user is ulined, won't be stopped from joining
                                                return 0;
                                        }
                                        // joining a +R channel and not identified
-                                       Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
+                                       user->WriteServ("477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
                                        return 1;
                                }
                        }
@@ -335,7 +338,7 @@ class ModuleServicesAccountFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleServicesAccount(Me);
        }