All modules which implement simplemodes (no parameters, not a list mode) can now...

[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 492cd5bd04620c4d6a63f8c59a9173c9f788c1c4..95c4543476b3de0ce29ebabad842d6d4cbf9f182 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -1,14 +1,27 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                     E-mail:
+ *              <brain@chatspike.net>
+ *              <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 /* Support for a dancer-style /remove command, an alternative to /kick to try and avoid auto-rejoin-on-kick scripts */
 /* Written by Om, 25-03-05 */
 
 #include <sstream>
-#include <string>
 #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 */
@@ -109,7 +122,7 @@ 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))
                {
                        ServerInstance->Log(DEBUG, "Setting ulevel to U");
                        ulevel = chartolevel("U");
@@ -126,12 +139,12 @@ class RemoveBase
                }
                else
                {
-                       ServerInstance->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))
                {
                        ServerInstance->Log(DEBUG, "Setting tlevel to U");
                        tlevel = chartolevel("U");
@@ -148,8 +161,8 @@ class RemoveBase
                }
                else
                {
-                       ServerInstance->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'));