Remove /summon and /users (I think 15+ years of being marked deprecated is enough...

[user/henk/code/inspircd.git] / src / xline.cpp

diff --git a/src/xline.cpp b/src/xline.cpp
index def9db42b92a9693c20796a9e0eee661d2d9aefa..a28e61766f40b85182c5e239b83ee524a4fd6d4a 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
 
@@ -723,9 +721,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 +735,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 +749,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 +763,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 +797,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 +810,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 +823,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 +836,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);
                                }
                        }
                }