X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=ce6a582fd18c5101fbd64b0bdd0f773fc1301b42;hb=f14271bdb80dd6af67cde4fb97df9716613a7177;hp=9b80555f4af0a307494d63b9e2bb9f0a05544cc8;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 9b80555f4..ce6a582fd 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -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)
@@ -96,7 +94,7 @@ class ModuleAuditorium : public Module
 			return;
 
 		/* If user is oper and operoverride is on, don't touch the list */
-		if (OperOverride && user->HasPrivPermission("channels/auspex"))
+		if (OperOverride && issuer->HasPrivPermission("channels/auspex"))
 			return;
 
 		if (ShowOps && (issuer != user) && (channel->GetStatus(user) < STATUS_OP))
@@ -114,6 +112,20 @@ class ModuleAuditorium : public Module
 		}
 	}
 
+	void WriteOverride(User* source, Channel* channel, const std::string &text)
+	{
+		if (!OperOverride)
+			return;
+
+		CUList *ulist = channel->GetUsers();
+		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+		{
+			if (i->first->HasPrivPermission("channels/auspex") && source != i->first)
+				if (!ShowOps || (ShowOps && channel->GetStatus(i->first) < STATUS_OP))
+					i->first->WriteFrom(source, "%s",text.c_str());
+		}
+	}
+
 	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
 	{
 		if (channel->IsModeSet('u'))
@@ -122,7 +134,8 @@ 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());
+			WriteOverride(user, channel, "JOIN "+channel->name);
 		}
 	}
 
@@ -137,9 +150,10 @@ 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());
 			}
+			WriteOverride(user, channel, "PART " + channel->name + (partmessage.empty() ? "" : (" :" + partmessage)));
 		}
 	}
 
@@ -151,9 +165,10 @@ 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());
+			WriteOverride(source, chan, "KICK " + chan->name + " " + user->nick + " " + reason);
 		}
 	}