From fe3799248f7d4cf50b1ba704615d5952dede8917 Mon Sep 17 00:00:00 2001
From: brain
Date: Mon, 28 Aug 2006 01:02:41 +0000
Subject: Add support for NAMESX Tidy up m_alias blank lines Add m_namesx.so to
 example conf (no extra config tags required for it, it "just works")

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5039 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/channels.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/channels.cpp')

diff --git a/src/channels.cpp b/src/channels.cpp
index e7564c3ea..345ec79dd 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -450,7 +450,6 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* u
 			user->WriteServ("333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
 		}
 		Ptr->UserList(user);
-		user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
 	}
 	FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user,Ptr));
 	return Ptr;
@@ -811,6 +810,14 @@ void chanrec::UserList(userrec *user)
 {
 	char list[MAXBUF];
 	size_t dlen, curlen;
+	int MOD_RESULT = 0;
+
+	FOREACH_RESULT(I_OnUserList,OnUserList(user, this));
+	ServerInstance->Log(DEBUG,"MOD_RESULT for UserList = %d",MOD_RESULT);
+	if (MOD_RESULT == 1)
+		return;
+
+	ServerInstance->Log(DEBUG,"Using builtin NAMES list generation");
 
 	dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
 
@@ -861,6 +868,8 @@ void chanrec::UserList(userrec *user)
 	{
 		user->WriteServ(list);
 	}
+
+	user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
 }
 
 long chanrec::GetMaxBans()
-- 
cgit v1.3.1-10-gc9f91