X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=5ac6e70e88035b3dff5619e1bfd1a7a6d5c1b20a;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=ea6979b8091d6d4e507ba08448c327a49c330983;hpb=39af36e058de47d30706ab3e5a5a7f183fee0eff;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index ea6979b80..5ac6e70e8 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -40,7 +40,7 @@ class CommandTban : public Command TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END); } - CmdResult Handle (const char* const* parameters, int pcnt, User *user) + CmdResult Handle (const std::vector ¶meters, User *user) { Channel* channel = ServerInstance->FindChan(parameters[0]); if (channel) @@ -55,33 +55,33 @@ class CommandTban : public Command } for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) { - if (!strcasecmp(i->data,parameters[2])) + if (!strcasecmp(i->data.c_str(), parameters[2].c_str())) { - user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); + user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+parameters[2]+" is already on the banlist of "+parameters[0]); return CMD_FAILURE; } } TimedBan T; std::string channelname = parameters[0]; long duration = ServerInstance->Duration(parameters[1]); - unsigned long expire = duration + time(NULL); + unsigned long expire = duration + ServerInstance->Time(); if (duration < 1) { user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time"); return CMD_FAILURE; } std::string mask = parameters[2]; - const char *setban[32]; - setban[0] = parameters[0]; - setban[1] = "+b"; - setban[2] = parameters[2]; + std::vector setban; + setban.push_back(parameters[0]); + setban.push_back("+b"); + setban.push_back(parameters[2]); // use CallCommandHandler to make it so that the user sets the mode // themselves - ServerInstance->CallCommandHandler("MODE",setban,3,user); + ServerInstance->CallCommandHandler("MODE",setban,user); /* Check if the ban was actually added (e.g. banlist was NOT full) */ bool was_added = false; for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) - if (!strcasecmp(i->data,mask.c_str())) + if (!strcasecmp(i->data.c_str(), mask.c_str())) was_added = true; if (was_added) { @@ -90,18 +90,18 @@ class CommandTban : public Command T.mask = mask; T.expire = expire; TimedBanList.push_back(T); - channel->WriteAllExcept(user, true, '@', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration); + channel->WriteAllExcept(user, true, '@', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration); if (ServerInstance->Config->AllowHalfop) - channel->WriteAllExcept(user, true, '%', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration); + channel->WriteAllExcept(user, true, '%', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration); return CMD_SUCCESS; } return CMD_FAILURE; } - else user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick, channel->name, + else user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick.c_str(), channel->name.c_str(), ServerInstance->Config->AllowHalfop ? " half-" : " channel "); return CMD_FAILURE; } - user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]); + user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } }; @@ -113,14 +113,14 @@ class ModuleTimedBans : public Module ModuleTimedBans(InspIRCd* Me) : Module(Me) { - + mycommand = new CommandTban(ServerInstance); ServerInstance->AddCommand(mycommand); TimedBanList.clear(); Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer }; ServerInstance->Modules->Attach(eventlist, this, 2); } - + virtual ~ModuleTimedBans() { TimedBanList.clear(); @@ -129,7 +129,7 @@ class ModuleTimedBans : public Module virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask) { irc::string listitem = banmask.c_str(); - irc::string thischan = chan->name; + irc::string thischan = chan->name.c_str(); for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) { irc::string target = i->mask.c_str(); @@ -157,29 +157,22 @@ class ModuleTimedBans : public Module Channel* cr = ServerInstance->FindChan(safei->channel); if (cr) { - const char *setban[3]; std::string mask = safei->mask; - - setban[0] = safei->channel.c_str(); - setban[1] = "-b"; - setban[2] = mask.c_str(); + std::vector setban; + setban.push_back(safei->channel); + setban.push_back("-b"); + setban.push_back(mask); CUList empty; - cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, safei->mask.c_str()); + cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name.c_str(), safei->mask.c_str()); if (ServerInstance->Config->AllowHalfop) - cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, safei->mask.c_str()); + cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name.c_str(), safei->mask.c_str()); /* Removes the ban item for us, no ::erase() needed */ ServerInstance->PI->SendModeStr(safei->channel, std::string("-b ") + setban[2]); - ServerInstance->SendMode(setban, 3, ServerInstance->FakeClient); + ServerInstance->SendMode(setban, ServerInstance->FakeClient); - bool was_removed = true; - for (BanList::iterator j = cr->bans.begin(); j != cr->bans.end(); j++) - if (!strcasecmp(j->data, mask.c_str())) - was_removed = false; - - /* Fix for crash if user cycles before the ban expires */ - if (!was_removed) + if (ServerInstance->Modes->GetLastParse().empty()) TimedBanList.erase(safei); } else @@ -190,10 +183,10 @@ class ModuleTimedBans : public Module } } } - + virtual Version GetVersion() { - return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } };