X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=bdd47b4bc8f0764b0563bb3c300ad7283142eee4;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=cc941d905ab3e88480ebaba29032fc511d5e08d1;hpb=6b14ac1562dda1492e7ca44c2306e2432200b8cc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index cc941d905..bdd47b4bc 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) || ServerInstance->ULine(source->server))
 		{
 			// 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) || ServerInstance->ULine(source->server))
 		{
 			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 */
@@ -189,7 +185,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;
 			}
 		}
@@ -249,7 +245,7 @@ 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(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
 	{
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
@@ -323,3 +319,4 @@ class ModuleServicesAccount : public Module
 };
 
 MODULE_INIT(ModuleServicesAccount)
+