Fix SetModeParam to use std::string and handle edge cases.

[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 6d785f26e941ca3ee7accfdbb2bfbb70a30212dc..df69a841966366b33511ff3edb4ba5353931453a 100644 (file)
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,10 +21,10 @@ ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, '
 {
 }
 
-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 (!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 */
@@ -35,15 +35,17 @@ 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!
         */
-       ServerInstance->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 : source->nick.c_str());
        dest->UnOper();
 
        return MODEACTION_ALLOW;
 }
 
-unsigned int GetCount()
+unsigned int ModeUserOperator::GetCount()
 {
-       return ServerInstance->all_opers.size();
+       return count;
 }