X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=75f953f437f19dd5553701e88c00524320dba740;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=6a8a57b2bce736b50c656c74c101eabd3e9c218e;hpb=12b9855339a3bbd05cc0636588ea68bf8db390f5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 6a8a57b2b..75f953f43 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,13 +20,13 @@ class AuditoriumMode : public ModeHandler
  public:
 	AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	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->WriteServ("482 %s %s :Only channel operators may %sset channel mode +u", source->nick, channel->name, adding ? "" : "un");
+				source->WriteNumeric(482, "%s %s :Only channel operators may %sset channel mode +u", source->nick, channel->name, adding ? "" : "un");
 				return MODEACTION_DENY;
 			}
 			else
@@ -47,6 +47,7 @@ class ModuleAuditorium : public Module
  private:
 	AuditoriumMode* aum;
 	bool ShowOps;
+	bool OperOverride;
 	CUList nl;
 	CUList except_list;
  public:
@@ -54,12 +55,15 @@ class ModuleAuditorium : public Module
 		: Module(Me)
 	{
 		aum = new AuditoriumMode(ServerInstance);
-		if (!ServerInstance->AddMode(aum))
+		if (!ServerInstance->Modes->AddMode(aum))
+		{
+			delete aum;
 			throw ModuleException("Could not add new modes!");
+		}
 
 		OnRehash(NULL, "");
 
-		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnUserList, I_OnRehash };
+		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash };
 		Me->Modules->Attach(eventlist, this, 6);
 
 	}
@@ -70,56 +74,47 @@ class ModuleAuditorium : public Module
 		delete aum;
 	}
 
-	void Prioritize()
-	{
-		Module* namesx = ServerInstance->Modules->Find("m_namesx.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, &namesx);
-	}
-
 	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader conf(ServerInstance);
 		ShowOps = conf.ReadFlag("auditorium", "showops", 0);
+		OperOverride = conf.ReadFlag("auditorium", "operoverride", 0);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
-	virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
+        virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
 	{
-		if (Ptr->IsModeSet('u'))
+		if (!channel->IsModeSet('u'))
+			return;
+
+		/* Some module hid this from being displayed, dont bother */
+		if (nick.empty())
+			return;
+
+		/* If user is oper and operoverride is on, don't touch the list */
+		if (OperOverride && IS_OPER(user))
+			return;
+
+		if (ShowOps && (issuer != user) && (channel->GetStatus(user) < STATUS_OP))
 		{
-			if (ShowOps)
-			{
-				/* Leave the names list alone, theyre an op
-				 * doing /names on the channel after joining it
-				 */
-				if (Ptr->GetStatus(user) >= STATUS_OP)
-				{
-					nameslist = Ptr->GetUsers();
-					return 0;
-				}
-
-				/* Show all the opped users */
-				nl = *(Ptr->GetOppedUsers());
-				nl[user] = user->nick;
-				nameslist = &nl;
-				return 0;
-			}
-			else
-			{
-				/* HELLOOO, IS ANYBODY THERE? -- nope, just us. */
-				user->WriteServ("353 %s %c %s :%s", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name, user->nick);
-				user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-				return 1;
-			}
+			/* Showops is set, hide all non-ops from the user, except themselves */
+			nick.clear();
+			return;
+		}
+
+		if (!ShowOps && (issuer != user))
+		{
+			/* ShowOps is not set, hide everyone except the user whos requesting NAMES */
+			nick.clear();
+			return;
 		}
-		return 0;
 	}
 	
-	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
 	{
 		if (channel->IsModeSet('u'))
 		{
@@ -166,7 +161,6 @@ class ModuleAuditorium : public Module
 	{
 		Command* parthandler = ServerInstance->Parser->GetHandler("PART");
 		std::vector<std::string> to_leave;
-		const char* parameters[2];
 		if (parthandler)
 		{
 			for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
@@ -177,9 +171,10 @@ class ModuleAuditorium : public Module
 			/* We cant do this neatly in one loop, as we are modifying the map we are iterating */
 			for (std::vector<std::string>::iterator n = to_leave.begin(); n != to_leave.end(); n++)
 			{
-				parameters[0] = n->c_str();
+				std::vector<std::string> parameters;
+				parameters.push_back(*n);
 				/* This triggers our OnUserPart, above, making the PART silent */
-				parthandler->Handle(parameters, 1, user);
+				parthandler->Handle(parameters, user);
 			}
 		}
 	}