From baeb7052e853622477f9f147b389fcff6862fee5 Mon Sep 17 00:00:00 2001
From: w00t
Date: Tue, 24 Jul 2007 12:30:04 +0000
Subject: Merge 7533-7535 from trunk

git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@7536 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/xline.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/xline.cpp')

diff --git a/src/xline.cpp b/src/xline.cpp
index def9db42b..6ae2aa632 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -723,9 +723,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
+						userrec::QuitUser(ServerInstance, u, "G-Lined", reason);
 					else
-						ServerInstance->GlobalCulls.AddItem(u, reason);
+						userrec::QuitUser(ServerInstance, u, reason);
 				}
 			}
 
@@ -737,9 +737,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
+						userrec::QuitUser(ServerInstance, u, "K-Lined", reason);
 					else
-						ServerInstance->GlobalCulls.AddItem(u, reason);
+						userrec::QuitUser(ServerInstance, u, reason);
 				}
 			}
 
@@ -751,9 +751,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
+						userrec::QuitUser(ServerInstance, u, "Q-Lined", reason);
 					else
-						ServerInstance->GlobalCulls.AddItem(u, reason);
+						userrec::QuitUser(ServerInstance, u, reason);
 				}
 			}
 
@@ -765,9 +765,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+						userrec::QuitUser(ServerInstance, u, "Z-Lined", reason);
 					else
-						ServerInstance->GlobalCulls.AddItem(u, reason);
+						userrec::QuitUser(ServerInstance, u, reason);
 				}
 			}
 		}
@@ -799,9 +799,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
+						userrec::QuitUser(ServerInstance, u, "G-Lined", reason);
 					else
-						ServerInstance->GlobalCulls.AddItem(u, reason);
+						userrec::QuitUser(ServerInstance, u, reason);
 				}
 			}
 			if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
@@ -812,9 +812,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
+						userrec::QuitUser(ServerInstance, u, "K-Lined", reason);
 					else
-						ServerInstance->GlobalCulls.AddItem(u, reason);
+						userrec::QuitUser(ServerInstance, u, reason);
 				}
 			}
 			if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
@@ -825,9 +825,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
+						userrec::QuitUser(ServerInstance, u, "Q-Lined", reason);
 					else
-						ServerInstance->GlobalCulls.AddItem(u, reason);
+						userrec::QuitUser(ServerInstance, u, reason);
 				}
 			}
 			if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
@@ -838,9 +838,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+						userrec::QuitUser(ServerInstance, u, "Z-Lined", reason);
 					else
-						ServerInstance->GlobalCulls.AddItem(u, reason);
+						userrec::QuitUser(ServerInstance, u, reason);
 				}
 			}
 		}
-- 
cgit v1.3.1-10-gc9f91