* | 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
}
}
- CmdResult Handle (const char** parameters, int pcnt, User *user, bool neworder)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user, bool neworder)
{
const char* channame;
const char* username;
* /remove <nick> <channel> [reason ...]
* /fpart <channel> <nick> [reason ...]
*/
- channame = parameters[ neworder ? 0 : 1];
- username = parameters[ neworder ? 1 : 0];
+ channame = parameters[ neworder ? 0 : 1].c_str();
+ username = parameters[ neworder ? 1 : 0].c_str();
/* Look up the user we're meant to be removing from the channel */
target = ServerInstance->FindNick(username);
/* Fix by brain - someone needs to learn to validate their input! */
if (!target || !channel)
{
- user->WriteServ("401 %s %s :No such nick/channel", user->nick, !target ? username : channame);
+ user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), !target ? username : channame);
return CMD_FAILURE;
}
if (!channel->HasUser(target))
{
- user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick, target->nick, channel->name);
+ user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick.c_str(), target->nick.c_str(), channel->name.c_str());
return CMD_FAILURE;
}
protectkey = "cm_protect_" + std::string(channel->name);
founderkey = "cm_founder_" + std::string(channel->name);
- if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick))
+ if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick.c_str()))
{
ulevel = chartolevel("U");
}
}
/* Now it's the same idea, except for the target. If they're ulined make sure they get a higher level than the sender can */
- if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick))
+ if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick.c_str()))
{
tlevel = chartolevel("U");
}
std::string reasonparam("No reason given");
/* If a reason is given, use it */
- if(pcnt > 2)
+ if(parameters.size() > 2)
{
/* Join params 2 ... pcnt - 1 (inclusive) into one */
- irc::stringjoiner reason_join(" ", parameters, 2, pcnt - 1);
+ irc::stringjoiner reason_join(" ", parameters, 2, parameters.size() - 1);
reasonparam = reason_join.GetJoined();
}
/* Build up the part reason string. */
reason = std::string("Removed by ") + user->nick + ": " + reasonparam;
- channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick);
- target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick, user->nick, channel->name, reasonparam.c_str());
+ channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
+ target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick.c_str(), user->nick.c_str(), channel->name.c_str(), reasonparam.c_str());
if (!channel->PartUser(target, reason.c_str()))
delete channel;
}
else
{
- user->WriteServ( "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick, target->nick, channel->name);
+ user->WriteServ( "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick.c_str(), target->nick.c_str(), channel->name.c_str());
return CMD_FAILURE;
}
}
else
{
/* m_nokicks.so was loaded and +Q was set, block! */
- user->WriteServ( "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick, channel->name, target->nick);
+ user->WriteServ( "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick.c_str(), channel->name.c_str(), target->nick.c_str());
return CMD_FAILURE;
}
/** Handle /REMOVE
*/
-class cmd_remove : public Command, public RemoveBase
+class CommandRemove : public Command, public RemoveBase
{
public:
- cmd_remove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
+ CommandRemove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
{
this->source = "m_remove.so";
syntax = "<nick> <channel> [<reason>]";
TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
}
- CmdResult Handle (const char** parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- return RemoveBase::Handle(parameters, pcnt, user, false);
+ return RemoveBase::Handle(parameters, user, false);
}
};
/** Handle /FPART
*/
-class cmd_fpart : public Command, public RemoveBase
+class CommandFpart : public Command, public RemoveBase
{
public:
- cmd_fpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
+ CommandFpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
{
this->source = "m_remove.so";
syntax = "<channel> <nick> [<reason>]";
}
- CmdResult Handle (const char** parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- return RemoveBase::Handle(parameters, pcnt, user, true);
+ return RemoveBase::Handle(parameters, user, true);
}
};
class ModuleRemove : public Module
{
- cmd_remove* mycommand;
- cmd_fpart* mycommand2;
+ CommandRemove* mycommand;
+ CommandFpart* mycommand2;
bool supportnokicks;
ModuleRemove(InspIRCd* Me)
: Module(Me)
{
- mycommand = new cmd_remove(ServerInstance, supportnokicks);
- mycommand2 = new cmd_fpart(ServerInstance, supportnokicks);
+ mycommand = new CommandRemove(ServerInstance, supportnokicks);
+ mycommand2 = new CommandFpart(ServerInstance, supportnokicks);
ServerInstance->AddCommand(mycommand);
ServerInstance->AddCommand(mycommand2);
OnRehash(NULL,"");
+ Implementation eventlist[] = { I_On005Numeric, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
- void Implements(char* List)
- {
- List[I_On005Numeric] = List[I_OnRehash] = 1;
- }
virtual void On005Numeric(std::string &output)
{
virtual Version GetVersion()
{
- return Version(1, 1, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version(1, 2, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
};