Make User:: nick/ident/dhost/fullname and some other things std::string instead of...

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

diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp
index c9c9e312ef309f0b52beb62cab292df33db3354e..ed08b60f4e80f73d6ec63ab6ba092c3d78afb889 100644 (file)
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,13 +21,13 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
 {
 }
 
-ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding, bool servermode)
 {
        /* Only opers can change other users modes */
-       if ((source != dest) && (!*source->oper))
+       if ((source != dest) && (!IS_OPER(source)))
                return MODEACTION_DENY;
 
-       /* Set the bitfields */
+       /* Set the array fields */
        if (adding)
        {
                /* Fix for bug #310 reported by Smartys */
@@ -38,8 +38,10 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest
                dest->modes[UM_SNOMASK] = true;
                if (!dest->modes[UM_SERVERNOTICE])
                {
-                       const char* newmodes[] = { dest->nick, "+s" };
-                       ServerInstance->Modes->Process(newmodes, 2, source, true);
+                       std::vector<std::string> newmodes;
+                       newmodes.push_back(dest->nick);
+                       newmodes.push_back("+s");
+                       ServerInstance->Modes->Process(newmodes, source, true);
                }
                return MODEACTION_ALLOW;
        }