X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services.cpp;h=d783952dbc2f5c2f972327e8c5f1ec2677384a8a;hb=f07a2aa0866a8f953b41ba21592919f05d3a315e;hp=856a93b8536aadd36a01f250b106430bab4a1d3f;hpb=e7bd9f9894b5f3de5a7aaaac0692821abd6283c5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 856a93b85..d783952db 100644
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -25,6 +25,8 @@ static bool kludgeme = false;
 
 /* $ModDesc: Povides support for services +r user/chan modes and more */
 
+/** Channel mode +r - mark a channel as identified
+ */
 class Channel_r : public ModeHandler
 {
 	
@@ -49,6 +51,8 @@ class Channel_r : public ModeHandler
 	}
 };
 
+/** User mode +r - mark a user as identified
+ */
 class User_r : public ModeHandler
 {
 	
@@ -59,9 +63,13 @@ class User_r : public ModeHandler
 	{
 		if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
 		{
-			ServerInstance->Log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server);
-			dest->SetMode('r',adding);
-			return MODEACTION_ALLOW;
+			if ((adding && !dest->IsModeSet('r')) || (!adding && dest->IsModeSet('r')))
+			{
+				ServerInstance->Log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server);
+				dest->SetMode('r',adding);
+				return MODEACTION_ALLOW;
+			}
+			return MODEACTION_DENY;
 		}
 		else
 		{
@@ -72,6 +80,8 @@ class User_r : public ModeHandler
 	}
 };
 
+/** Channel mode +R - registered users only
+ */
 class Channel_R : public ModeHandler
 {
  public:
@@ -100,6 +110,8 @@ class Channel_R : public ModeHandler
 	}
 };
 
+/** User mode +R - only allow PRIVMSG and NOTICE from registered users
+ */
 class User_R : public ModeHandler
 {
  public:
@@ -128,6 +140,8 @@ class User_R : public ModeHandler
 	}
 };
 
+/** Channel mode +M - only allow privmsg and notice to channel from registered users
+ */
 class Channel_M : public ModeHandler
 {
  public:
@@ -156,6 +170,8 @@ class Channel_M : public ModeHandler
 	}
 };
 
+/** Dreamnforge-like services support
+ */
 class ModuleServices : public Module
 {
 	
@@ -231,7 +247,7 @@ class ModuleServices : public Module
 		if (target_type == TYPE_USER)
 		{
 			userrec* u = (userrec*)dest;
-			if ((u->IsModeSet('R')) && (user->IsModeSet('r')))
+			if ((u->IsModeSet('R')) && (!user->IsModeSet('r')))
 			{
 				if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
 				{
@@ -251,13 +267,13 @@ class ModuleServices : public Module
 		return OnUserPreMessage(user,dest,target_type,text,status);
 	}
  	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
 	{
 		if (chan)
 		{
 			if (chan->IsModeSet('R'))
 			{
-				if (user->IsModeSet('r'))
+				if (!user->IsModeSet('r'))
 				{
 					if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
 					{