-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
/** Handle /WHO. These command handlers can be reloaded by the core,
CommandWho ( Module* parent) : Command(parent,"WHO", 1) {
syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohurmMiaplf]";
}
- void SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults);
+ void SendWhoLine(User* user, const std::vector<std::string>& parms, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults);
/** Handle command.
* @param parameters The parameters to the comamnd
* @param pcnt The number of parameters passed to teh command
};
-static const std::string star = "*";
-
-static const std::string& get_first_visible_channel(User *u)
+static Channel* get_first_visible_channel(User *u)
{
UCListIter i = u->chans.begin();
while (i != u->chans.end())
{
Channel* c = *i++;
if (!c->IsModeSet('s'))
- return c->name;
+ return c;
}
-
- return star;
+ return NULL;
}
bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
long seconds = ServerInstance->Duration(matchtext);
// Okay, so time matching, we want all users connected `seconds' ago
- if (user->age >= ServerInstance->Time() - seconds)
+ if (user->signon >= ServerInstance->Time() - seconds)
match = true;
}
}
}
-
-
bool CommandWho::CanView(Channel* chan, User* user)
{
if (!user || !chan)
return false;
}
-void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults)
+void CommandWho::SendWhoLine(User* user, const std::vector<std::string>& parms, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults)
{
- const std::string& lcn = get_first_visible_channel(u);
- Channel* chlast = ServerInstance->FindChan(lcn);
+ if (!ch)
+ ch = get_first_visible_channel(u);
- std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
- ((!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex")) ? ServerInstance->Config->HideWhoisServer : u->server) +
- " " + u->nick + " ";
+ std::string wholine = initial + (ch ? ch->name : "*") + " " + u->ident + " " +
+ (opt_showrealhost ? u->host : u->dhost) + " ";
+ if (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex"))
+ wholine.append(ServerInstance->Config->HideWhoisServer);
+ else
+ wholine.append(u->server);
+
+ wholine.append(" " + u->nick + " ");
/* away? */
if (IS_AWAY(u))
/* oper? */
if (IS_OPER(u))
{
- wholine.append("*");
+ wholine.push_back('*');
}
- wholine = wholine + (ch ? ch->GetPrefixChar(u) : (chlast ? chlast->GetPrefixChar(u) : "")) + " :0 " + u->fullname;
+ if (ch)
+ wholine.append(ch->GetPrefixChar(u));
+
+ wholine.append(" :0 " + u->fullname);
- FOREACH_MOD(I_OnSendWhoLine, OnSendWhoLine(user, u, ch, wholine));
+ FOREACH_MOD(I_OnSendWhoLine, OnSendWhoLine(user, parms, u, wholine));
if (!wholine.empty())
whoresults.push_back(wholine);
Channel *ch = NULL;
std::vector<std::string> whoresults;
- std::string initial = "352 " + std::string(user->nick) + " ";
+ std::string initial = "352 " + user->nick + " ";
char matchtext[MAXBUF];
bool usingwildcards = false;
for (const char* check = matchtext; *check; check++)
{
- if (*check == '*' || *check == '?')
+ if (*check == '*' || *check == '?' || *check == '.')
{
usingwildcards = true;
break;
continue;
}
- SendWhoLine(user, initial, ch, i->first, whoresults);
+ SendWhoLine(user, parameters, initial, ch, i->first, whoresults);
}
}
}
{
if (!user->SharesChannelWith(oper))
{
- if (usingwildcards && (!oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
+ if (usingwildcards && (oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
continue;
}
- SendWhoLine(user, initial, NULL, oper, whoresults);
+ SendWhoLine(user, parameters, initial, NULL, oper, whoresults);
}
}
}
continue;
}
- SendWhoLine(user, initial, NULL, i->second, whoresults);
+ SendWhoLine(user, parameters, initial, NULL, i->second, whoresults);
}
}
}
projects / user / henk / code / inspircd.git / blobdiff