Small api change with wide reaching effects in modules - Allows modification of whats displayed by NAMES on a per-nick basis, so we can have UHNAMES in a seperate module to NAMESX (and possibly do some funky other stuff in the future too!)

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

11 files changed, 27 insertions, 27 deletions

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index c49391d2f..166d1bcc4 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -107,7 +107,7 @@ class ModuleAuditorium : public Module
 
 				/* Show all the opped users */
 				nl = *(Ptr->GetOppedUsers());
-				nl[user] = user;
+				nl[user] = user->nick;
 				nameslist = &nl;
 				return 0;
 			}
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 3f44fd93e..81cf34c0c 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -88,9 +88,9 @@ class FounderProtectBase
 		std::deque<std::string> stackresult;				
 		for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
 		{
-			if (i->second->GetExt(item, dummyptr))
+			if (i->first->GetExt(item, dummyptr))
 			{
-				modestack.Push(mc, i->second->nick);
+				modestack.Push(mc, i->first->nick);
 			}
 		}
 
@@ -113,9 +113,9 @@ class FounderProtectBase
 		std::string item = extend+std::string(channel->name);
 		for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
 		{
-			if (i->second->GetExt(item, dummyptr))
+			if (i->first->GetExt(item, dummyptr))
 			{
-				user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->second->nick);
+				user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->first->nick);
 			}
 		}
 		user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str());
@@ -508,13 +508,13 @@ class ModuleChanProtect : public Module
 			std::deque<std::string> stackresult;
 			for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
 			{
-				if (i->second->GetExt(founder,dummyptr))
+				if (i->first->GetExt(founder,dummyptr))
 				{
-					modestack.Push('q',i->second->nick);
+					modestack.Push('q',i->first->nick);
 				}
-				if (i->second->GetExt(protect,dummyptr))
+				if (i->first->GetExt(protect,dummyptr))
 				{
-					modestack.Push('a',i->second->nick);
+					modestack.Push('a',i->first->nick);
 				}
 			}
 			while (modestack.GetStackedLine(stackresult))
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 5304347c2..23b641294 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -119,7 +119,7 @@ class cmd_check : public command_t
 				/*
 				 * Unlike Asuka, I define a clone as coming from the same host. --w00t
 				 */
-				snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", i->second->GlobalCloneCount(), targchan->GetAllPrefixChars(i->second), i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
+				snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", i->first->GlobalCloneCount(), targchan->GetAllPrefixChars(i->first), i->first->nick, i->first->ident, i->first->dhost, i->first->fullname);
 				user->WriteServ(checkstr + " member " + tmpbuf);
 			}
 		}
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 69fde96f1..2278479cc 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -95,11 +95,11 @@ class ModuleDeaf : public Module
 
 		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			if (IS_LOCAL(i->second))
+			if (IS_LOCAL(i->first))
 			{
-				if (i->second->IsModeSet('d'))
+				if (i->first->IsModeSet('d'))
 				{
-					exempt_list[i->second] = i->second;
+					exempt_list[i->first] = i->first->nick;
 				}
 			}
 		}
diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index 29b741425..ee6334f5e 100644
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -98,11 +98,11 @@ class InvisibleMode : public ModeHandler
 				for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 				{
 					/* User only appears to vanish for non-opers */
-					if (IS_LOCAL(i->second) && !IS_OPER(i->second))
+					if (IS_LOCAL(i->first) && !IS_OPER(i->first))
 					{
-						i->second->Write(out);
+						i->first->Write(out);
 						if (!n.empty() && !adding)
-							i->second->WriteServ("MODE %s +%s", f->first->name, n.c_str());
+							i->first->WriteServ("MODE %s +%s", f->first->name, n.c_str());
 					}
 				}
 
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 5194224b7..8d2be49e5 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -83,13 +83,13 @@ class ModuleNamesX : public Module
 			bool has_user = Ptr->HasUser(user);
 			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 			{
-				if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
+				if ((!has_user) && (i->first->IsModeSet('i')))
 					continue;
 
-				if (i->second->Visibility && !i->second->Visibility->VisibleTo(user))
+				if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
 					continue;
 
-				size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->second), i->second->nick);
+				size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->first), i->second.c_str());
 				curlen += ptrlen;
 				ptr += ptrlen;
 				numusers++;
diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index 9b93e56f4..ef7a46cd1 100644
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -289,11 +289,11 @@ class ModuleSilence : public Module
 
 		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			if (IS_LOCAL(i->second))
+			if (IS_LOCAL(i->first))
 			{
-				if (MatchPattern(i->second, sender, public_silence) == 1)
+				if (MatchPattern(i->first, sender, public_silence) == 1)
 				{
-					exempt_list[i->second] = i->second;
+					exempt_list[i->first] = i->first->nick;
 				}
 			}
 		}
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index ddfc2f18e..e6c9eeb49 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -999,7 +999,7 @@ void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c)
 	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 	{
 		// The first parameter gets a : before it
-		size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->second), i->second->nick);
+		size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->first), i->first->nick);
 
 		curlen += ptrlen;
 		ptr += ptrlen;
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index e1026ca94..b3394dd55 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -208,9 +208,9 @@ void SpanningTreeUtilities::GetListOfServersForChannel(chanrec* c, TreeServerLis
 	}
 	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 	{
-		if ((i->second->GetFd() < 0) && (exempt_list.find(i->second) == exempt_list.end()))
+		if ((i->first->GetFd() < 0) && (exempt_list.find(i->first) == exempt_list.end()))
 		{
-			TreeServer* best = this->BestRouteTo(i->second->server);
+			TreeServer* best = this->BestRouteTo(i->first->server);
 			if (best)
 				AddThisServer(best,list);
 		}
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index de48284ba..7c91119b7 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -39,7 +39,7 @@ void spy_userlist(userrec *user, chanrec *c)
 
 	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 	{
-		size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", c->GetPrefixChar(i->second), i->second->nick);
+		size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", c->GetPrefixChar(i->first), i->first->nick);
 
 		curlen += ptrlen;
 		ptr += ptrlen;
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index ff350a85e..36f1e428a 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -38,7 +38,7 @@ class SSLMode : public ModeHandler
 					CUList* userlist = channel->GetUsers();
 					for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
 					{
-						if(!i->second->GetExt("ssl", dummy))
+						if(!i->first->GetExt("ssl", dummy))
 						{
 							source->WriteServ("490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
 							return MODEACTION_DENY;