X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=23fee34c3267dc82155aecfa8db84b4c81c2f053;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;hp=83953048730e8b2f9a625fad2942fe5bff0cdd0a;hpb=ede5a089970691ee4a3edad7b6be4fd2504e2a12;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 839530487..23fee34c3 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -2,21 +2,15 @@
  *       | 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 <sstream>
 #include "users.h"
 #include "channels.h"
@@ -48,7 +42,8 @@ class RemoveBase
 	enum ModeLevel { PEON = 0, HALFOP = 1, OP = 2, ADMIN = 3, OWNER = 4, ULINE = 5 };	 
  
 	/* This little function just converts a chanmode character (U ~ & @ & +) into an integer (5 4 3 2 1 0) */
-	/* XXX - this could be handy in the core, so it can be used elsewhere */
+	/* XXX - We should probably use the new mode prefix rank stuff
+	 * for this instead now -- Brain */
 	ModeLevel chartolevel(const std::string &privs)
 	{
 		if(privs.empty())
@@ -126,74 +121,62 @@ 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
-				std::ostringstream reason_stream;
-				std::string reasonparam;
+				// but you can do this, nenolod -brain
+
+				std::string reasonparam("No reason given");
 				
 				/* If a reason is given, use it */
 				if(pcnt > 2)
 				{
-					/* Use all the remaining parameters as the reason */
-					for(int i = 2; i < pcnt; i++)
-					{
-						reason_stream << " " << parameters[i];
-					}
-					
-					reasonparam = reason_stream.str();
-					reason_stream.clear();
+					/* Join params 2 ... pcnt - 1 (inclusive) into one */
+					irc::stringjoiner reason_join(" ", parameters, 2, pcnt - 1);
+					reasonparam = reason_join.GetJoined();
 				}
 
 				/* Build up the part reason string. */
@@ -271,7 +254,7 @@ class ModuleRemove : public Module
 		mycommand2 = new cmd_fpart(ServerInstance, supportnokicks);
 		ServerInstance->AddCommand(mycommand);
 		ServerInstance->AddCommand(mycommand2);
-		OnRehash("");
+		OnRehash(NULL,"");
 	}
 
 	void Implements(char* List)
@@ -284,7 +267,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);
@@ -298,7 +281,7 @@ class ModuleRemove : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,1,0,VF_VENDOR,API_VERSION);
+		return Version(1,1,1,0,VF_VENDOR,API_VERSION);
 	}
 	
 };