Merge pull request #1018 from SaberUK/insp20+hidekills

[user/henk/code/inspircd.git] / src / modes / umode_o.cpp

diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp
index 2ce1fe5c543158659fb1d2af9ac88c7c9c57c27d..a5f590ba03dc03c8091a276c326fe2431c6f8bd3 100644 (file)
--- 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() : ModeHandler('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->server) && !IS_OPER(source))
                return MODEACTION_DENY;
 
        /* Not even opers can GIVE the +o mode, only take it away */
@@ -22,8 +43,12 @@ 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;
+       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;
 }