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

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index c1af8ead2..461ac5a2d 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -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))
@@ -100,17 +101,17 @@ class CommandCheck : public Command
 				OperInfo* oper = targuser->oper;
 				/* user is an oper of type ____ */
 				user->SendText(checkstr + " opertype " + oper->NameStr());
-				if (IS_LOCAL(targuser))
+				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() && oper->AllowedUserModes[c])
+						if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_USER))
 							umodes.push_back(c);
 						mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
-						if (mh && mh->NeedsOper() && oper->AllowedChanModes[c])
+						if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_CHANNEL))
 							cmodes.push_back(c);
 					}
 					user->SendText(checkstr + " modeperms user=" + umodes + " channel=" + cmodes);
@@ -133,7 +134,6 @@ class CommandCheck : public Command
 				}
 			}
 
-			LocalUser* loctarg = IS_LOCAL(targuser);
 			if (loctarg)
 			{
 				user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(loctarg->client_sa));
@@ -250,7 +250,11 @@ class ModuleCheck : public Module
  public:
 	ModuleCheck() : mycommand(this)
 	{
-		ServerInstance->AddCommand(&mycommand);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(mycommand);
 	}
 
 	~ModuleCheck()