Annotations

[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 18bddd01549ece8f9c8cb2754e716ba088775596..36f05645173289c2e4e3507889768fc62ef227d8 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 */
@@ -64,7 +77,7 @@ class RemoveBase
                }
        }
        
-       void Handle (const char** parameters, int pcnt, userrec *user, bool neworder)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user, bool neworder)
        {
                const char* channame;
                const char* username;
@@ -95,13 +108,13 @@ class RemoveBase
                if (!target || !channel)
                {
                        user->WriteServ("401 %s %s :No such nick/channel", user->nick, !target ? username : channame);
-                       return;
+                       return CMD_FAILURE;
                }
 
                if (!channel->HasUser(target))
                {
                        user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick, target->nick, channel->name);
-                       return;
+                       return CMD_FAILURE;
                }       
                
                /* This is adding support for the +q and +a channel modes, basically if they are enabled, and the remover has them set.
@@ -109,7 +122,7 @@ class RemoveBase
                protectkey = "cm_protect_" + std::string(channel->name);
                founderkey = "cm_founder_" + std::string(channel->name);
                
-               if (ServerInstance->is_uline(user->server) || ServerInstance->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 (ServerInstance->is_uline(target->server) || ServerInstance->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'));
@@ -193,13 +206,17 @@ class RemoveBase
                        else
                        {
                                user->WriteServ( "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick, target->nick, channel->name);
+                               return CMD_FAILURE;
                        }
                }
                else
                {
                        /* m_nokicks.so was loaded and +Q was set, block! */
                        user->WriteServ( "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick, channel->name, target->nick);
+                       return CMD_FAILURE;
                }
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -212,9 +229,9 @@ class cmd_remove : public command_t, public RemoveBase
                syntax = "<nick> <channel> [<reason>]";
        }
        
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               RemoveBase::Handle(parameters, pcnt, user, false);
+               return RemoveBase::Handle(parameters, pcnt, user, false);
        }
 };
 
@@ -227,9 +244,9 @@ class cmd_fpart : public command_t, public RemoveBase
                syntax = "<channel> <nick> [<reason>]";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               RemoveBase::Handle(parameters, pcnt, user, true);
+               return RemoveBase::Handle(parameters, pcnt, user, true);
        }
 };