Fix new millisec /map to compile on windows, by ifndef gettimeofday out reverting...

[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 8d303d3e036688ea4cd0cee6bdb8fdbba30272c0..fcd6ae9586147aeb117cdb2eb86b19638db27b9e 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -2,27 +2,21 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                     E-mail:
- *              <brain@chatspike.net>
- *              <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- * the file COPYING for details.
+ *            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 "inspircd.h"
 #include <sstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "configreader.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 */
 
@@ -127,58 +121,50 @@ class RemoveBase
                
                if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick))
                {
-                       ServerInstance->Log(DEBUG, "Setting ulevel to U");
                        ulevel = chartolevel("U");
                }
                if (user->GetExt(founderkey))
                {
-                       ServerInstance->Log(DEBUG, "Setting ulevel to ~");
                        ulevel = chartolevel("~");
                }
                else if (user->GetExt(protectkey))
                {
-                       ServerInstance->Log(DEBUG, "Setting ulevel to &");
                        ulevel = chartolevel("&");
                }
                else
                {
-                       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->ULine(target->server) || ServerInstance->ULine(target->nick))
                {
-                       ServerInstance->Log(DEBUG, "Setting tlevel to U");
                        tlevel = chartolevel("U");
                }
                else if (target->GetExt(founderkey))
                {
-                       ServerInstance->Log(DEBUG, "Setting tlevel to ~");
                        tlevel = chartolevel("~");
                }
                else if (target->GetExt(protectkey))
                {
-                       ServerInstance->Log(DEBUG, "Setting tlevel to &");
                        tlevel = chartolevel("&");
                }
                else
                {
-                       ServerInstance->Log(DEBUG, "Setting tlevel to %s", channel->GetPrefixChar(target));
                        tlevel = chartolevel(channel->GetPrefixChar(target));
                }
                
                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))
+               if ((!IS_LOCAL(user)) || (!supportnokicks || !hasnokicks || (ulevel == ULINE)))
                {
                        /* We'll let everyone remove their level and below, eg:
                         * ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1)
                         * a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
                         * Nobody may remove a founder.
                         */
-                       if ((ulevel > PEON) && (ulevel >= tlevel) && (tlevel != OWNER))
+                       if ((!IS_LOCAL(user)) || ((ulevel > PEON) && (ulevel >= tlevel) && (tlevel != OWNER)))
                        {
                                // no you can't just go from a std::ostringstream to a std::string, Om. -nenolod
                                // but you can do this, nenolod -brain
@@ -215,6 +201,7 @@ class RemoveBase
                        return CMD_FAILURE;
                }
 
+               /* route me */
                return CMD_SUCCESS;
        }
 };
@@ -262,13 +249,13 @@ class ModuleRemove : public Module
        
  public:
        ModuleRemove(InspIRCd* Me)
-       : Module::Module(Me)
+       : Module(Me)
        {
                mycommand = new cmd_remove(ServerInstance, supportnokicks);
                mycommand2 = new cmd_fpart(ServerInstance, supportnokicks);
                ServerInstance->AddCommand(mycommand);
                ServerInstance->AddCommand(mycommand2);
-               OnRehash("");
+               OnRehash(NULL,"");
        }
 
        void Implements(char* List)
@@ -281,7 +268,7 @@ class ModuleRemove : public Module
                output.append(" REMOVE");
        }
        
-       virtual void OnRehash(const std::string&)
+       virtual void OnRehash(userrec* user, const std::string&)
        {
                ConfigReader conf(ServerInstance);
                supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
@@ -289,39 +276,13 @@ class ModuleRemove : public Module
        
        virtual ~ModuleRemove()
        {
-               delete mycommand;
-               delete mycommand2;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,1,0,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleRemoveFactory : public ModuleFactory
-{
- public:
-       ModuleRemoveFactory()
-       {
-       }
-       
-       ~ModuleRemoveFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleRemove(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRemoveFactory;
-}
+MODULE_INIT(ModuleRemove)