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 9b7d1817ca081d380a408305749ea3a6437d8984..0d66f0202087ffb6091c805fe647ee75810487e1 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -6,7 +6,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "configreader.h"
 #include "commands.h"
 #include "inspircd.h"
@@ -19,15 +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: 
        bool& supportnokicks;
+       InspIRCd* ServerInstance;
  
  protected:
-       RemoveBase(bool& snk) : supportnokicks(snk)
+       RemoveBase(InspIRCd* Instance, bool& snk) : supportnokicks(snk), ServerInstance(Instance)
        {
        }               
  
@@ -110,47 +109,47 @@ class RemoveBase
                protectkey = "cm_protect_" + std::string(channel->name);
                founderkey = "cm_founder_" + std::string(channel->name);
                
-               if (is_uline(user->server) || is_uline(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 (is_uline(target->server) || is_uline(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 = (ServerInstance->FindModule("m_nokicks.so") && channel->IsModeSet('Q'));
@@ -207,7 +206,7 @@ class RemoveBase
 class cmd_remove : public command_t, public RemoveBase
 {
  public:
-       cmd_remove(bool& snk) : command_t("REMOVE", 0, 2), RemoveBase(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(bool& snk) : command_t("FPART", 0, 2), RemoveBase(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>]";
@@ -239,16 +238,16 @@ class ModuleRemove : public Module
        cmd_remove* mycommand;
        cmd_fpart* mycommand2;
        bool supportnokicks;
-       Server* Srv;
+       
        
  public:
        ModuleRemove(InspIRCd* Me)
        : Module::Module(Me)
        {
-               mycommand = new cmd_remove(supportnokicks);
-               mycommand2 = new cmd_fpart(supportnokicks);
-               Srv->AddCommand(mycommand);
-               Srv->AddCommand(mycommand2);
+               mycommand = new cmd_remove(ServerInstance, supportnokicks);
+               mycommand2 = new cmd_fpart(ServerInstance, supportnokicks);
+               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(mycommand2);
                OnRehash("");
        }
 
@@ -264,8 +263,7 @@ class ModuleRemove : public Module
        
        virtual void OnRehash(const std::string&)
        {
-               ConfigReader conf;
-               
+               ConfigReader conf(ServerInstance);
                supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
        }