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 fee6fb447b5d9fe8481e3a42422a8e6baf8d898d..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-2008 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.
@@ -24,9 +24,7 @@ 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 (!ServerInstance->ULine(source->nick) &&
-               !ServerInstance->ULine(source->server) &&
-               !*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 */
@@ -39,7 +37,9 @@ 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());
+       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;