X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=57bb9490a20c73749d069e73edea7ebad954252d;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=fa554102f842d953d7aff67f943f445391c688ed;hpb=7f89baebc58c2e27740aa01c33187c0c0229abd8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index fa554102f..57bb9490a 100644
--- 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.
  *
  * ---------------------------------------------------
  */
@@ -27,7 +27,7 @@
 
 /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */
 
-class CBan
+class CBan : public classbase
 {
 public:
 	irc::string chname;
@@ -68,7 +68,7 @@ class cmd_cban : public command_t
 		this->Srv = Me;
 	}
 
-	void Handle(char **parameters, int pcnt, userrec *user)
+	void Handle(const char** parameters, int pcnt, userrec *user)
 	{
 		/* syntax: CBAN #channel time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
@@ -164,7 +164,7 @@ class ModuleCBan : public Module
 		/* check cbans in here, and apply as necessary. */
 		for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
 		{
-			if(iter->chname == cname && !strchr(user->modes, 'o'))
+			if(iter->chname == cname && !user->modes[UM_OPERATOR])
 			{
 				// Channel is banned.
 				WriteServ(user->fd, "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str());
@@ -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;
+		}
 	}
 }