#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "message.h"
-#include "commands.h"
#include "inspircd.h"
-#include "helperfuncs.h"
+#include "wildcard.h"
/* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
-extern user_hash clientlist;
-extern bool match(const char *, const char *);
-
-static Server *Srv;
-
+/** Handle /CHECK
+ */
class cmd_check : public command_t
{
public:
- cmd_check() : command_t("CHECK", 'o', 1)
+ cmd_check (InspIRCd* Instance) : command_t(Instance,"CHECK", 'o', 1)
{
this->source = "m_check.so";
syntax = "<nickname>|<ip>|<hostmask>|<channel>";
}
- void Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle (const char** parameters, int pcnt, userrec *user)
{
userrec *targuser;
chanrec *targchan;
checkstr = "304 " + std::string(user->nick) + " :CHECK";
- targuser = Srv->FindNick(std::string(parameters[0]));
- targchan = Srv->FindChannel(std::string(parameters[0]));
+ targuser = ServerInstance->FindNick(parameters[0]);
+ targchan = ServerInstance->FindChan(parameters[0]);
/*
* Syntax of a /check reply:
user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetPort()));
}
- chliststr = chlist(targuser, targuser);
+ chliststr = targuser->ChannelList(targuser);
std::stringstream dump(chliststr);
- Srv->DumpText(user,checkstr + " onchans ", dump);
+ ServerInstance->DumpText(user,checkstr + " onchans ", dump);
}
else if (targchan)
{
user->WriteServ(checkstr + " topic_setat " + timebuf);
}
- user->WriteServ(checkstr + " modes " + chanmodes(targchan, true));
+ user->WriteServ(checkstr + " modes " + targchan->ChanModes(true));
user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
/* now the ugly bit, spool current members of a channel. :| */
/* note that unlike /names, we do NOT check +i vs in the channel */
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- char list[MAXBUF];
char tmpbuf[MAXBUF];
- char* ptr = list;
- int flags = cflags(i->second, targchan);
/*
- * find how many connections from this user's IP -- unlike Asuka,
- * I define a clone as coming from the same host. --w00t
+ * Unlike Asuka, I define a clone as coming from the same host. --w00t
*/
- sprintf(ptr, "%lu ", i->second->GlobalCloneCount());
-
- if (flags & UCMODE_OP)
- {
- strcat(ptr, "@");
- }
-
- if (flags & UCMODE_HOP)
- {
- strcat(ptr, "%");
- }
-
- if (flags & UCMODE_VOICE)
- {
- strcat(ptr, "+");
- }
-
- sprintf(tmpbuf, "%s (%s@%s) %s ", i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
- strcat(ptr, tmpbuf);
-
- user->WriteServ(checkstr + " member " + ptr);
+ snprintf(tmpbuf, MAXBUF, "%lu %s%s (%s@%s) %s ", i->second->GlobalCloneCount(), targchan->GetAllPrefixChars(i->second), i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
+ user->WriteServ(checkstr + " member " + tmpbuf);
}
}
else
long x = 0;
/* hostname or other */
- for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++)
+ for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->clientlist.end(); a++)
{
if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
{
}
user->WriteServ(checkstr + " END " + std::string(parameters[0]));
+
+ return CMD_SUCCESS;
}
};
private:
cmd_check *mycommand;
public:
- ModuleCheck(Server* Me) : Module::Module(Me)
+ ModuleCheck(InspIRCd* Me) : Module::Module(Me)
{
- Srv = Me;
- mycommand = new cmd_check();
- Srv->AddCommand(mycommand);
+
+ mycommand = new cmd_check(ServerInstance);
+ ServerInstance->AddCommand(mycommand);
}
virtual ~ModuleCheck()
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_VENDOR);
+ return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
}
void Implements(char* List)
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleCheck(Me);
}