X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_list.cpp;h=b1bb4417203bba41d203037406889dd4e77fe63b;hb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;hp=3371fc738b96dfb371172bda9f9f741da8054845;hpb=93f7aad8ce487fbfa3561070d2e49c81bb4e6816;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp index 3371fc738..b1bb44172 100644 --- a/src/cmd_list.cpp +++ b/src/cmd_list.cpp @@ -2,12 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see * the file COPYING for details. * @@ -41,11 +38,20 @@ CmdResult cmd_list::Handle (const char** parameters, int pcnt, userrec *user) continue; // if the channel is not private/secret, OR the user is on the channel anyway bool n = i->second->HasUser(user); - if (((!(i->second->modes[CM_PRIVATE])) && (!(i->second->modes[CM_SECRET]))) || (n)) + if ((i->second->modes[CM_PRIVATE]) && (!n)) { long users = i->second->GetUserCounter(); if (users) - user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic); + user->WriteServ("322 %s *",user->nick,i->second->name); + } + else + { + if (((!(i->second->modes[CM_PRIVATE])) && (!(i->second->modes[CM_SECRET]))) || (n)) + { + long users = i->second->GetUserCounter(); + if (users) + user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic); + } } } user->WriteServ("323 %s :End of channel list.",user->nick);