X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_who.cpp;h=66a94cfd668bc6eec514e7dae82032624c287d76;hb=eb334f8c69872cc0de28ffd85b41555f196a23dd;hp=df209991a24948c67fc2dcf49cba1c8d0ce801f4;hpb=9b56909a3b00b4dc25dfb27ccbf0859d2fd5eb7a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp index df209991a..66a94cfd6 100644 --- a/src/cmd_who.cpp +++ b/src/cmd_who.cpp @@ -11,6 +11,7 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include "configreader.h" #include "users.h" #include "modules.h" @@ -110,7 +111,7 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext) -extern "C" command_t* init_command(InspIRCd* Instance) +extern "C" DllExport command_t* init_command(InspIRCd* Instance) { return new cmd_who(Instance); } @@ -123,7 +124,7 @@ bool cmd_who::CanView(chanrec* chan, userrec* user) /* Execute items in fastest-to-execute first order */ /* Opers see all */ - if (*user->oper) + if (IS_OPER(user)) return true; else if (!chan->IsModeSet('s') && !chan->IsModeSet('p')) return true; @@ -143,11 +144,11 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch return; 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) + + ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) + " " + u->nick + " "; /* away? */ - if (*u->awaymsg) + if (IS_AWAY(u)) { wholine.append("G"); } @@ -157,7 +158,7 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch } /* oper? */ - if (*u->oper) + if (IS_OPER(u)) { wholine.append("*"); } @@ -212,11 +213,11 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) opt_viewopersonly = true; break; case 'h': - if (*user->oper) + if (IS_OPER(user)) opt_showrealhost = true; break; case 'u': - if (*user->oper) + if (IS_OPER(user)) opt_unlimit = true; break; case 'r':