Wakey wakey w00t :p

[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 7cee7d2382d64f8c452cb1af35cb5d6aa906326e..a992481b7bea167296ca3fb139783c87d01b8b27 100644 (file)
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -24,7 +24,9 @@ ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, '
 ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
 {
        /* Only opers can execute this class at all */
-       if (!IS_OPER(source))
+       if (!ServerInstance->ULine(source->nick.c_str()) &&
+               !ServerInstance->ULine(source->server) &&
+               source->oper.empty())
                return MODEACTION_DENY;
 
        /* Not even opers can GIVE the +o mode, only take it away */
@@ -37,7 +39,10 @@ ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, st
         * verifying as an oper and getting an opertype assigned
         * to your User!
         */
-       ServerInstance->SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick.c_str(), source->nick.c_str());
+       if (IS_LOCAL(dest))
+               ServerInstance->SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick.c_str(), source->nick.c_str());
+       else
+               ServerInstance->SNO->WriteToSnoMask('O', "User %s de-opered (by %s)", dest->nick.c_str(), source->nick.c_str());
        dest->UnOper();
 
        return MODEACTION_ALLOW;