summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-04-21 22:19:18 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-04-21 22:19:18 +0000
commit15a1ffae233e1bf28a3c1dc9e1e8b6298c6a0f57 (patch)
tree456e83544f7d8db020f187a9a0a8747c5204b875
parent28a1967177d055fbbd30b18864209721b8075ce1 (diff)
Fix quietbans and hidesplits etc, cull list's sending a seperate quit message to normal users was broken
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9574 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/cull_list.cpp2
-rw-r--r--src/xline.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index f7f163298..db9d4978e 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -51,7 +51,7 @@ int CullList::Apply()
User *u = (*a);
user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
const char* preset_reason = u->GetOperQuit();
- std::string reason = u->operquitmsg;
+ std::string reason = u->quitmsg;
std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
if (reason.length() > MAXQUIT - 1)
diff --git a/src/xline.cpp b/src/xline.cpp
index 610af2e6c..1e2e415cd 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -420,6 +420,7 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
if (*ServerInstance->Config->MoronBanner)
u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+
if (ServerInstance->Config->HideBans)
ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
else