...because every now and again, i have to do a massive commit.

[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 6848f6e174be502aa01cea9067feb61f246aa58c..9d3d31532bb0005468dda88455a13087db091151 100644 (file)
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,14 +17,15 @@
 #include "users.h"
 #include "modes/umode_o.h"
 
-ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'o', 0, 0, false, MODETYPE_USER, true)
+ModeUserOperator::ModeUserOperator() : ModeHandler(NULL, "oper", 'o', PARAM_NONE, MODETYPE_USER)
 {
+       oper = true;
 }
 
-ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
+ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding)
 {
        /* Only opers can execute this class at all */
-       if (!ServerInstance->ULine(source->nick.c_str()) && !ServerInstance->ULine(source->server) && source->oper.empty())
+       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 */
@@ -39,13 +40,8 @@ ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, st
         */
        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 : source->nick.c_str());
+               source->nick.empty() ? source->server.c_str() : source->nick.c_str());
        dest->UnOper();
 
        return MODEACTION_ALLOW;
 }
-
-unsigned int ModeUserOperator::GetCount()
-{
-       return count;
-}