X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=81ff3e4c3c2b4f533755a13e4214c409f96804b9;hb=8790551dc182cd8804ee7d8ef89ccb31067cc2a4;hp=08986d53c400d17880ceddf3f1714450a246da0c;hpb=388e4ff40931dda5870ddef149e54bdcc6c5a711;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 08986d53c..81ff3e4c3 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -25,7 +25,7 @@
 /* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */
 
 #include "inspircd.h"
-#include "account.h"
+#include "modules/account.h"
 
 /** Channel mode +r - mark a channel as identified
  */
@@ -37,7 +37,7 @@ class Channel_r : public ModeHandler
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		// only a u-lined server may add or remove the +r mode.
-		if (!IS_LOCAL(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server))
+		if (!IS_LOCAL(source))
 		{
 			// Only change the mode if it's not redundant
 			if ((adding != channel->IsModeSet('r')))
@@ -64,7 +64,7 @@ class User_r : public ModeHandler
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		if (!IS_LOCAL(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server))
+		if (!IS_LOCAL(source))
 		{
 			if ((adding != dest->IsModeSet('r')))
 			{
@@ -120,22 +120,18 @@ class ModuleServicesAccount : public Module
 
 	void init()
 	{
-		ServerInstance->Modules->AddService(m1);
-		ServerInstance->Modules->AddService(m2);
-		ServerInstance->Modules->AddService(m3);
-		ServerInstance->Modules->AddService(m4);
-		ServerInstance->Modules->AddService(m5);
-		ServerInstance->Modules->AddService(accountname);
+		ServiceProvider* providerlist[] = { &m1, &m2, &m3, &m4, &m5, &accountname };
+		ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
 		Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
 			I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick, I_OnSetConnectClass };
 
-		ServerInstance->Modules->Attach(eventlist, this, 9);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	void On005Numeric(std::string &t)
+	void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		ServerInstance->AddExtBanChar('R');
-		ServerInstance->AddExtBanChar('U');
+		tokens["EXTBAN"].push_back('R');
+		tokens["EXTBAN"].push_back('U');
 	}
 
 	/* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
@@ -175,12 +171,6 @@ class ModuleServicesAccount : public Module
 		std::string *account = accountname.get(user);
 		bool is_registered = account && !account->empty();
 
-		if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
-		{
-			// user is ulined, can speak regardless
-			return MOD_RES_PASSTHRU;
-		}
-
 		if (target_type == TYPE_CHANNEL)
 		{
 			Channel* c = (Channel*)dest;
@@ -189,7 +179,7 @@ class ModuleServicesAccount : public Module
 			if (c->IsModeSet('M') && !is_registered && res != MOD_RES_ALLOW)
 			{
 				// user messaging a +M channel and is not registered
-				user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
+				user->WriteNumeric(477, user->nick+" "+c->name+" :You need to be identified to a registered account to message this channel");
 				return MOD_RES_DENY;
 			}
 		}
@@ -209,7 +199,11 @@ class ModuleServicesAccount : public Module
 
 	ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask)
 	{
-		if (mask[1] == ':')
+		static bool checking = false;
+		if (checking)
+			return MOD_RES_PASSTHRU;
+
+		if ((mask.length() > 2) && (mask[1] == ':'))
 		{
 			if (mask[0] == 'R')
 			{
@@ -226,7 +220,11 @@ class ModuleServicesAccount : public Module
 
 				/* If we made it this far we know the user isn't registered
 					so just deny if it matches */
-				if (chan->GetExtBanStatus(user, 'U') == MOD_RES_DENY)
+				checking = true;
+				bool result = chan->CheckBan(user, mask.substr(2));
+				checking = false;
+
+				if (result)
 					return MOD_RES_DENY;
 			}
 		}
@@ -241,22 +239,13 @@ class ModuleServicesAccount : public Module
 		return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
 	}
 
-	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
 	{
-		if (!IS_LOCAL(user))
-			return MOD_RES_PASSTHRU;
-
 		std::string *account = accountname.get(user);
 		bool is_registered = account && !account->empty();
 
 		if (chan)
 		{
-			if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
-			{
-				// user is ulined, won't be stopped from joining
-				return MOD_RES_PASSTHRU;
-			}
-
 			if (chan->IsModeSet('R'))
 			{
 				if (!is_registered)
@@ -315,3 +304,4 @@ class ModuleServicesAccount : public Module
 };
 
 MODULE_INIT(ModuleServicesAccount)
+