X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=1b56f2920b36a5450117228342040f59dbd2e1a6;hb=0bed81e9d70ad2124f258303cd729f9bb2d02a84;hp=c964ec96266b8f3c2455125cbcf43ac5ad7e740a;hpb=ef30d86d11696bb7ca639ae7a156a0c91d396cdb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index c964ec962..1b56f2920 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -391,6 +391,18 @@ XLineManager::~XLineManager()
 	delete KFact;
 	delete QFact;
 	delete ZFact;
+
+	// Delete all existing XLines
+	for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++)
+	{
+		for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++)
+		{
+			delete j->second;
+		}
+		i->second.clear();
+	}
+	lookup_lines.clear();
+	
 }
 
 void XLine::Apply(User* u)
@@ -408,10 +420,11 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 	snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
 	if (*ServerInstance->Config->MoronBanner)
 		u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+
 	if (ServerInstance->Config->HideBans)
-		User::QuitUser(ServerInstance, u, line + "-Lined", sreason);
+		ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
 	else
-		User::QuitUser(ServerInstance, u, sreason);
+		ServerInstance->Users->QuitUser(u, sreason);
 
 
 	if (bancache)
@@ -519,7 +532,7 @@ void QLine::Apply(User* u)
 
 bool ZLine::Matches(const std::string &str)
 {
-	if (match(str.c_str(), this->ipaddr, true))
+	if (match(str, this->ipaddr, true))
 		return true;
 	else
 		return false;
@@ -527,7 +540,7 @@ bool ZLine::Matches(const std::string &str)
 
 bool QLine::Matches(const std::string &str)
 {
-	if (match(str.c_str(), this->nick))
+	if (match(str, this->nick))
 		return true;
 
 	return false;
@@ -535,17 +548,17 @@ bool QLine::Matches(const std::string &str)
 
 bool ELine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext.c_str(), true)));
+	return ((match(str, matchtext, true)));
 }
 
 bool KLine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext.c_str(), true)));
+	return ((match(str.c_str(), matchtext, true)));
 }
 
 bool GLine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext.c_str(), true)));
+	return ((match(str, matchtext, true)));
 }
 
 void ELine::OnAdd()