X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fumode_o.cpp;h=7cee7d2382d64f8c452cb1af35cb5d6aa906326e;hb=4b856bda135a08e800b96c970a10b0b6a34d433a;hp=2105376ba4b29ebe59335cf44494594dc23bc797;hpb=bb319272f8afffcca49c881e8de3e1a1f6eaa570;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp
index 2105376ba..7cee7d238 100644
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -1,17 +1,30 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 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 "mode.h"
 #include "channels.h"
 #include "users.h"
 #include "modes/umode_o.h"
 
-ModeUserOperator::ModeUserOperator() : ModeHandler('o', 0, 0, false, MODETYPE_USER, true)
+ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, 'o', 0, 0, false, MODETYPE_USER, true)
 {
 }
 
-ModeAction ModeUserOperator::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
 {
 	/* Only opers can execute this class at all */
-	if (!*source->oper)
+	if (!IS_OPER(source))
 		return MODEACTION_DENY;
 
 	/* Not even opers can GIVE the +o mode, only take it away */
@@ -22,10 +35,15 @@ ModeAction ModeUserOperator::OnModeChange(userrec* source, userrec* dest, chanre
 	 * Note that oper status is only given in cmd_oper.cpp
 	 * NOT here. It is impossible to directly set +o without
 	 * verifying as an oper and getting an opertype assigned
-	 * to your userrec!
+	 * to your User!
 	 */
-	dest->modes[UM_OPERATOR] = 0;
-	/* Remove their opertype when they oper down */
-	*dest->oper = 0;
+	ServerInstance->SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick.c_str(), source->nick.c_str());
+	dest->UnOper();
+
 	return MODEACTION_ALLOW;
 }
+
+unsigned int ModeUserOperator::GetCount()
+{
+	return count;
+}