Speaking of forgetting things, someone forgot to change the name of the function

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

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 354fe7a8d89f567509d7ba40a66eae12ac0df8b0..0d66f0202087ffb6091c805fe647ee75810487e1 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -6,7 +6,9 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "configreader.h"
+#include "commands.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel */
@@ -17,17 +19,14 @@
  * eg: +h can remove +hv and users with no modes. +a can remove +aohv and users with no modes.
 */
 
-extern InspIRCd* ServerInstance;
-
 class RemoveBase
 {
  private: 
-       Server* Srv;
        bool& supportnokicks;
+       InspIRCd* ServerInstance;
  
  protected:
-       RemoveBase(Server* Me, bool& snk)
-       : Srv(Me), supportnokicks(snk)
+       RemoveBase(InspIRCd* Instance, bool& snk) : supportnokicks(snk), ServerInstance(Instance)
        {
        }               
  
@@ -110,50 +109,50 @@ class RemoveBase
                protectkey = "cm_protect_" + std::string(channel->name);
                founderkey = "cm_founder_" + std::string(channel->name);
                
-               if (Srv->IsUlined(user->server) || Srv->IsUlined(user->nick))
+               if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick))
                {
-                       log(DEBUG, "Setting ulevel to U");
+                       ServerInstance->Log(DEBUG, "Setting ulevel to U");
                        ulevel = chartolevel("U");
                }
                if (user->GetExt(founderkey))
                {
-                       log(DEBUG, "Setting ulevel to ~");
+                       ServerInstance->Log(DEBUG, "Setting ulevel to ~");
                        ulevel = chartolevel("~");
                }
                else if (user->GetExt(protectkey))
                {
-                       log(DEBUG, "Setting ulevel to &");
+                       ServerInstance->Log(DEBUG, "Setting ulevel to &");
                        ulevel = chartolevel("&");
                }
                else
                {
-                       log(DEBUG, "Setting ulevel to %s", channel->GetStatusChar(user));
-                       ulevel = chartolevel(channel->GetStatusChar(user));
+                       ServerInstance->Log(DEBUG, "Setting ulevel to %s", channel->GetPrefixChar(user));
+                       ulevel = chartolevel(channel->GetPrefixChar(user));
                }
                        
                /* Now it's the same idea, except for the target. If they're ulined make sure they get a higher level than the sender can */
-               if (Srv->IsUlined(target->server) || Srv->IsUlined(target->nick))
+               if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick))
                {
-                       log(DEBUG, "Setting tlevel to U");
+                       ServerInstance->Log(DEBUG, "Setting tlevel to U");
                        tlevel = chartolevel("U");
                }
                else if (target->GetExt(founderkey))
                {
-                       log(DEBUG, "Setting tlevel to ~");
+                       ServerInstance->Log(DEBUG, "Setting tlevel to ~");
                        tlevel = chartolevel("~");
                }
                else if (target->GetExt(protectkey))
                {
-                       log(DEBUG, "Setting tlevel to &");
+                       ServerInstance->Log(DEBUG, "Setting tlevel to &");
                        tlevel = chartolevel("&");
                }
                else
                {
-                       log(DEBUG, "Setting tlevel to %s", channel->GetStatusChar(target));
-                       tlevel = chartolevel(channel->GetStatusChar(target));
+                       ServerInstance->Log(DEBUG, "Setting tlevel to %s", channel->GetPrefixChar(target));
+                       tlevel = chartolevel(channel->GetPrefixChar(target));
                }
                
-               hasnokicks = (Srv->FindModule("m_nokicks.so") && channel->IsModeSet('Q'));
+               hasnokicks = (ServerInstance->FindModule("m_nokicks.so") && channel->IsModeSet('Q'));
                
                /* We support the +Q channel mode via. the m_nokicks module, if the module is loaded and the mode is set then disallow the /remove */
                if(!supportnokicks || !hasnokicks || (ulevel == ULINE))
@@ -185,7 +184,7 @@ class RemoveBase
                                /* Build up the part reason string. */
                                reason << "Removed by " << user->nick << reasonparam;
 
-                               channel->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick);
+                               channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick);
                                target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick, user->nick, channel->name, reasonparam.c_str());
 
                                if (!channel->PartUser(target, reason.str().c_str()))
@@ -207,7 +206,7 @@ class RemoveBase
 class cmd_remove : public command_t, public RemoveBase
 {
  public:
-       cmd_remove(Server* Srv, bool& snk) : command_t("REMOVE", 0, 2), RemoveBase(Srv, snk)
+       cmd_remove(InspIRCd* Instance, bool& snk) : command_t(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
        {
                this->source = "m_remove.so";
                syntax = "<nick> <channel> [<reason>]";
@@ -222,7 +221,7 @@ class cmd_remove : public command_t, public RemoveBase
 class cmd_fpart : public command_t, public RemoveBase
 {
  public:
-       cmd_fpart(Server* Srv, bool snk) : command_t("FPART", 0, 2), RemoveBase(Srv, snk)
+       cmd_fpart(InspIRCd* Instance, bool& snk) : command_t(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
        {
                this->source = "m_remove.so";
                syntax = "<channel> <nick> [<reason>]";
@@ -231,7 +230,7 @@ class cmd_fpart : public command_t, public RemoveBase
        void Handle (const char** parameters, int pcnt, userrec *user)
        {
                RemoveBase::Handle(parameters, pcnt, user, true);
-       }       
+       }
 };
 
 class ModuleRemove : public Module
@@ -240,14 +239,15 @@ class ModuleRemove : public Module
        cmd_fpart* mycommand2;
        bool supportnokicks;
        
+       
  public:
-       ModuleRemove(Server* Me)
+       ModuleRemove(InspIRCd* Me)
        : Module::Module(Me)
        {
-               mycommand = new cmd_remove(Me, supportnokicks);
-               mycommand2 = new cmd_fpart(Me, supportnokicks);
-               Me->AddCommand(mycommand);
-               Me->AddCommand(mycommand2);
+               mycommand = new cmd_remove(ServerInstance, supportnokicks);
+               mycommand2 = new cmd_fpart(ServerInstance, supportnokicks);
+               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(mycommand2);
                OnRehash("");
        }
 
@@ -263,8 +263,7 @@ class ModuleRemove : public Module
        
        virtual void OnRehash(const std::string&)
        {
-               ConfigReader conf;
-               
+               ConfigReader conf(ServerInstance);
                supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
        }
        
@@ -294,7 +293,7 @@ class ModuleRemoveFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleRemove(Me);
        }