Fix user->host not being assigned correctly for new connections

[user/henk/code/inspircd.git] / src / modules / m_samode.cpp

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 84540b1178d6d325f1355048e189b5ca84b5b673..67b30b3ec380cf33d5443e14afedf4804ea5fcd4 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -26,12 +26,12 @@ class CommandSamode : public Command
                syntax = "<target> <modes> {<mode-parameters>}";
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                /*
                 * Handles an SAMODE request. Notifies all +s users.
                 */
-               ServerInstance->SendMode(parameters, pcnt, ServerInstance->FakeClient);
+               ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 
                if (ServerInstance->Modes->GetLastParse().length())
                {
@@ -47,8 +47,6 @@ class CommandSamode : public Command
                        n.pop_front();
                        ServerInstance->PI->SendMode(channel, n);
 
-                       ServerInstance->PI->SendOperNotice(std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
-
                        /* XXX: Yes, this is right. We dont want to propagate the
                         * actual SAMODE command, just the MODE command generated
                         * by the Protocol Interface
@@ -57,7 +55,7 @@ class CommandSamode : public Command
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
+                       user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick.c_str());
                }
 
                return CMD_FAILURE;