X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fumode_o.cpp;h=5fb62571d5b641da38f003eb7898359ea0e51f5e;hb=1aaba0debce25af576961350dc51103d4f4eb948;hp=242431e8a507eef8f77fd4f398cab0d543df55f1;hpb=74d221e54a8db39820f6f86104116f74f9939b01;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp
index 242431e8a..5fb62571d 100644
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -1,17 +1,38 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #include "inspircd.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
 #include "modes/umode_o.h"
 
-ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, 'o', 0, 0, false, MODETYPE_USER, true)
+ModeUserOperator::ModeUserOperator() : ModeHandler(NULL, "oper", 'o', PARAM_NONE, MODETYPE_USER)
 {
+	oper = 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)
 {
 	/* Only opers can execute this class at all */
-	if (!*source->oper)
+	if (!ServerInstance->ULine(source->nick.c_str()) && !ServerInstance->ULine(source->server) && !IS_OPER(source))
 		return MODEACTION_DENY;
 
 	/* Not even opers can GIVE the +o mode, only take it away */
@@ -22,9 +43,11 @@ 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!
 	 */
-	SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick, source->nick);
+	char snomask = IS_LOCAL(dest) ? 'o' : 'O';
+	ServerInstance->SNO->WriteToSnoMask(snomask, "User %s de-opered (by %s)", dest->nick.c_str(),
+		source->nick.empty() ? source->server.c_str() : source->nick.c_str());
 	dest->UnOper();
 
 	return MODEACTION_ALLOW;