X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_h.cpp;h=d5472c154650f035dc6239e2c70f6dad9a6a2cf8;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=da810a4d27a1ac0f802ecdfcc1427ccec3e66992;hpb=7775a195d9c417e52eaaf912ec51d62bf0fd9a54;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp
index da810a4d2..d5472c154 100644
--- a/src/modes/cmode_h.cpp
+++ b/src/modes/cmode_h.cpp
@@ -1,123 +1,82 @@
-#include <string>
-#include <vector>
-#include "inspircd_config.h"
-#include "configreader.h"
-#include "hash_map.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
+#include "configreader.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
-#include "helperfuncs.h"
-#include "commands.h"
 #include "modules.h"
-#include "inspstring.h"
-#include "hashcomp.h"
 #include "modes/cmode_h.h"
 
-ModeChannelHalfOp::ModeChannelHalfOp(InspIRCd* Instance) : ModeHandler(Instance, 'h', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelHalfOp::ModeChannelHalfOp() : ModeHandler(NULL, 'h', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
+	list = true;
+	prefix = '%';
+	levelrequired = OP_VALUE;
+	m_paramtype = TR_NICK;
 }
 
-ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+unsigned int ModeChannelHalfOp::GetPrefixRank()
 {
-	userrec* x = ServerInstance->FindNick(parameter);
+	return HALFOP_VALUE;
+}
+
+ModePair ModeChannelHalfOp::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
+{
+	User* x = ServerInstance->FindNick(parameter);
 	if (x)
 	{
-		if (channel->GetStatus(x) == STATUS_HOP)
+		Membership* memb = channel->GetUser(x);
+		if (memb && memb->hasMode('h'))
 		{
 			return std::make_pair(true, x->nick);
 		}
 		else
 		{
-			return std::make_pair(false, parameter);
+			return std::make_pair(false, x->nick);
 		}
 	}
 	return std::make_pair(false, parameter);
 }
 
-ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-{
-	/* If halfops are not enabled in the conf, we don't execute
-	 * anything in this class at all.
-	 */
-	if (!ServerInstance->Config->AllowHalfop)
-	{
-		parameter = "";
-		return MODEACTION_DENY;
-	}
-
-	int status = channel->GetStatus(source);
-
-	/* Call the correct method depending on wether we're adding or removing the mode */
-	if (adding)
-	{
-		parameter = this->AddHalfOp(source, parameter.c_str(), channel, status);
-	}
-	else
-	{
-		parameter = this->DelHalfOp(source, parameter.c_str(), channel, status);
-	}
-	/* If the method above 'ate' the parameter by reducing it to an empty string, then
-	 * it won't matter wether we return ALLOW or DENY here, as an empty string overrides
-	 * the return value and is always MODEACTION_DENY if the mode is supposed to have
-	 * a parameter.
-	 */
-	return MODEACTION_ALLOW;
-}
-
-std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec *chan,int status)
+void ModeChannelHalfOp::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-	userrec *d = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status);
+	const UserMembList* clist = channel->GetUsers();
 
-	if (d)
+	for (UserMembCIter i = clist->begin(); i != clist->end(); i++)
 	{
-		if (IS_LOCAL(user))
+		if (stack)
 		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP));
-
-			if (MOD_RESULT == ACR_DENY)
-				return "";
-			if (MOD_RESULT == ACR_DEFAULT)
-			{
-				if ((status < STATUS_OP) && (!ServerInstance->is_uline(user->server)))
-				{
-					user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
-					return "";
-				}
-			}
+			stack->Push(this->GetModeChar(), i->first->nick);
+		}
+		else
+		{
+			std::vector<std::string> parameters;
+			parameters.push_back(channel->name);
+			parameters.push_back("-h");
+			parameters.push_back(i->first->nick);
+			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 		}
-
-		return ServerInstance->ModeGrok->Grant(d,chan,UCMODE_HOP);
 	}
-	return "";
+
 }
 
-std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec *chan,int status)
+void ModeChannelHalfOp::RemoveMode(User*, irc::modestacker* stack)
 {
-	userrec *d = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status);
-
-	if (d)
-	{
-		if (IS_LOCAL(user))
-		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP));
-
-			if (MOD_RESULT == ACR_DENY)
-				return "";
-			if (MOD_RESULT == ACR_DEFAULT)
-			{
-				if ((user != d) && ((status < STATUS_OP) && (!ServerInstance->is_uline(user->server))))
-				{
-					user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
-					return "";
-				}
-			}
-		}
-
-		return ServerInstance->ModeGrok->Revoke(d,chan,UCMODE_HOP);
-	}
-	return "";
 }
 
+ModeAction ModeChannelHalfOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
+{
+	return MODEACTION_ALLOW;
+}