X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_who.cpp;h=6f8b91e75fff8d42af961e95216d1b0b1dcd5f0a;hb=3c93d5d1c46953ad152f619885c4f3678d4a3ecc;hp=18b9eb441bd5ad36fad9830ec2e93a90441c05a6;hpb=a2180fadb0df07552af312b664715fccb9be4461;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp index 18b9eb441..6f8b91e75 100644 --- a/src/commands/cmd_who.cpp +++ b/src/commands/cmd_who.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -12,10 +12,11 @@ */ #include "inspircd.h" -#include "wildcard.h" #include "commands/cmd_who.h" -static char *get_first_visible_channel(User *u) +static const std::string star = "*"; + +static const std::string& get_first_visible_channel(User *u) { UCListIter i = u->chans.begin(); if (i != u->chans.end()) @@ -24,18 +25,13 @@ static char *get_first_visible_channel(User *u) return i->first->name; } - return "*"; + return star; } bool CommandWho::whomatch(User* user, const char* matchtext) { - bool realhost = false; - bool realname = false; - bool positive = true; - bool metadata = false; - bool ident = false; - bool away = false; - bool port = false; + bool match = false; + bool positive = false; char* dummy = NULL; if (user->registered != REG_ALL) @@ -67,41 +63,58 @@ bool CommandWho::whomatch(User* user, const char* matchtext) } else { - + /* + * This was previously one awesome pile of ugly nested if, when really, it didn't need + * to be, since only one condition was ever checked, a chained if works just fine. + * -- w00t + */ if (opt_metadata) - metadata = user->GetExt(matchtext, dummy); - else + match = user->GetExt(matchtext, dummy); + else if (opt_realname) + match = InspIRCd::Match(user->fullname, matchtext); + else if (opt_showrealhost) + match = InspIRCd::Match(user->host, matchtext); + else if (opt_ident) + match = InspIRCd::Match(user->ident, matchtext); + else if (opt_port) { - if (opt_realname) - realname = match(user->fullname, matchtext); - else - { - if (opt_showrealhost) - realhost = match(user->host, matchtext); - else + irc::portparser portrange(matchtext, false); + long portno = -1; + while ((portno = portrange.GetToken())) + if (portno == user->GetPort()) { - if (opt_ident) - ident = match(user->ident, matchtext); - else - { - if (opt_port) - { - irc::portparser portrange(matchtext, false); - long portno = -1; - while ((portno = portrange.GetToken())) - if (portno == user->GetPort()) - port = true; - } - else - { - if (opt_away) - away = match(user->awaymsg, matchtext); - } - } + match = true; + break; } - } } - return ((port) || (away) || (ident) || (metadata) || (realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext))); + else if (opt_away) + match = InspIRCd::Match(user->awaymsg, matchtext); + else if (opt_time) + { + long seconds = ServerInstance->Duration(matchtext); + + // Okay, so time matching, we want all users connected `seconds' ago + if (user->age >= ServerInstance->Time() - seconds) + match = true; + } + + /* + * Once the conditionals have been checked, only check dhost/nick/server + * if they didn't match this user -- and only match if we don't find a match. + * + * This should make things minutely faster, and again, less ugly. + * -- w00t + */ + if (!match) + match = InspIRCd::Match(user->dhost, matchtext); + + if (!match) + match = InspIRCd::Match(user->nick, matchtext); + + if (!match) + match = InspIRCd::Match(user->server, matchtext); + + return match; } } @@ -123,7 +136,7 @@ bool CommandWho::CanView(Channel* chan, User* user) if (chan->HasUser(user)) return true; /* Opers see all */ - if (IS_OPER(user)) + if (user->HasPrivPermission("users/auspex")) return true; /* Cant see inside a +s or a +p channel unless we are a member (see above) */ else if (!chan->IsModeSet('s') && !chan->IsModeSet('p')) @@ -134,15 +147,15 @@ bool CommandWho::CanView(Channel* chan, User* user) void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector &whoresults) { - std::string lcn = get_first_visible_channel(u); - Channel* chlast = ServerInstance->FindChan(lcn); - /* Not visible to this user */ if (u->Visibility && !u->Visibility->VisibleTo(user)) return; + const std::string& lcn = get_first_visible_channel(u); + Channel* chlast = ServerInstance->FindChan(lcn); + std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " + - ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) + + ((*ServerInstance->Config->HideWhoisServer && !user->HasPrivPermission("servers/auspex")) ? ServerInstance->Config->HideWhoisServer : u->server) + " " + u->nick + " "; /* away? */ @@ -165,7 +178,7 @@ void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch whoresults.push_back(wholine); } -CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandWho::Handle (const std::vector& parameters, User *user) { /* * XXX - RFC says: @@ -186,18 +199,20 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user) opt_away = false; opt_local = false; opt_far = false; + opt_time = false; Channel *ch = NULL; std::vector whoresults; std::string initial = "352 " + std::string(user->nick) + " "; - const char* matchtext = NULL; + char matchtext[MAXBUF]; bool usingwildcards = false; /* Change '0' into '*' so the wildcard matcher can grok it */ - matchtext = parameters[0]; - if (!strcmp(matchtext,"0")) - matchtext = "*"; + if (parameters[0] == "0") + strlcpy(matchtext, "*", MAXBUF); + else + strlcpy(matchtext, parameters[0].c_str(), MAXBUF); for (const char* check = matchtext; *check; check++) { @@ -208,56 +223,57 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user) } } - if (pcnt > 1) - { - /* parse flags */ - const char *iter = parameters[1]; + if (ServerInstance->FindServerName(matchtext)) + usingwildcards = true; + if (parameters.size() > 1) + { /* Fix for bug #444, WHO flags count as a wildcard */ usingwildcards = true; - while (*iter) + for (std::string::const_iterator iter = parameters[1].begin(); iter != parameters[1].end(); ++iter) { switch (*iter) { case 'o': opt_viewopersonly = true; - break; + break; case 'h': - if (IS_OPER(user)) + if (user->HasPrivPermission("users/auspex")) opt_showrealhost = true; - break; + break; case 'u': - if (IS_OPER(user)) + if (user->HasPrivPermission("users/auspex")) opt_unlimit = true; - break; + break; case 'r': opt_realname = true; - break; + break; case 'm': opt_mode = true; - break; + break; case 'M': opt_metadata = true; - break; + break; case 'i': opt_ident = true; - break; + break; case 'p': opt_port = true; - break; + break; case 'a': opt_away = true; - break; + break; case 'l': opt_local = true; - break; + break; case 'f': opt_far = true; - break; + break; + case 't': + opt_time = true; + break; } - - *iter++; } } @@ -284,7 +300,7 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user) continue; /* If we're not inside the channel, hide +i users */ - if (i->first->IsModeSet('i') && !inside && !IS_OPER(user)) + if (i->first->IsModeSet('i') && !inside && !user->HasPrivPermission("users/auspex")) continue; } @@ -298,7 +314,7 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user) if (opt_viewopersonly) { /* Showing only opers */ - for (std::list::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++) + for (std::list::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++) { User* oper = *i; @@ -306,7 +322,7 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user) { if (!user->SharesChannelWith(oper)) { - if (usingwildcards && (!oper->IsModeSet('i')) && (!IS_OPER(user))) + if (usingwildcards && (!oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex"))) continue; } @@ -316,13 +332,13 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user) } else { - for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++) + for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++) { if (whomatch(i->second, matchtext)) { if (!user->SharesChannelWith(i->second)) { - if (usingwildcards && (i->second->IsModeSet('i')) && (!IS_OPER(user))) + if (usingwildcards && (i->second->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex"))) continue; } @@ -336,13 +352,13 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user) { 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] ? parameters[0] : "*"); + user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick.c_str(), *parameters[0].c_str() ? parameters[0].c_str() : "*"); return CMD_SUCCESS; } else { /* BZZT! Too many results. */ - user->WriteServ("315 %s %s :Too many results",user->nick, parameters[0]); + user->WriteNumeric(315, "%s %s :Too many results",user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } }