X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_check.cpp;h=25835297904c74973e60c59a3aca71387e2f2cdc;hb=8710724b5518ae9858309e548514f76e620a8459;hp=cabfd02bcfe782f2128f4ceb57b93427820e95b0;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index cabfd02bc..258352979 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -21,15 +21,31 @@
 
 
 #include "inspircd.h"
-
-/* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
+#include "listmode.h"
 
 /** Handle /CHECK
  */
 class CommandCheck : public Command
 {
+	ChanModeReference ban;
+	UserModeReference snomaskmode;
+
+	std::string GetSnomasks(User* user)
+	{
+		std::string ret;
+		if (snomaskmode)
+			ret = snomaskmode->GetUserParameter(user);
+
+		if (ret.empty())
+			ret = "+";
+		return ret;
+	}
+
  public:
-	CommandCheck(Module* parent) : Command(parent,"CHECK", 1)
+	CommandCheck(Module* parent)
+		: Command(parent,"CHECK", 1)
+		, ban(parent, "ban")
+		, snomaskmode(parent, "snomask")
 	{
 		flags_needed = 'o'; syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>";
 	}
@@ -42,7 +58,7 @@ class CommandCheck : public Command
 		return std::string(timebuf);
 	}
 
-	void dumpExt(User* user, std::string checkstr, Extensible* ext)
+	void dumpExt(User* user, const std::string& checkstr, Extensible* ext)
 	{
 		std::stringstream dumpkeys;
 		for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
@@ -68,7 +84,7 @@ class CommandCheck : public Command
 		std::string checkstr;
 		std::string chliststr;
 
-		checkstr = std::string(":") + ServerInstance->Config->ServerName + " 304 " + std::string(user->nick) + " :CHECK";
+		checkstr = ":" + ServerInstance->Config->ServerName + " 304 " + user->nick + " :CHECK";
 
 		targuser = ServerInstance->FindNick(parameters[0]);
 		targchan = ServerInstance->FindChan(parameters[0]);
@@ -90,26 +106,26 @@ class CommandCheck : public Command
 			user->SendText(checkstr + " realnuh " + targuser->GetFullRealHost());
 			user->SendText(checkstr + " realname " + targuser->fullname);
 			user->SendText(checkstr + " modes +" + targuser->FormatModes());
-			user->SendText(checkstr + " snomasks +" + targuser->FormatNoticeMasks());
+			user->SendText(checkstr + " snomasks " + GetSnomasks(targuser));
 			user->SendText(checkstr + " server " + targuser->server);
 			user->SendText(checkstr + " uid " + targuser->uuid);
 			user->SendText(checkstr + " signon " + timestring(targuser->signon));
 			user->SendText(checkstr + " nickts " + timestring(targuser->age));
 			if (loctarg)
-				user->SendText(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg));
+				user->SendText(checkstr + " lastmsg " + timestring(loctarg->idle_lastmsg));
 
-			if (IS_AWAY(targuser))
+			if (targuser->IsAway())
 			{
 				/* user is away */
 				user->SendText(checkstr + " awaytime " + timestring(targuser->awaytime));
 				user->SendText(checkstr + " awaymsg " + targuser->awaymsg);
 			}
 
-			if (IS_OPER(targuser))
+			if (targuser->IsOper())
 			{
 				OperInfo* oper = targuser->oper;
 				/* user is an oper of type ____ */
-				user->SendText(checkstr + " opertype " + oper->NameStr());
+				user->SendText(checkstr + " opertype " + oper->name);
 				if (loctarg)
 				{
 					std::string umodes;
@@ -190,28 +206,21 @@ class CommandCheck : public Command
 			/* note that unlike /names, we do NOT check +i vs in the channel */
 			for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
 			{
-				char tmpbuf[MAXBUF];
 				/*
-				 * Unlike Asuka, I define a clone as coming from the same host. --w00t
-				 */
-				snprintf(tmpbuf, MAXBUF, "%-3lu %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(), i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
-				user->SendText(checkstr + " member " + tmpbuf);
+			 	 * Unlike Asuka, I define a clone as coming from the same host. --w00t
+			 	 */
+				user->SendText("%s member %-3lu %s%s (%s@%s) %s ",
+					checkstr.c_str(), ServerInstance->Users->GlobalCloneCount(i->first),
+					targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(),
+					i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
 			}
 
-			irc::modestacker modestack(true);
-			std::string letter_b("b");
-			for(BanList::iterator b = targchan->bans.begin(); b != targchan->bans.end(); ++b)
-			{
-				modestack.Push('b', b->data);
-			}
-			std::vector<std::string> stackresult;
-			std::vector<TranslateType> dummy;
-			while (modestack.GetStackedLine(stackresult))
-			{
-				creator->ProtoSendMode(user, TYPE_CHANNEL, targchan, stackresult, dummy);
-				stackresult.clear();
-			}
-			FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(targchan,creator,user));
+			// We know that the mode handler for bans is in the core and is derived from ListModeBase
+			ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
+			banlm->DoSyncChannel(targchan, creator, user);
+
+			// Show other listmodes as well
+			FOREACH_MOD(OnSyncChannel, (targchan,creator,user));
 			dumpExt(user, checkstr, targchan);
 		}
 		else
@@ -225,13 +234,13 @@ class CommandCheck : public Command
 				if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
 				{
 					/* host or vhost matches mask */
-					user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+					user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname);
 				}
 				/* IP address */
 				else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0]))
 				{
 					/* same IP. */
-					user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+					user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname);
 				}
 			}
 
@@ -251,25 +260,19 @@ class CommandCheck : public Command
 	}
 };
 
-
 class ModuleCheck : public Module
 {
- private:
 	CommandCheck mycommand;
  public:
 	ModuleCheck() : mycommand(this)
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(mycommand);
 	}
 
-	~ModuleCheck()
-	{
-	}
-
 	void ProtoSendMode(void* uv, TargetTypeFlags, void*, const std::vector<std::string>& result, const std::vector<TranslateType>&)
 	{
 		User* user = (User*)uv;
@@ -286,9 +289,9 @@ class ModuleCheck : public Module
 		user->SendText(checkstr);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("CHECK command, view user/channel details", VF_VENDOR|VF_OPTCOMMON);
+		return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON);
 	}
 };