#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 InspIRCd* ServerInstance;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-
/* get the last 'visible' chan of a user */
static char *getlastchanname(userrec *u)
{
bool realhost = false;
bool realname = false;
+ if (user->registered != REG_ALL)
+ return false;
+
if (opt_realname)
realname = match(user->fullname, matchtext);
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);
+}
+
+CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
{
/*
* XXX - RFC says:
wholine.append("*");
}
- wholine = wholine + ch->GetStatusChar(i->second) + " :0 " + i->second->fullname;
+ wholine = wholine + ch->GetPrefixChar(i->second) + " :0 " + i->second->fullname;
whoresults.push_back(wholine);
}
}
if (opt_viewopersonly)
{
/* Showing only opers */
- for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+ for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
{
userrec* oper = *i;
wholine = wholine + getlastchanname(oper) + " " + oper->ident + " " + (opt_showrealhost ? oper->host : oper->dhost) + " " +
oper->server + " " + oper->nick + " ";
+ ch = ServerInstance->FindChan(getlastchanname(oper));
+
/* away? */
if (*oper->awaymsg)
{
wholine.append("*");
}
- wholine = wholine + ch->GetStatusChar(oper) + " :0 " + oper->fullname;
+ wholine = wholine + (ch ? ch->GetPrefixChar(oper) : "") + " :0 " + oper->fullname;
whoresults.push_back(wholine);
}
}
wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " +
i->second->server + " " + i->second->nick + " ";
+ ch = ServerInstance->FindChan(getlastchanname(i->second));
+
/* away? */
if (*(i->second)->awaymsg)
{
wholine.append("*");
}
- wholine = wholine + ch->GetStatusChar(i->second) + " :0 " + i->second->fullname;
+ wholine = wholine + (ch ? ch->GetPrefixChar(i->second) : "") + " :0 " + i->second->fullname;
whoresults.push_back(wholine);
}
}
{
for (std::vector<std::string>::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;
}
}