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 be23649344433e7f5c6921c5d81e85979e65e017..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"
@@ -109,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'));
@@ -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);
        }