X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_cban.cpp;h=06284a964a6616da958d4a16437a4bc4ac55aa80;hb=3c43bf1c71c49d07b682c260a3b251e536385dba;hp=df0bd1d4d9ead879210aa4e0383cc3b613dfa85f;hpb=ca549070d974b45ae586e10b74acc6e390741ae9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index df0bd1d4d..06284a964 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.
  *
  * ---------------------------------------------------
  */
@@ -49,7 +49,6 @@ std::string EncodeCBan(const CBan &ban);
 CBan DecodeCBan(const std::string &data);
 bool CBanComp(const CBan &ban1, const CBan &ban2);
 void ExpireBans();
-bool IsValidChan(const char* cname);
 
 extern time_t TIME;
 typedef std::vector<CBan> cbanlist;
@@ -93,7 +92,7 @@ class cmd_cban : public command_t
 		else if (pcnt >= 2)
 		{
 			/* full form to add a CBAN */
-			if(IsValidChan(parameters[0]))
+			if (IsValidChannelName(parameters[0]))
 			{
 				// parameters[0] = #channel
 				// parameters[1] = 1h3m2s
@@ -118,7 +117,7 @@ class cmd_cban : public command_t
 			}
 			else
 			{
-				WriteServ(user->fd, "403 %s %s :No such channel", user->nick, parameters[0]);
+				WriteServ(user->fd, "403 %s %s :Invalid channel name", user->nick, parameters[0]);
 			}
 		}
 	}
@@ -184,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"))
 		{
@@ -206,14 +205,14 @@ class ModuleCBan : public Module
 std::string EncodeCBan(const CBan &ban)
 {
 	std::ostringstream stream;	
-	stream << ban.chname.c_str() << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason;
+	stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason;
 	return stream.str();	
 }
 
 CBan DecodeCBan(const std::string &data)
 {
 	CBan res;
-	std::istringstream stream;
+	std::istringstream stream(data);
 	stream >> res.chname;
 	stream >> res.set_by;
 	stream >> res.set_on;
@@ -230,29 +229,30 @@ 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;
 
-bool IsValidChan(const char* cname)
-{
-	if(!cname)
-		return false;
-		
-	if(cname[0] != '#')
-		return false;
-		
-	for(unsigned int i = 0; i < strlen(cname); i++)
-		if((cname[i] == ' ') || (cname[i] == '\7') || (cname[i] == ','))
-			return false;
-			
-	return true;
+		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;
+		}
+	}
 }
 
 class ModuleCBanFactory : public ModuleFactory