ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-11 11:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed behavior of KICK in m_auditorium, fixes bug #649 reported by Schiz0.

Browse Source 
Also replaced usage of Channel::WriteAllExcept() with WriteAllExceptSender()
as the former does not except the sender and requires an extra unused variable.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10944 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
dz 2009-01-04 03:52:20 +00:00
parent b811ecdafa
commit b81ab1f1cd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/m_auditorium.cpp
View File

@ -48,8 +48,6 @@ class ModuleAuditorium : public Module
AuditoriumMode* aum;
bool ShowOps;
bool OperOverride;
CUList nl;
CUList except_list;
public:
ModuleAuditorium(InspIRCd* Me)
: Module(Me)
@ -122,7 +120,7 @@ class ModuleAuditorium : public Module
/* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */
user->WriteFrom(user, "JOIN %s", channel->name.c_str());
if (ShowOps)
channel->WriteAllExcept(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', except_list, "JOIN %s", channel->name.c_str());
channel->WriteAllExceptSender(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', "JOIN %s", channel->name.c_str());
}
}
@ -137,7 +135,7 @@ class ModuleAuditorium : public Module
partmessage.empty() ? "" : partmessage.c_str());
if (ShowOps)
{
channel->WriteAllExcept(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', except_list, "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :",
channel->WriteAllExceptSender(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :",
partmessage.empty() ? "" : partmessage.c_str());
}
}
@ -151,8 +149,8 @@ class ModuleAuditorium : public Module
/* Send silenced event only to the user being kicked and the user doing the kick */
source->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
if (ShowOps)
chan->WriteAllExcept(source, false, chan->GetStatus(source) >= STATUS_OP ? 0 : '@', except_list, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
else
chan->WriteAllExceptSender(source, false, chan->GetStatus(user) >= STATUS_OP ? 0 : '@', "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
if ((!ShowOps) || (chan->GetStatus(user) < STATUS_OP)) /* make sure the target gets the event */
user->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
}
}