Refactor port binding, warning not yet tested fully

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 1996925de12b4f84065d8a56674e081157d4ce4a..b6721de09cbcafc37d244975740320d1b3e15e41 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -684,7 +684,10 @@ 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,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
 
@@ -693,7 +696,10 @@ 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,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
 
@@ -702,7 +708,10 @@ 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,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
 
@@ -711,7 +720,10 @@ 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,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                }
@@ -740,7 +752,10 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_gline(u)))
                                {
                                        snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u,reason);
+                                       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 +763,10 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_kline(u)))
                                {
                                        snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u,reason);
+                                       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,15 +774,21 @@ 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,reason);
+                                       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()))
                        {
                                if ((check = matches_zline(u->GetIPString())))
                                {
-                                       snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
-                                       ServerInstance->GlobalCulls.AddItem(u,reason);
+                                       snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                }