-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2004-2007 Craig Edwards <craigedwards@brainbox.cc>
*
- * 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"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-/* $ModDesc: Provides support for unreal-style SAPART command */
+/* $ModDesc: Provides command SAPART to force-part users from a channel. */
/** Handle /SAPART
*/
-class cmd_sapart : public command_t
+class CommandSapart : public Command
{
public:
- cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
+ CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3)
{
- this->source = "m_sapart.so";
- syntax = "<nick> <channel>";
+ flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel> [reason]";
+ TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- userrec* dest = ServerInstance->FindNick(parameters[0]);
- chanrec* channel = ServerInstance->FindChan(parameters[1]);
- if (dest && channel)
+ User* dest = ServerInstance->FindNick(parameters[0]);
+ Channel* channel = ServerInstance->FindChan(parameters[1]);
+ std::string reason;
+
+ if ((dest) && (dest->registered == REG_ALL) && (channel))
{
+ if (parameters.size() > 2)
+ reason = parameters[2];
+
if (ServerInstance->ULine(dest->server))
{
- user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+ user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
return CMD_FAILURE;
}
*/
if (IS_LOCAL(dest))
{
- if (!channel->PartUser(dest, dest->nick))
- delete channel;
- chanrec* n = ServerInstance->FindChan(parameters[1]);
+ channel->PartUser(dest, reason);
+
+ Channel* n = ServerInstance->FindChan(parameters[1]);
if (!n)
{
- ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+ ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+parameters[1]);
return CMD_SUCCESS;
}
else
{
if (!n->HasUser(dest))
{
- ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+ ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+parameters[1]);
return CMD_SUCCESS;
}
else
{
- user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1]);
+ user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str());
return CMD_FAILURE;
}
}
}
- else
- {
- ServerInstance->WriteOpers("*** "+std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]);
- }
return CMD_SUCCESS;
}
else
{
- user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
+ user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str());
}
return CMD_FAILURE;
}
+
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ {
+ User* dest = ServerInstance->FindNick(parameters[0]);
+ if (dest)
+ return ROUTE_OPT_UCAST(dest->server);
+ return ROUTE_LOCALONLY;
+ }
};
class ModuleSapart : public Module
{
- cmd_sapart* mycommand;
+ CommandSapart cmd;
public:
- ModuleSapart(InspIRCd* Me)
- : Module(Me)
+ ModuleSapart()
+ : cmd(this)
{
-
- mycommand = new cmd_sapart(ServerInstance);
- ServerInstance->AddCommand(mycommand);
}
-
- virtual ~ModuleSapart()
+
+ void init()
{
+ ServerInstance->Modules->AddService(cmd);
}
-
+
virtual Version GetVersion()
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version("Provides command SAPART to force-part users from a channel.", VF_OPTCOMMON | VF_VENDOR);
}
-
};
MODULE_INIT(ModuleSapart)
-