Add <auditorium showops> which determines if auditorium works like ircnet +a (anonymous channels) or like unrealircd +u.

The old behaviour is similar to anonymous channels, only showing the current user.


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6875 e03df62e-2008-0410-955e-edbf42e46eb7

6 files changed, 50 insertions, 15 deletions

diff --git a/include/channels.h b/include/channels.h
index 305ff9974..0e60e305f 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -436,8 +436,10 @@ class chanrec : public Extensible
 
 	/** Spool the NAMES list for this channel to the given user
 	 * @param user The user to spool the NAMES list to
+	 * @param ulist The user list to send, NULL to use the
+	 * channel's default names list of everyone
 	 */
-	void UserList(userrec *user);
+	void UserList(userrec *user, CUList* ulist = NULL);
 
 	/** Get the number of invisible users on this channel
 	 * @return Number of invisible users
diff --git a/include/modules.h b/include/modules.h
index 51eb5a19b..78bb103fa 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1338,7 +1338,7 @@ class Module : public Extensible
 	 * and if you do you must return 1. If you do not handle the names list,
 	 * return 0.
 	 */
-	virtual int OnUserList(userrec* user, chanrec* Ptr);
+	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist);
 
 	/** Called whenever a line of WHOIS output is sent to a user.
 	 * You may change the numeric and the text of the output by changing
diff --git a/src/channels.cpp b/src/channels.cpp
index 00f8dbce6..700487af9 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -802,7 +802,7 @@ char* chanrec::ChanModes(bool showkey)
 /* compile a userlist of a channel into a string, each nick seperated by
  * spaces and op, voice etc status shown as @ and +, and send it to 'user'
  */
-void chanrec::UserList(userrec *user)
+void chanrec::UserList(userrec *user, CUList *ulist)
 {
 	char list[MAXBUF];
 	size_t dlen, curlen;
@@ -811,7 +811,7 @@ void chanrec::UserList(userrec *user)
 	if (!IS_LOCAL(user))
 		return;
 
-	FOREACH_RESULT(I_OnUserList,OnUserList(user, this));
+	FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist));
 	if (MOD_RESULT == 1)
 		return;
 
@@ -820,7 +820,8 @@ void chanrec::UserList(userrec *user)
 	int numusers = 0;
 	char* ptr = list + dlen;
 
-	CUList *ulist= this->GetUsers();
+	if (!ulist)
+		ulist= this->GetUsers();
 
 	/* Improvement by Brain - this doesnt change in value, so why was it inside
 	 * the loop?
diff --git a/src/modules.cpp b/src/modules.cpp
index f4cc5d3b9..f4b2b294f 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -188,7 +188,7 @@ void		Module::OnChannelDelete(chanrec* chan) { };
 Priority	Module::Prioritize() { return PRIORITY_DONTCARE; }
 void		Module::OnSetAway(userrec* user) { };
 void		Module::OnCancelAway(userrec* user) { };
-int		Module::OnUserList(userrec* user, chanrec* Ptr) { return 0; };
+int		Module::OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist) { return 0; };
 int		Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; };
 void		Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) { };
 void		Module::OnGarbageCollect() { };
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index f6b1ff3d8..8bab76b49 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -49,6 +49,9 @@ class ModuleAuditorium : public Module
 {
  private:
 	AuditoriumMode* aum;
+	bool ShowOps;
+	CUList nl;
+	CUList except_list;
  public:
 	ModuleAuditorium(InspIRCd* Me)
 		: Module::Module(Me)
@@ -56,6 +59,7 @@ class ModuleAuditorium : public Module
 		aum = new AuditoriumMode(ServerInstance);
 		if (!ServerInstance->AddMode(aum, 'u'))
 			throw ModuleException("Could not add new modes!");
+		OnRehash(NULL, "");
 	}
 	
 	virtual ~ModuleAuditorium()
@@ -64,6 +68,12 @@ class ModuleAuditorium : public Module
 		DELETE(aum);
 	}
 
+	virtual void OnRehash(userrec* user, const std::string &parameter)
+	{
+		ConfigReader conf(ServerInstance);
+		ShowOps = conf.ReadFlag("auditorium", "showops", 0);
+	}
+
 	Priority Prioritize()
 	{
 		/* To ensure that we get priority over namesx for names list generation on +u channels */
@@ -77,17 +87,28 @@ class ModuleAuditorium : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = 1;
+		List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = List[I_OnRehash] = 1;
 	}
 
-	virtual int OnUserList(userrec* user, chanrec* Ptr)
+	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &nameslist)
 	{
 		if (Ptr->IsModeSet('u'))
 		{
-			/* HELLOOO, IS ANYBODY THERE? -- nope, just us. */
-			user->WriteServ("353 %s = %s :%s", user->nick, Ptr->name, user->nick);
-			user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-			return 1;
+			if (ShowOps)
+			{
+				/* Show all the opped users */
+				nl = *(Ptr->GetOppedUsers());
+				nl[user] = user;
+				nameslist = &nl;
+				return 0;
+			}
+			else
+			{
+				/* HELLOOO, IS ANYBODY THERE? -- nope, just us. */
+				user->WriteServ("353 %s = %s :%s", user->nick, Ptr->name, user->nick);
+				user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
+				return 1;
+			}
 		}
 		return 0;
 	}
@@ -99,6 +120,8 @@ class ModuleAuditorium : public Module
 			silent = true;
 			/* 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);
+			if (ShowOps)
+				channel->WriteAllExcept(user, false, '@', except_list, "JOIN %s", channel->name);
 		}
 	}
 
@@ -111,6 +134,9 @@ class ModuleAuditorium : public Module
 			user->WriteFrom(user, "PART %s%s%s", channel->name,
 					partmessage.empty() ? "" : " :",
 					partmessage.empty() ? "" : partmessage.c_str());
+			if (ShowOps)
+				channel->WriteAllExcept(user, false, '@', except_list, "PART %s%s%s", channel->name, partmessage.empty() ? "" : " :",
+						partmessage.empty() ? "" : partmessage.c_str());
 		}
 	}
 
@@ -121,7 +147,10 @@ class ModuleAuditorium : public Module
 			silent = true;
 			/* Send silenced event only to the user being kicked and the user doing the kick */
 			source->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, reason.c_str());
-			user->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, reason.c_str());
+			if (ShowOps)
+				chan->WriteAllExcept(source, false, '@', except_list, "KICK %s %s %s", chan->name, user->nick, reason.c_str());
+			else
+				user->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, reason.c_str());
 		}
 	}
 
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index badbae074..5194224b7 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -67,7 +67,7 @@ class ModuleNamesX : public Module
 		return 0;
 	}
 
-	virtual int OnUserList(userrec* user, chanrec* Ptr)
+	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
 	{
 		if (user->GetExt("NAMESX"))
 		{
@@ -76,7 +76,10 @@ class ModuleNamesX : public Module
 			dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
 			int numusers = 0;
 			char* ptr = list + dlen;
-			CUList *ulist= Ptr->GetUsers();
+
+			if (!ulist)
+				ulist = Ptr->GetUsers();
+
 			bool has_user = Ptr->HasUser(user);
 			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 			{