X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistmode.cpp;h=0f139bb0129c42a2d44f5dcf6ecc499723fc8c82;hb=173bc63cb59bbf19e73d1b823e3e9423c9f79860;hp=3c9183ff7ebb9d38a4c1fbd949441c64e48b6ef8;hpb=58d7827bb1bd3d90f38a1c199f6f41ae9f24885c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listmode.cpp b/src/listmode.cpp
index 3c9183ff7..0f139bb01 100644
--- a/src/listmode.cpp
+++ b/src/listmode.cpp
@@ -34,15 +34,15 @@ void ListModeBase::DisplayList(User* user, Channel* channel)
 	{
 		for (ModeList::reverse_iterator it = cd->list.rbegin(); it != cd->list.rend(); ++it)
 		{
-			user->WriteNumeric(listnumeric, "%s %s %s %s %lu", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), (!it->setter.empty() ? it->setter.c_str() : ServerInstance->Config->ServerName.c_str()), (unsigned long) it->time);
+			user->WriteNumeric(listnumeric, "%s %s %s %lu", channel->name.c_str(), it->mask.c_str(), (!it->setter.empty() ? it->setter.c_str() : ServerInstance->Config->ServerName.c_str()), (unsigned long) it->time);
 		}
 	}
-	user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
+	user->WriteNumeric(endoflistnumeric, "%s :%s", channel->name.c_str(), endofliststring.c_str());
 }
 
 void ListModeBase::DisplayEmptyList(User* user, Channel* channel)
 {
-	user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
+	user->WriteNumeric(endoflistnumeric, "%s :%s", channel->name.c_str(), endofliststring.c_str());
 }
 
 void ListModeBase::RemoveMode(Channel* channel, irc::modestacker& stack)
@@ -81,7 +81,8 @@ void ListModeBase::DoRehash()
 	if (oldlimits == chanlimits)
 		return;
 
-	for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ++i)
+	const chan_hash& chans = ServerInstance->GetChans();
+	for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i)
 	{
 		ChanData* cd = extItem.get(i->second);
 		if (cd)
@@ -156,7 +157,6 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std
 		{
 			/* List is full, give subclass a chance to send a custom message */
 			TellListTooLong(source, channel, parameter);
-			parameter.clear();
 			return MODEACTION_DENY;
 		}
 
@@ -199,7 +199,6 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std
 
 		/* Tried to remove something that wasn't set */
 		TellNotSet(source, channel, parameter);
-		parameter.clear();
 		return MODEACTION_DENY;
 	}
 }
@@ -211,7 +210,7 @@ bool ListModeBase::ValidateParam(User*, Channel*, std::string&)
 
 void ListModeBase::TellListTooLong(User* source, Channel* channel, std::string& parameter)
 {
-	source->WriteNumeric(478, "%s %s %s :Channel ban list is full", source->nick.c_str(), channel->name.c_str(), parameter.c_str());
+	source->WriteNumeric(ERR_BANLISTFULL, "%s %s :Channel ban list is full", channel->name.c_str(), parameter.c_str());
 }
 
 void ListModeBase::TellAlreadyOnList(User*, Channel*, std::string&)