Fix part of bug #419 (source nick showing in KILL message to user with hidekills on)

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index ac842e248aeccdde23fabbe07eaf447234efc11e..9aecb8d837220b9195242b652e5fadae2aa49e7f 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "cull_list.h"
 
 CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
@@ -166,13 +165,18 @@ int CullList::Apply()
                if (a->GetUser()->registered == REG_ALL)
                {
                        if (IS_LOCAL(a->GetUser()))
+                       {
                                if (!a->IsSilent())
+                               {
                                        ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
+                               }
+                       }
                        else
                        {
-                               if (!ServerInstance->SilentULine(a->GetUser()->server))
-                                       if (!a->IsSilent())
-                                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
+                               if ((!ServerInstance->SilentULine(a->GetUser()->server)) && (!a->IsSilent()))
+                               {
+                                       ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
+                               }
                        }
                        a->GetUser()->AddToWhoWas();
                }