X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_list.cpp;h=6a62d122f660e1e932b4e7d28463a19cbe13f61a;hb=b0654ef6abd8d976fcbadce24ea350f7c420fe08;hp=278e6044d0e31fd2792d14a6ad89229849b0bbe6;hpb=8f5efbc7aa33b792e02d01e3288f553e6e98ccaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp
index 278e6044d..6a62d122f 100644
--- a/src/coremods/core_list.cpp
+++ b/src/coremods/core_list.cpp
@@ -53,10 +53,9 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 {
 	int minusers = 0, maxusers = 0;
 
-	user->WriteNumeric(RPL_LISTSTART, "Channel :Users Name");
+	user->WriteNumeric(RPL_LISTSTART, "Channel", "Users Name");
 
-	/* Work around mIRC suckyness. YOU SUCK, KHALED! */
-	if (parameters.size() == 1)
+	if ((parameters.size() == 1) && (!parameters[0].empty()))
 	{
 		if (parameters[0][0] == '<')
 		{
@@ -100,16 +99,16 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 			if ((!n) && (chan->IsModeSet(privatemode)))
 			{
 				// Channel is private (+p) and user is outside/not privileged
-				user->WriteNumeric(RPL_LIST, "* %ld :", users);
+				user->WriteNumeric(RPL_LIST, '*', users, "");
 			}
 			else
 			{
 				/* User is in the channel/privileged, channel is not +s */
-				user->WriteNumeric(RPL_LIST, "%s %ld :[+%s] %s", chan->name.c_str(), users, chan->ChanModes(n), chan->topic.c_str());
+				user->WriteNumeric(RPL_LIST, chan->name, users, InspIRCd::Format("[+%s] %s", chan->ChanModes(n), chan->topic.c_str()));
 			}
 		}
 	}
-	user->WriteNumeric(RPL_LISTEND, ":End of channel list.");
+	user->WriteNumeric(RPL_LISTEND, "End of channel list.");
 
 	return CMD_SUCCESS;
 }