Fix typos found by Zaba. Thanks.

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 343f4d504505171400f77c3930ec8b7db7218c63..7a1b4a8aa9fcf2cd966a7fdbef4ac210450b9928 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -684,7 +684,12 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_gline(u,true)))
                                {
                                        snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
+                                       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);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
 
@@ -693,7 +698,12 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_kline(u,true)))
                                {
                                        snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
+                                       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);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
 
@@ -702,7 +712,12 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_qline(u->nick,true)))
                                {
                                        snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
+                                       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);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
 
@@ -711,7 +726,12 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_zline(u->GetIPString(),true)))
                                {
                                        snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u,"Z-Lined", reason);
+                                       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);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                }
@@ -740,7 +760,12 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_gline(u)))
                                {
                                        snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
+                                       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);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                        if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
@@ -748,7 +773,12 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_kline(u)))
                                {
                                        snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
+                                       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);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                        if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
@@ -756,7 +786,12 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_qline(u->nick)))
                                {
                                        snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
+                                       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);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                        if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
@@ -764,7 +799,12 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_zline(u->GetIPString())))
                                {
                                        snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+                                       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);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                }