X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_h.cpp;h=580eee4432fcb42fb7ca238c7283db356a93a3cc;hb=5db3290d939509015167b7fdfba5073285051560;hp=a77366c824b098451903b84b5fc8e2519deb0748;hpb=02ccf82812a189c46d0495580b7d96ada34851b5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp
index a77366c82..580eee443 100644
--- a/src/modes/cmode_h.cpp
+++ b/src/modes/cmode_h.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,15 +11,15 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
 #include "inspircd.h"
+#include "configreader.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
 #include "modules.h"
 #include "modes/cmode_h.h"
 
-ModeChannelHalfOp::ModeChannelHalfOp(InspIRCd* Instance) : ModeHandler(Instance, 'h', 1, 1, true, MODETYPE_CHANNEL, false, '%')
+ModeChannelHalfOp::ModeChannelHalfOp(InspIRCd* Instance) : ModeHandler(Instance, 'h', 1, 1, true, MODETYPE_CHANNEL, false, '%', '@')
 {
 }
 
@@ -28,9 +28,9 @@ unsigned int ModeChannelHalfOp::GetPrefixRank()
 	return HALFOP_VALUE;
 }
 
-ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelHalfOp::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-	userrec* x = ServerInstance->FindNick(parameter);
+	User* x = ServerInstance->FindNick(parameter);
 	if (x)
 	{
 		if (channel->GetStatusFlags(x) & UCMODE_HOP)
@@ -45,33 +45,37 @@ ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* cha
 	return std::make_pair(false, parameter);
 }
 
-void ModeChannelHalfOp::RemoveMode(chanrec* channel)
+void ModeChannelHalfOp::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-	CUList* list = channel->GetHalfoppedUsers();
+	CUList* clist = channel->GetHalfoppedUsers();
 	CUList copy;
-	char moderemove[MAXBUF];
-	userrec* n = new userrec(ServerInstance);
-	n->SetFd(FD_MAGIC_NUMBER);
 
-	for (CUList::iterator i = list->begin(); i != list->end(); i++)
+	for (CUList::iterator i = clist->begin(); i != clist->end(); i++)
 	{
-		userrec* n = i->second;
-		copy.insert(std::make_pair(n,n));
+		User* n = i->first;
+		copy.insert(std::make_pair(n,n->nick));
 	}
+
 	for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
 	{
-		sprintf(moderemove,"-%c",this->GetModeChar());
-		const char* parameters[] = { channel->name, moderemove, i->second->nick };
-		ServerInstance->SendMode(parameters, 3, n);
+		if (stack)
+		{
+			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);
+		}
 	}
-	delete n;
+
 }
 
-void ModeChannelHalfOp::RemoveMode(userrec* user)
+void ModeChannelHalfOp::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
-ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelHalfOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
 	/* If halfops are not enabled in the conf, we don't execute
 	 * anything in this class at all.
@@ -84,8 +88,6 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr
 
 	int status = channel->GetStatus(source);
 
-	ServerInstance->Log(DEBUG,"Halfop handler, source=%s channel=%s parameter=%s adding=%d",source->nick, channel->name, parameter.c_str(), adding);
-
 	/* Call the correct method depending on wether we're adding or removing the mode */
 	if (adding)
 	{
@@ -106,11 +108,9 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr
 		return MODEACTION_DENY;
 }
 
-std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec *chan,int status)
+std::string ModeChannelHalfOp::AddHalfOp(User *user,const char* dest,Channel *chan,int status)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
-
-	ServerInstance->Log(DEBUG,"Add halfop");
+	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
@@ -125,23 +125,20 @@ std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec
 			{
 				if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))
 				{
-					user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
+					user->WriteServ("482 %s %s :You're not a channel operator",user->nick.c_str(), chan->name.c_str());
 					return "";
 				}
 			}
 		}
 
-		ServerInstance->Log(DEBUG,"Calling Grant");
 		return ServerInstance->Modes->Grant(d,chan,UCMODE_HOP);
 	}
 	return "";
 }
 
-std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec *chan,int status)
+std::string ModeChannelHalfOp::DelHalfOp(User *user,const char *dest,Channel *chan,int status)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
-
-	ServerInstance->Log(DEBUG,"Del halfop");
+	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
@@ -156,13 +153,12 @@ std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec
 			{
 				if ((user != d) && ((status < STATUS_OP) && (!ServerInstance->ULine(user->server))))
 				{
-					user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
+					user->WriteServ("482 %s %s :You are not a channel operator",user->nick.c_str(), chan->name.c_str());
 					return "";
 				}
 			}
 		}
 
-		ServerInstance->Log(DEBUG,"Calling revoke");
 		return ServerInstance->Modes->Revoke(d,chan,UCMODE_HOP);
 	}
 	return "";