m_dccallow Add config option to control max entries on a list

[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 e9753c4563175cf76a1daa06c124a95f565f096b..aadb42d901d62d39ebe02686e2bdf544a2fe0f6b 100644 (file)
--- a/src/commands/cmd_part.cpp
+++ b/src/commands/cmd_part.cpp
@@ -1,25 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-
-#ifndef __CMD_PART_H__
-#define __CMD_PART_H__
-
-// include the common header files
 
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 
 /** Handle /PART. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -31,7 +30,7 @@ class CommandPart : public Command
  public:
        /** Constructor for part.
         */
-       CommandPart (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"PART", 0, 1, false, 5) { syntax = "<channel>{,<channel>} [<reason>]"; }
+       CommandPart (Module* parent) : Command(parent,"PART", 1, 2) { Penalty = 5; syntax = "<channel>{,<channel>} [<reason>]"; }
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -41,28 +40,21 @@ class CommandPart : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User *user)
 {
        std::string reason;
 
        if (IS_LOCAL(user))
        {
-               if (*ServerInstance->Config->FixedPart)
+               if (!ServerInstance->Config->FixedPart.empty())
                        reason = ServerInstance->Config->FixedPart;
-               else
-               {
-                       if (parameters.size() > 1)
-                               reason = ServerInstance->Config->PrefixPart + std::string(parameters[1]) + ServerInstance->Config->SuffixPart;
-                       else
-                               reason = "";
-               }
+               else if (parameters.size() > 1)
+                       reason = ServerInstance->Config->PrefixPart + parameters[1] + ServerInstance->Config->SuffixPart;
        }
        else
        {
-               reason = parameters.size() > 1 ? parameters[1] : "";
+               if (parameters.size() > 1)
+                       reason = parameters[1];
        }
 
        if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))
@@ -72,9 +64,7 @@ CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User
 
        if (c)
        {
-               if (!c->PartUser(user, reason))
-                       /* Arse, who stole our channel! :/ */
-                       delete c;
+               c->PartUser(user, reason);
        }
        else
        {