X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=461ac5a2d7889d819e35e4e25fcc02842c3a8973;hb=f5c631ef8641db6455bed23c02e5a39f63f7d6d0;hp=831a8ba39f06c55d088a4a411b7bbaf28313a267;hpb=9bac1580319dacbb95ac22b906d3ee949e23db41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 831a8ba39..461ac5a2d 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -75,6 +75,7 @@ class CommandCheck : public Command
 
 		if (targuser)
 		{
+			LocalUser* loctarg = IS_LOCAL(targuser);
 			/* /check on a user */
 			user->SendText(checkstr + " nuh " + targuser->GetFullHost());
 			user->SendText(checkstr + " realnuh " + targuser->GetFullRealHost());
@@ -85,7 +86,7 @@ class CommandCheck : public Command
 			user->SendText(checkstr + " uid " + targuser->uuid);
 			user->SendText(checkstr + " signon " + timestring(targuser->signon));
 			user->SendText(checkstr + " nickts " + timestring(targuser->age));
-			if (IS_LOCAL(targuser))
+			if (loctarg)
 				user->SendText(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg));
 
 			if (IS_AWAY(targuser))
@@ -97,11 +98,42 @@ class CommandCheck : public Command
 
 			if (IS_OPER(targuser))
 			{
+				OperInfo* oper = targuser->oper;
 				/* user is an oper of type ____ */
-				user->SendText(checkstr + " opertype " + targuser->oper->NameStr());
+				user->SendText(checkstr + " opertype " + oper->NameStr());
+				if (loctarg)
+				{
+					std::string umodes;
+					std::string cmodes;
+					for(char c='A'; c < 'z'; c++)
+					{
+						ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_USER);
+						if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_USER))
+							umodes.push_back(c);
+						mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
+						if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_CHANNEL))
+							cmodes.push_back(c);
+					}
+					user->SendText(checkstr + " modeperms user=" + umodes + " channel=" + cmodes);
+					std::string opcmds;
+					for(std::set<std::string>::iterator i = oper->AllowedOperCommands.begin(); i != oper->AllowedOperCommands.end(); i++)
+					{
+						opcmds.push_back(' ');
+						opcmds.append(*i);
+					}
+					std::stringstream opcmddump(opcmds);
+					user->SendText(checkstr + " commandperms", opcmddump);
+					std::string privs;
+					for(std::set<std::string>::iterator i = oper->AllowedPrivs.begin(); i != oper->AllowedPrivs.end(); i++)
+					{
+						privs.push_back(' ');
+						privs.append(*i);
+					}
+					std::stringstream privdump(privs);
+					user->SendText(checkstr + " permissions", privdump);
+				}
 			}
 
-			LocalUser* loctarg = IS_LOCAL(targuser);
 			if (loctarg)
 			{
 				user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(loctarg->client_sa));
@@ -218,7 +250,11 @@ class ModuleCheck : public Module
  public:
 	ModuleCheck() : mycommand(this)
 	{
-		ServerInstance->AddCommand(&mycommand);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(mycommand);
 	}
 
 	~ModuleCheck()