Merge pull request #357 from StevenVanAcker/insp20

[user/henk/code/inspircd.git] / src / modules / m_timedbans.cpp

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index b3b22786e84585219541f9ea1a27081d47e51cfd..6b12a5aafa57fb88ff91b51365d8d7506a70443d 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | 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"
@@ -56,7 +65,7 @@ class CommandTban : public Command
                }
                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;
@@ -65,7 +74,7 @@ class CommandTban : public Command
                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];
@@ -133,32 +142,38 @@ class ModuleTimedBans : public Module
 
        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()