X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services.cpp;h=b746f64924ae5d203a64ac60a7cf4fb4671da0b7;hb=5a88424dbb33ac825aa0b9b6525179329ee75519;hp=dc33cb9edd90a8de7714d9688931b2dcd7300fb5;hpb=1afe959c7574b479e4a49a62885d2ac2757025ab;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index dc33cb9ed..b746f6492 100644
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -19,14 +19,14 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "commands.h"
-#include "hashcomp.h"
 #include "inspircd.h"
 
 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
 {
 	
@@ -51,6 +51,8 @@ class Channel_r : public ModeHandler
 	}
 };
 
+/** User mode +r - mark a user as identified
+ */
 class User_r : public ModeHandler
 {
 	
@@ -61,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
 		{
@@ -74,6 +80,8 @@ class User_r : public ModeHandler
 	}
 };
 
+/** Channel mode +R - registered users only
+ */
 class Channel_R : public ModeHandler
 {
  public:
@@ -102,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:
@@ -130,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:
@@ -149,7 +161,7 @@ class Channel_M : public ModeHandler
 		{
 			if (channel->IsModeSet('M'))
 			{
-				channel->SetMode('M',true);
+				channel->SetMode('M',false);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -158,6 +170,8 @@ class Channel_M : public ModeHandler
 	}
 };
 
+/** Dreamnforge-like services support
+ */
 class ModuleServices : public Module
 {
 	
@@ -190,7 +204,7 @@ class ModuleServices : public Module
 		if (dest->IsModeSet('r'))
 		{
 			/* user is registered */
-			source->WriteServ("307 %s %s :is a registered nick", source->nick, dest->nick);
+			ServerInstance->SendWhoisLine(source, dest, 307, "%s %s :is a registered nick", source->nick, dest->nick);
 		}
 	}
 
@@ -213,7 +227,7 @@ class ModuleServices : public Module
 		}
 	}
 	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
@@ -233,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)))
 				{
@@ -248,18 +262,18 @@ class ModuleServices : public Module
 		return 0;
 	}
  	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		return OnUserPreMessage(user,dest,target_type,text,status);
+		return OnUserPreMessage(user,dest,target_type,text,status, exempt_list);
 	}
  	
-	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)))
 					{
@@ -277,6 +291,12 @@ class ModuleServices : public Module
 
 	virtual ~ModuleServices()
 	{
+		kludgeme = true;
+		ServerInstance->Modes->DelMode(m1);
+		ServerInstance->Modes->DelMode(m2);
+		ServerInstance->Modes->DelMode(m3);
+		ServerInstance->Modes->DelMode(m4);
+		ServerInstance->Modes->DelMode(m5);
 		DELETE(m1);
 		DELETE(m2);
 		DELETE(m3);
@@ -286,7 +306,7 @@ class ModuleServices : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };