X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=8da062593f99ed2f2f157bdfab7866a72ee0d2d9;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=023cb7adf431f0194aae55111773aaa956cab399;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 023cb7adf..8da062593 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -18,22 +18,14 @@
 class AuditoriumMode : public ModeHandler
 {
  public:
-	AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false, 0, '@') { }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (channel->IsModeSet('u') != adding)
 		{
-			if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP))
-			{
-				source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only channel operators may %sset channel mode +u", source->nick.c_str(), channel->name.c_str(), adding ? "" : "un");
-				return MODEACTION_DENY;
-			}
-			else
-			{
-				channel->SetMode('u', adding);
-				return MODEACTION_ALLOW;
-			}
+			channel->SetMode('u', adding);
+			return MODEACTION_ALLOW;
 		}
 		else
 		{
@@ -45,36 +37,29 @@ class AuditoriumMode : public ModeHandler
 class ModuleAuditorium : public Module
 {
  private:
-	AuditoriumMode* aum;
+	AuditoriumMode aum;
 	bool ShowOps;
 	bool OperOverride;
-	CUList nl;
-	CUList except_list;
  public:
 	ModuleAuditorium(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), aum(Me)
 	{
-		aum = new AuditoriumMode(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(aum))
-		{
-			delete aum;
+		if (!ServerInstance->Modes->AddMode(&aum))
 			throw ModuleException("Could not add new modes!");
-		}
 
-		OnRehash(NULL, "");
+		OnRehash(NULL);
 
-		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash };
-		Me->Modules->Attach(eventlist, this, 6);
+		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash, I_OnHostCycle };
+		Me->Modules->Attach(eventlist, this, 7);
 
 	}
 
 	virtual ~ModuleAuditorium()
 	{
-		ServerInstance->Modes->DelMode(aum);
-		delete aum;
+		ServerInstance->Modes->DelMode(&aum);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ConfigReader conf(ServerInstance);
 		ShowOps = conf.ReadFlag("auditorium", "showops", 0);
@@ -96,7 +81,7 @@ class ModuleAuditorium : public Module
 			return;
 
 		/* If user is oper and operoverride is on, don't touch the list */
-		if (OperOverride && IS_OPER(user))
+		if (OperOverride && issuer->HasPrivPermission("channels/auspex"))
 			return;
 
 		if (ShowOps && (issuer != user) && (channel->GetStatus(user) < STATUS_OP))
@@ -114,7 +99,21 @@ class ModuleAuditorium : public Module
 		}
 	}
 
-	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
+	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, bool created)
 	{
 		if (channel->IsModeSet('u'))
 		{
@@ -122,7 +121,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 +137,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,12 +152,22 @@ 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);
 		}
 	}
 
+	bool OnHostCycle(User* user)
+	{
+		for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
+			if (f->first->IsModeSet('u'))
+				return true;
+
+		return false;
+	}
+
 	void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		Command* parthandler = ServerInstance->Parser->GetHandler("PART");