X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=4f2125a975616cfc3b80d6dc7e947d43b0b8563b;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=123132ca988e23663bdd4f20957dce697f5c935b;hpb=3624c137a6db85eaab0372550c9dca79d6d21e55;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 123132ca9..4f2125a97 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -22,8 +22,6 @@
  */
 
 
-/* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */
-
 #include "inspircd.h"
 #include "modules/account.h"
 
@@ -40,9 +38,9 @@ class Channel_r : public ModeHandler
 		if (!IS_LOCAL(source))
 		{
 			// Only change the mode if it's not redundant
-			if ((adding != channel->IsModeSet('r')))
+			if ((adding != channel->IsModeSet(this)))
 			{
-				channel->SetMode('r',adding);
+				channel->SetMode(this, adding);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -66,9 +64,9 @@ class User_r : public ModeHandler
 	{
 		if (!IS_LOCAL(source))
 		{
-			if ((adding != dest->IsModeSet('r')))
+			if ((adding != dest->IsModeSet(this)))
 			{
-				dest->SetMode('r',adding);
+				dest->SetMode(this, adding);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -122,10 +120,6 @@ class ModuleServicesAccount : public Module
 	{
 		ServiceProvider* providerlist[] = { &m1, &m2, &m3, &m4, &m5, &accountname };
 		ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
-		Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreJoin, I_OnCheckBan,
-			I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick, I_OnSetConnectClass };
-
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -144,7 +138,7 @@ class ModuleServicesAccount : public Module
 			ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick.c_str(), dest->nick.c_str(), account->c_str());
 		}
 
-		if (dest->IsModeSet('r'))
+		if (dest->IsModeSet(m5))
 		{
 			/* user is registered */
 			ServerInstance->SendWhoisLine(source, dest, 307, "%s %s :is a registered nick", source->nick.c_str(), dest->nick.c_str());
@@ -154,7 +148,7 @@ class ModuleServicesAccount : public Module
 	void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE
 	{
 		/* On nickchange, if they have +r, remove it */
-		if (user->IsModeSet('r') && assign(user->nick) != oldnick)
+		if (user->IsModeSet(m5) && assign(user->nick) != oldnick)
 		{
 			std::vector<std::string> modechange;
 			modechange.push_back(user->nick);
@@ -176,7 +170,7 @@ class ModuleServicesAccount : public Module
 			Channel* c = (Channel*)dest;
 			ModResult res = ServerInstance->OnCheckExemption(user,c,"regmoderated");
 
-			if (c->IsModeSet('M') && !is_registered && res != MOD_RES_ALLOW)
+			if (c->IsModeSet(m2) && !is_registered && res != MOD_RES_ALLOW)
 			{
 				// user messaging a +M channel and is not registered
 				user->WriteNumeric(477, user->nick+" "+c->name+" :You need to be identified to a registered account to message this channel");
@@ -187,7 +181,7 @@ class ModuleServicesAccount : public Module
 		{
 			User* u = (User*)dest;
 
-			if (u->IsModeSet('R') && !is_registered)
+			if (u->IsModeSet(m3) && !is_registered)
 			{
 				// user messaging a +R user and is not registered
 				user->WriteNumeric(477, ""+ user->nick +" "+ u->nick +" :You need to be identified to a registered account to message this user");
@@ -241,7 +235,7 @@ class ModuleServicesAccount : public Module
 
 		if (chan)
 		{
-			if (chan->IsModeSet('R'))
+			if (chan->IsModeSet(m1))
 			{
 				if (!is_registered)
 				{