Forward-port CBAN expiry fix

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

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index fa554102f842d953d7aff67f943f445391c688ed..06284a964a6616da958d4a16437a4bc4ac55aa80 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -1,16 +1,16 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*   +------------------------------------+
+ *   | Inspire Internet Relay Chat Daemon |
+ *   +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *   E-mail:
+ *<brain@chatspike.net>
+ *       <Craig@chatspike.net>
  *                                             <omster@gmail.com>
- *     
+ * 
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -183,7 +183,7 @@ class ModuleCBan : public Module
                }
        }
        
-       virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata)
+       virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
        {
                if((target_type == TYPE_OTHER) && (extname == "cban"))
                {
@@ -229,13 +229,29 @@ bool CBanComp(const CBan &ban1, const CBan &ban2)
 
 void ExpireBans()
 {
-       while(cbans.size() && ((cbans.begin()->set_on + cbans.begin()->length) <= TIME))
+       bool go_again = true;
+
+       while (go_again)
        {
-               cbanlist::iterator iter = cbans.begin();
-               
-               log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str());
-               WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on);
-               cbans.erase(iter);
+               go_again = false;
+
+               for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
+               {
+                       /* 0 == permanent, don't mess with them! -- w00t */
+                       if (iter->length != 0)
+                       {
+                               if (iter->set_on + iter->length <= TIME)
+                               {
+                                       log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str());
+                                       WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on);
+                                       cbans.erase(iter);
+                                       go_again = true;
+                               }
+                       }
+
+                       if (go_again == true)
+                               break;
+               }
        }
 }