* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
#include "wildcard.h"
user->WriteServ(checkstr + " realnuh " + targuser->GetFullRealHost());
user->WriteServ(checkstr + " realname " + targuser->fullname);
user->WriteServ(checkstr + " modes +" + targuser->FormatModes());
+ user->WriteServ(checkstr + " snomasks +" + targuser->FormatNoticeMasks());
user->WriteServ(checkstr + " server " + targuser->server);
- if (targuser->awaymsg[0] != 0)
+
+ if (IS_AWAY(targuser))
{
/* user is away */
user->WriteServ(checkstr + " awaymsg " + targuser->awaymsg);
}
- if (targuser->oper[0] != 0)
+
+ if (IS_OPER(targuser))
{
/* user is an oper of type ____ */
- user->WriteServ(checkstr + " opertype " + targuser->oper);
+ user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper));
}
+
if (IS_LOCAL(targuser))
{
/* port information is only held for a local user! */
/* 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 = targchan->GetStatusFlags(i->second);
/*
- * 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
*/
- snprintf(ptr, MAXBUF, "%lu ", i->second->GlobalCloneCount());
-
- if (flags & UCMODE_OP)
- {
- strcat(ptr, "@");
- }
-
- if (flags & UCMODE_HOP)
- {
- strcat(ptr, "%");
- }
-
- if (flags & UCMODE_VOICE)
- {
- strcat(ptr, "+");
- }
-
- snprintf(tmpbuf, MAXBUF, "%s (%s@%s) %s ", i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
- strlcat(ptr, tmpbuf, MAXBUF);
-
- user->WriteServ(checkstr + " member " + ptr);
+ snprintf(tmpbuf, MAXBUF, "%lu %s%s (%s@%s) %s ", i->first->GlobalCloneCount(), targchan->GetAllPrefixChars(i->first), i->first->nick, i->first->ident, i->first->dhost, i->first->fullname);
+ user->WriteServ(checkstr + " member " + tmpbuf);
}
}
else
long x = 0;
/* hostname or other */
- for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->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 + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
}
/* IP address */
- else if (match(a->second->GetIPString(), parameters[0]))
+ else if (match(a->second->GetIPString(), parameters[0], true))
{
/* same IP. */
user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
user->WriteServ(checkstr + " END " + std::string(parameters[0]));
- return CMD_SUCCESS;
+ return CMD_LOCALONLY;
}
};
private:
cmd_check *mycommand;
public:
- ModuleCheck(InspIRCd* Me) : Module::Module(Me)
+ ModuleCheck(InspIRCd* Me) : Module(Me)
{
mycommand = new cmd_check(ServerInstance);
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
+ return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
}
void Implements(char* List)
};
-
-
-class ModuleCheckFactory : public ModuleFactory
-{
- public:
- ModuleCheckFactory()
- {
- }
-
- ~ModuleCheckFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleCheck(Me);
- }
-
-};
-
-extern "C" void * init_module( void )
-{
- return new ModuleCheckFactory;
-}
-
+MODULE_INIT(ModuleCheck)