X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_services_account.cpp;h=efcf7629ad33c008de7ad5c3611f2f68c5915999;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=2fceb6780409087636f493fb9b6b8eacdaaf6b7f;hpb=cd767403e9cce6cc0749160fddb9e7c82042d23c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 2fceb6780..efcf7629a 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -23,13 +23,16 @@ using namespace std;
 #include <string>
 #include "helperfuncs.h"
 #include "hashcomp.h"
+#include "inspircd.h"
 
 /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */
 
+
+
 class AChannel_R : public ModeHandler
 {
  public:
-	AChannel_R() : ModeHandler('R', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	AChannel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
@@ -57,7 +60,7 @@ class AChannel_R : public ModeHandler
 class AUser_R : public ModeHandler
 {
  public:
-	AUser_R() : ModeHandler('R', 0, 0, false, MODETYPE_USER, false) { }
+	AUser_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
@@ -85,7 +88,7 @@ class AUser_R : public ModeHandler
 class AChannel_M : public ModeHandler
 {
  public:
-	AChannel_M() : ModeHandler('M', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	AChannel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
@@ -112,36 +115,36 @@ class AChannel_M : public ModeHandler
 
 class ModuleServicesAccount : public Module
 {
-	Server *Srv; 
+	 
 	AChannel_R* m1;
 	AChannel_M* m2;
 	AUser_R* m3;
  public:
-	ModuleServicesAccount(Server* Me) : Module::Module(Me)
+	ModuleServicesAccount(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-		m1 = new AChannel_R();
-		m2 = new AChannel_M();
-		m3 = new AUser_R();
-		Srv->AddMode(m1, 'R');
-		Srv->AddMode(m2, 'M');
-		Srv->AddMode(m3, 'R');
+		
+		m1 = new AChannel_R(ServerInstance);
+		m2 = new AChannel_M(ServerInstance);
+		m3 = new AUser_R(ServerInstance);
+		ServerInstance->AddMode(m1, 'R');
+		ServerInstance->AddMode(m2, 'M');
+		ServerInstance->AddMode(m3, 'R');
 	}
 
 	virtual void On005Numeric(std::string &output)
 	{
-		InsertMode(output, "RM", 4);
+		ServerInstance->ModeGrok->InsertMode(output, "RM", 4);
 	}
 
 	/* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
 	virtual void OnWhois(userrec* source, userrec* dest)
 	{
-		char *account = dest->GetExt("accountname");
+		std::string *account;
+		dest->GetExt("accountname", account);
 
 		if (account)
 		{
-			std::string* accountn = (std::string*)account;
-			WriteServ(source->fd, "330 %s %s %s :is logged in as", source->nick, dest->nick, accountn->c_str());
+			source->WriteServ("330 %s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
 		}
 	}
 
@@ -153,7 +156,8 @@ class ModuleServicesAccount : public Module
 
 	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
-		char *account = user->GetExt("accountname");
+		std::string *account;
+		user->GetExt("accountname", account);
 		
 		if (target_type == TYPE_CHANNEL)
 		{
@@ -161,14 +165,14 @@ class ModuleServicesAccount : public Module
 			
 			if ((c->IsModeSet('M')) && (!account))
 			{
-				if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
+				if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)) || (!strcmp(user->server,"")))
 				{
 					// user is ulined, can speak regardless
 					return 0;
 				}
 
 				// user messaging a +M channel and is not registered
-				Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
+				user->WriteServ("477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
 				return 1;
 			}
 		}
@@ -178,14 +182,14 @@ class ModuleServicesAccount : public Module
 			
 			if ((u->modes['R'-65]) && (!account))
 			{
-				if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+				if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)))
 				{
 					// user is ulined, can speak regardless
 					return 0;
 				}
 
 				// user messaging a +R user and is not registered
-				Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
+				user->WriteServ("477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
 				return 1;
 			}
 		}
@@ -199,7 +203,8 @@ class ModuleServicesAccount : public Module
 	 
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
 	{
-		char *account = user->GetExt("accountname");
+		std::string *account;
+		user->GetExt("accountname", account);
 		
 		if (chan)
 		{
@@ -207,13 +212,13 @@ class ModuleServicesAccount : public Module
 			{
 				if (!account)
 				{
-					if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+					if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)))
 					{
 						// user is ulined, won't be stopped from joining
 						return 0;
 					}
 					// joining a +R channel and not identified
-					Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
+					user->WriteServ("477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
 					return 1;
 				}
 			}
@@ -232,11 +237,10 @@ class ModuleServicesAccount : public Module
 		if (extname == "accountname")
 		{
 			// check if this user has an swhois field to send
-			char* field = user->GetExt("accountname");
-			if (field)
+			std::string* account;
+			user->GetExt("accountname", account);
+			if (account)
 			{
-				// get our extdata out with a cast
-				std::string* account = (std::string*)field;
 				// call this function in the linking module, let it format the data how it
 				// sees fit, and send it on its way. We dont need or want to know how.
 				proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*account);
@@ -247,10 +251,10 @@ class ModuleServicesAccount : public Module
 	// when a user quits, tidy up their metadata
 	virtual void OnUserQuit(userrec* user, const std::string &message)
 	{
-		char* field = user->GetExt("accountname");
-		if (field)
+		std::string* account;
+		user->GetExt("accountname", account);
+		if (account)
 		{
-			std::string* account = (std::string*)field;
 			user->Shrink("accountname");
 			delete account;
 		}
@@ -262,10 +266,10 @@ class ModuleServicesAccount : public Module
 		if (target_type == TYPE_USER)
 		{
 			userrec* user = (userrec*)item;
-			char* field = user->GetExt("accountname");
-			if (field)
+			std::string* account;
+			user->GetExt("accountname", account);
+			if (account)
 			{
-				std::string* account = (std::string*)field;
 				user->Shrink("accountname");
 				delete account;
 			}
@@ -288,10 +292,10 @@ class ModuleServicesAccount : public Module
 			/* logging them out? */
 			if (extdata == "")
 			{
-				char* field = dest->GetExt("accountname");
-				if (field)
+				std::string* account;
+				dest->GetExt("accountname", account);
+				if (account)
 				{
-					std::string* account = (std::string*)field;
 					dest->Shrink("accountname");
 					delete account;
 				}
@@ -299,10 +303,11 @@ class ModuleServicesAccount : public Module
 			else
 			{
 				// if they dont already have an accountname field, accept the remote server's
-				if (!dest->GetExt("accountname"))
+				std::string* text;
+				if (!dest->GetExt("accountname", text))
 				{
-					std::string* text = new std::string(extdata);
-					dest->Extend("accountname",(char*)text);
+					text = new std::string(extdata);
+					dest->Extend("accountname", text);
 				}
 			}
 		}
@@ -333,7 +338,7 @@ class ModuleServicesAccountFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleServicesAccount(Me);
 	}