X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services.cpp;h=c868eefef6d687bf348ff03ae5d80449d4713d25;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=89074ff7fbc5a945595a89e176d562a03d4d880d;hpb=235a0a2035bda6dd214719107083266207f39883;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 89074ff7f..c868eefef 100644
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -51,15 +51,25 @@ class ModuleServices : public Module
 		InsertMode(output, "rRM", 4);
 	}
 
+	/* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
+	virtual void OnWhois(userrec* source, userrec* dest)
+	{
+		if (dest->modes['r'-65])
+		{
+			/* user is registered */
+			WriteServ(source->fd, "307 %s %s :is a registered nick", source->nick, dest->nick);
+		}
+	}
+
 	void Implements(char* List)
 	{
-		List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
+		List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual void OnUserPostNick(userrec* user, std::string oldnick)
+	virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
 	{
 		/* On nickchange, if they have +r, remove it */
-		if (strchr(user->modes,'r'))
+		if (user->modes['r'-65])
 		{
 			char* modechange[2];
 			modechange[0] = user->nick;
@@ -123,7 +133,7 @@ class ModuleServices : public Module
 		if (target_type == TYPE_CHANNEL)
 		{
 			chanrec* c = (chanrec*)dest;
-			if ((c->IsCustomModeSet('M')) && (!strchr(user->modes,'r')))
+			if ((c->IsModeSet('M')) && (!user->modes['r'-65]))
 			{
 				if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
 				{
@@ -138,7 +148,7 @@ class ModuleServices : public Module
 		if (target_type == TYPE_USER)
 		{
 			userrec* u = (userrec*)dest;
-			if ((strchr(u->modes,'R')) && (!strchr(user->modes,'r')))
+			if ((u->modes['R'-65]) && (user->modes['r'-65]))
 			{
 				if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
 				{
@@ -162,9 +172,9 @@ class ModuleServices : public Module
 	{
 		if (chan)
 		{
-			if (chan->IsCustomModeSet('R'))
+			if (chan->IsModeSet('R'))
 			{
-				if (!strchr(user->modes,'r'))
+				if (user->modes['r'-65])
 				{
 					if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
 					{