X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_who.cpp;h=c4c37e52876d260c0ac32c3af203fbdf8b85695e;hb=166dfe4163f0941148f5927c28dfbdb8bdb49c5e;hp=bb4a37234010174b0153d9d9ad10ec889bc1f2ee;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp index bb4a37234..c4c37e528 100644 --- a/src/cmd_who.cpp +++ b/src/cmd_who.cpp @@ -1,54 +1,63 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | 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. + * the file COPYING for details. * * --------------------------------------------------- */ #include "configreader.h" #include "users.h" -#include "message.h" #include "modules.h" -#include "commands.h" -#include "helperfuncs.h" #include "wildcard.h" #include "commands/cmd_who.h" -extern ServerConfig* Config; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; - /* get the last 'visible' chan of a user */ static char *getlastchanname(userrec *u) { - for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) + UCListIter i = u->chans.begin(); + if (i != u->chans.end()) { - ucrec* temp = (ucrec*)*v; - - if (temp->channel) - { - if (!temp->channel->IsModeSet('s')) - return temp->channel->name; - } + if (!i->first->IsModeSet('s')) + return i->first->name; } return "*"; } -bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_showrealhost) +bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_showrealhost, bool opt_mode) { bool realhost = false; bool realname = false; + bool positive = true; + + if (user->registered != REG_ALL) + return false; + + if (opt_mode) + { + for (const char* n = matchtext; *n; n++) + { + if (*n == '+') + { + positive = true; + continue; + } + else if (*n == '-') + { + positive = false; + continue; + } + if (user->IsModeSet(*n) != positive) + return false; + } + return true; + } if (opt_realname) realname = match(user->fullname, matchtext); @@ -59,7 +68,59 @@ bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_ return ((realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext))); } -void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) + + +extern "C" command_t* init_command(InspIRCd* Instance) +{ + return new cmd_who(Instance); +} + +bool cmd_who::CanView(chanrec* chan, userrec* user) +{ + if (!user || !chan) + return false; + + /* Execute items in fastest-to-execute first order */ + if (*user->oper) + return true; + else if (!chan->IsModeSet('s') && !chan->IsModeSet('p')) + return true; + else if (chan->HasUser(user)) + return true; + + return false; +} + +void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector &whoresults) +{ + std::string lcn = getlastchanname(u); + chanrec* chlast = ServerInstance->FindChan(lcn); + + std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " + + ((*ServerInstance->Config->HideWhoisServer && !*user->oper) ? ServerInstance->Config->HideWhoisServer : u->server) + + " " + u->nick + " "; + + /* away? */ + if (u->awaymsg) + { + wholine.append("G"); + } + else + { + wholine.append("H"); + } + + /* oper? */ + if (u->oper) + { + wholine.append("*"); + } + + wholine = wholine + (ch ? ch->GetPrefixChar(u) : (chlast ? chlast->GetPrefixChar(u) : "")) + " :0 " + u->fullname; + whoresults.push_back(wholine); +} + +CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) { /* * XXX - RFC says: @@ -69,10 +130,11 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) */ /* WHO options */ - bool opt_viewopersonly = false; - bool opt_showrealhost = false; - bool opt_unlimit = false; - bool opt_realname = false; + opt_viewopersonly = false; + opt_showrealhost = false; + opt_unlimit = false; + opt_realname = false; + opt_mode = false; chanrec *ch = NULL; std::vector whoresults; @@ -108,6 +170,9 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) case 'r': opt_realname = true; break; + case 'm': + opt_mode = true; + break; } *iter++; @@ -116,9 +181,9 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) /* who on a channel? */ - ch = FindChan(matchtext); + ch = ServerInstance->FindChan(matchtext); - if (ch) + if ((ch) && (CanView(ch,user))) { /* who on a channel. */ CUList *cu = ch->GetUsers(); @@ -129,30 +194,7 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) if (opt_viewopersonly && !*(i->second)->oper) continue; - /* XXX - code duplication; this could be more efficient -- w00t */ - std::string wholine = initial; - - wholine = wholine + ch->name + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " + - i->second->server + " " + i->second->nick + " "; - - /* away? */ - if (*(i->second)->awaymsg) - { - wholine.append("G"); - } - else - { - wholine.append("H"); - } - - /* oper? */ - if (*(i->second)->oper) - { - wholine.append("*"); - } - - wholine = wholine + cmode(i->second, ch) + " :0 " + i->second->fullname; - whoresults.push_back(wholine); + SendWhoLine(user, initial, ch, i->second, whoresults); } } else @@ -162,81 +204,39 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) if (opt_viewopersonly) { /* Showing only opers */ - for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) + for (std::vector::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++) { userrec* oper = *i; - if (whomatch(oper, matchtext, opt_realname, opt_showrealhost)) + if (whomatch(oper, matchtext, opt_realname, opt_showrealhost, opt_mode)) { - std::string wholine = initial; - - wholine = wholine + getlastchanname(oper) + " " + oper->ident + " " + (opt_showrealhost ? oper->host : oper->dhost) + " " + - oper->server + " " + oper->nick + " "; - - /* away? */ - if (*oper->awaymsg) - { - wholine.append("G"); - } - else - { - wholine.append("H"); - } - - /* oper? */ - if (*oper->oper) - { - wholine.append("*"); - } - - wholine = wholine + cmode(oper, ch) + " :0 " + oper->fullname; - whoresults.push_back(wholine); + SendWhoLine(user, initial, NULL, oper, whoresults); } } } else { - for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++) { - if (whomatch(i->second, matchtext, opt_realname, opt_showrealhost)) + if (whomatch(i->second, matchtext, opt_realname, opt_showrealhost, opt_mode)) { - std::string wholine = initial; - - wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " + - i->second->server + " " + i->second->nick + " "; - - /* away? */ - if (*(i->second)->awaymsg) - { - wholine.append("G"); - } - else - { - wholine.append("H"); - } - - /* oper? */ - if (*(i->second)->oper) - { - wholine.append("*"); - } - - wholine = wholine + cmode(i->second, ch) + " :0 " + i->second->fullname; - whoresults.push_back(wholine); + SendWhoLine(user, initial, NULL, i->second, whoresults); } } } } /* Send the results out */ - if ((whoresults.size() < (size_t)Config->MaxWhoResults) && (!opt_unlimit)) + if ((whoresults.size() < (size_t)ServerInstance->Config->MaxWhoResults) && (!opt_unlimit)) { for (std::vector::const_iterator n = whoresults.begin(); n != whoresults.end(); n++) user->WriteServ(*n); - user->WriteServ("315 %s %s :End of /WHO list.",user->nick, parameters[0]); + user->WriteServ("315 %s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*"); + return CMD_SUCCESS; } else { /* BZZT! Too many results. */ user->WriteServ("315 %s %s :Too many results",user->nick, parameters[0]); + return CMD_FAILURE; } }