Convert channel::name to std::string, this was a beastie!

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

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 07b898110e3ab9b59b370527f1f1fcee34a0ebe6..12dc1c79694b8c876eb5ad22ee4dd038cf544ce4 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -40,19 +40,19 @@ class CommandKnock : public Command
 
                if (c->HasUser(user))
                {
-                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick.c_str(), c->name);
+                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick.c_str(), c->name.c_str());
                        return CMD_FAILURE;
                }
 
                if (c->IsModeSet('K'))
                {
-                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick.c_str(), c->name);
+                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick.c_str(), c->name.c_str());
                        return CMD_FAILURE;
                }
 
                if (!c->modes[CM_INVITEONLY])
                {
-                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick.c_str(), c->name);
+                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick.c_str(), c->name.c_str());
                        return CMD_FAILURE;
                }
 
@@ -62,8 +62,8 @@ class CommandKnock : public Command
                }
                line = line + parameters[parameters.size()-1];
 
-               c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName,  "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name, user->nick.c_str(), c->name, line.c_str());
-               user->WriteServ("NOTICE %s :KNOCKing on %s",user->nick.c_str(),c->name);
+               c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName,  "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name.c_str(), user->nick.c_str(), c->name.c_str(), line.c_str());
+               user->WriteServ("NOTICE %s :KNOCKing on %s", user->nick.c_str(), c->name.c_str());
                return CMD_SUCCESS;
        }
 };