X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_o.cpp;h=908eb698c04f9df60c27a26354b9450f474bfdf0;hb=86775e2e98f55b3b88befe2daff0ca23f02f3155;hp=a43eaeac9c59a5a65fc530c0a0e02e7437358774;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index a43eaeac9..908eb698c 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -19,7 +19,7 @@
 #include "modules.h"
 #include "modes/cmode_o.h"
 
-ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@')
+ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@', '@', TR_NICK)
 {
 }
 
@@ -28,7 +28,7 @@ unsigned int ModeChannelOp::GetPrefixRank()
 	return OP_VALUE;
 }
 
-ModePair ModeChannelOp::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
+ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
 	User* x = ServerInstance->FindNick(parameter);
 	if (x)
@@ -46,13 +46,12 @@ ModePair ModeChannelOp::ModeSet(User* source, User* dest, Channel* channel, cons
 }
 
 
-void ModeChannelOp::RemoveMode(Channel* channel)
+void ModeChannelOp::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-	CUList* list = channel->GetOppedUsers();
+	CUList* clist = channel->GetOppedUsers();
 	CUList copy;
-	char moderemove[MAXBUF];
 
-	for (CUList::iterator i = list->begin(); i != list->end(); i++)
+	for (CUList::iterator i = clist->begin(); i != clist->end(); i++)
 	{
 		User* n = i->first;
 		copy.insert(std::make_pair(n,n->nick));
@@ -60,17 +59,21 @@ void ModeChannelOp::RemoveMode(Channel* channel)
 
 	for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
 	{
-		sprintf(moderemove,"-%c",this->GetModeChar());
-		const char* parameters[] = { channel->name, moderemove, i->first->nick };
-		ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+		if (stack)
+			stack->Push(this->GetModeChar(), i->first->nick);
+		else
+		{
+			std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-o"); parameters.push_back(i->first->nick);
+			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+		}
 	}
 }
 
-void ModeChannelOp::RemoveMode(User* user)
+void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
-ModeAction ModeChannelOp::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
 	int status = channel->GetStatus(source);
 
@@ -102,16 +105,16 @@ std::string ModeChannelOp::AddOp(User *user,const char* dest,Channel *chan,int s
 	{
 		if (IS_LOCAL(user))
 		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
+			ModResult MOD_RESULT;
+			FIRST_MOD_RESULT(ServerInstance, OnAccessCheck, MOD_RESULT, (user,d,chan,AC_OP));
 
-			if (MOD_RESULT == ACR_DENY)
+			if (MOD_RESULT == MOD_RES_DENY)
 				return "";
-			if (MOD_RESULT == ACR_DEFAULT)
+			if (MOD_RESULT == MOD_RES_PASSTHRU)
 			{
 				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 "";
 				}
 			}
@@ -130,16 +133,16 @@ std::string ModeChannelOp::DelOp(User *user,const char *dest,Channel *chan,int s
 	{
 		if (IS_LOCAL(user))
 		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
+			ModResult MOD_RESULT;
+			FIRST_MOD_RESULT(ServerInstance, OnAccessCheck, MOD_RESULT, (user,d,chan,AC_DEOP));
 
-			if (MOD_RESULT == ACR_DENY)
+			if (MOD_RESULT == MOD_RES_DENY)
 				return "";
-			if (MOD_RESULT == ACR_DEFAULT)
+			if (MOD_RESULT == MOD_RES_PASSTHRU)
 			{
 				if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)) && (IS_LOCAL(user)))
 				{
-					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 "";
 				}
 			}