NEVER use the two-param assign unless you want your string padding to len bytes with \0!

[user/henk/code/inspircd.git] / src / commands / cmd_part.cpp

diff --git a/src/commands/cmd_part.cpp b/src/commands/cmd_part.cpp
index 46108eca24e1c69434e5242aa69e8b107e87d2b6..352b967b59b6e7a8aa0839f68b31186dd4458272 100644 (file)
--- a/src/commands/cmd_part.cpp
+++ b/src/commands/cmd_part.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
@@ -19,22 +19,42 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandPart(Instance);
 }
 
-CmdResult CommandPart::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+       std::string reason;
+
+       if (IS_LOCAL(user))
+       {
+               if (*ServerInstance->Config->FixedPart)
+                       reason = ServerInstance->Config->FixedPart;
+               else
+               {
+                       if (parameters.size() > 1)
+                               reason = ServerInstance->Config->PrefixPart + std::string(parameters[1]) + ServerInstance->Config->SuffixPart;
+                       else
+                               reason = "";
+               }
+       }
+       else
+       {
+               reason = parameters.size() > 1 ? parameters[1] : "";
+       }
+
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))
                return CMD_SUCCESS;
 
        Channel* c = ServerInstance->FindChan(parameters[0]);
        
        if (c)
        {
-               if (!c->PartUser(user, pcnt > 1 ? parameters[1] : NULL))
+               const char *rreason = reason.empty() ? NULL : reason.c_str();
+               if (!c->PartUser(user, rreason))
                        /* Arse, who stole our channel! :/ */
                        delete c;
        }
        else
        {
-               user->WriteServ( "401 %s %s :No such channel", user->nick, parameters[0]);
+               user->WriteServ( "401 %s %s :No such channel", user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }