X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_o.cpp;h=27bc621009bc8e0686806aa0d19ecbb5b18f1e58;hb=2829ce8112ead4808969808b1f3ae216aae55d05;hp=b9fb0208badb69a744614f90e3275debdba6f997;hpb=26e4582c2ebaa82b63ba1d85d52be7b69d1f468d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index b9fb0208b..27bc62100 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -1,5 +1,18 @@
-#include "configreader.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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"
@@ -38,21 +51,19 @@ void ModeChannelOp::RemoveMode(chanrec* channel)
 	CUList* list = channel->GetOppedUsers();
 	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++)
 	{
-		userrec* n = i->second;
-		copy.insert(std::make_pair(n,n));
+		userrec* 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);
+		const char* parameters[] = { channel->name, moderemove, i->first->nick };
+		ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
 	}
-	delete n;
 }
 
 void ModeChannelOp::RemoveMode(userrec* user)
@@ -77,7 +88,10 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec*
 	 * the return value and is always MODEACTION_DENY if the mode is supposed to have
 	 * a parameter.
 	 */
-	return MODEACTION_ALLOW;
+	if (parameter.length())
+		return MODEACTION_ALLOW;
+	else
+		return MODEACTION_DENY;
 }
 
 std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
@@ -117,11 +131,8 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
 		if (IS_LOCAL(user))
 		{
 			int MOD_RESULT = 0;
-			ServerInstance->Log(DEBUG,"Call OnAccessCheck for AC_DEOP");
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
 
-			ServerInstance->Log(DEBUG,"Returns %d",MOD_RESULT);
-
 			if (MOD_RESULT == ACR_DENY)
 				return "";
 			if (MOD_RESULT == ACR_DEFAULT)