X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=47e12242053344ffe81d1000b51ac91b9fb869b8;hb=f21617328a8a576c8ada619f2934ac31f0dec717;hp=57e6221c42ffcf419151202a371d357f1e74e7a8;hpb=04e8f8fd991804d38975f54ddd1879809bf94bac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 57e6221c4..47e122420 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -158,7 +158,13 @@ bool XLineManager::AddLine(XLine* line, User* user)
 		return false;
 
 	/*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
-	pending_lines.push_back(line);
+	XLineFactory* xlf = GetFactory(line->type);
+	if (!xlf)
+		return false;
+
+	if (xlf->AutoApplyToUserList(line))
+		pending_lines.push_back(line);
+
 	lookup_lines[line->type][line->Displayable()] = line;
 	line->OnAdd();
 
@@ -391,6 +397,11 @@ void XLine::Apply(User* u)
 {
 }
 
+bool XLine::IsBurstable()
+{
+	return true;
+}
+
 void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 {
 	char sreason[MAXBUF];
@@ -398,15 +409,18 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 	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)
 	{
-		ServerInstance->Log(DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString());
-		ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
+		ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString());
+		if (this->duration > 0)
+			ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason, this->duration);
+		else
+			ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
 	}
 }
 
@@ -547,27 +561,27 @@ void ELine::OnAdd()
 
 void ELine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
 }
 
 void QLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",this->nick,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,this->duration);
 }
 
 void ZLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",this->ipaddr,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,this->duration);
 }
 
 void KLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
 }
 
 void GLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
 }
 
 const char* ELine::Displayable()
@@ -595,6 +609,11 @@ const char* QLine::Displayable()
 	return nick;
 }
 
+bool KLine::IsBurstable()
+{
+	return false;
+}
+
 bool XLineManager::RegisterFactory(XLineFactory* xlf)
 {
 	XLineFactMap::iterator n = line_factory.find(xlf->GetType());