-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006 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/>.
*/
+
/* $ModDesc: Adds timed bans */
#include "inspircd.h"
}
if (!ServerInstance->IsValidMask(parameters[2]))
{
- user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
+ user->WriteServ("NOTICE "+user->nick+" :Invalid ban mask");
return CMD_FAILURE;
}
TimedBan T;
unsigned long expire = duration + ServerInstance->Time();
if (duration < 1)
{
- user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
+ user->WriteServ("NOTICE "+user->nick+" :Invalid ban time");
return CMD_FAILURE;
}
std::string mask = parameters[2];
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
+ // use CallHandler to make it so that the user sets the mode
// themselves
- ServerInstance->CallCommandHandler("MODE",setban,user);
+ ServerInstance->Parser->CallHandler("MODE",setban,user);
for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
if (!strcasecmp(i->data.c_str(), mask.c_str()))
goto found;
CUList tmp;
T.channel = channelname;
T.mask = mask;
- T.expire = expire;
+ T.expire = expire + (IS_REMOTE(user) ? 5 : 0);
TimedBanList.push_back(T);
channel->WriteAllExcept(ServerInstance->FakeClient, 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);
- ServerInstance->PI->SendChannelNotice(channel, '@', user->nick + " added a timed ban on " + mask + " lasting for " + ConvToStr(duration) + " seconds.");
return CMD_SUCCESS;
}
virtual void OnBackgroundTimer(time_t curtime)
{
+ timedbans expired;
for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end();)
{
if (curtime > i->expire)
{
- std::string chan = i->channel;
- std::string mask = i->mask;
- Channel* cr = ServerInstance->FindChan(chan);
+ expired.push_back(*i);
i = TimedBanList.erase(i);
- if (cr)
- {
- std::vector<std::string> setban;
- setban.push_back(chan);
- setban.push_back("-b");
- setban.push_back(mask);
-
- CUList empty;
- std::string expiry = "*** Timed ban on " + chan + " expired.";
- cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
- ServerInstance->PI->SendChannelNotice(cr, '@', expiry);
-
- ServerInstance->SendGlobalMode(setban, ServerInstance->FakeClient);
- }
}
else
++i;
}
+
+ for (timedbans::iterator i = expired.begin(); i != expired.end(); i++)
+ {
+ std::string chan = i->channel;
+ std::string mask = i->mask;
+ Channel* cr = ServerInstance->FindChan(chan);
+ if (cr)
+ {
+ std::vector<std::string> setban;
+ setban.push_back(chan);
+ setban.push_back("-b");
+ setban.push_back(mask);
+
+ CUList empty;
+ std::string expiry = "*** Timed ban on " + chan + " expired.";
+ cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
+ ServerInstance->PI->SendChannelNotice(cr, '@', expiry);
+
+ ServerInstance->SendGlobalMode(setban, ServerInstance->FakeClient);
+ }
+ }
}
virtual Version GetVersion()