X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dccallow.cpp;h=d92aeed82dfaa24f02a5c9b4b07bf2fa62018077;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;hp=18330e357b5ae7dc34d676cb556a6f564858f311;hpb=0b34769b9e3b9e823763cfd8bf3e2d64c2426710;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 18330e357..d92aeed82 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -272,7 +272,7 @@ class ModuleDCCAllow : public Module
 		Conf = new ConfigReader(ServerInstance);
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason)
+	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
 	{
 		dccallowlist* dl;
 	
@@ -307,8 +307,6 @@ class ModuleDCCAllow : public Module
 		if (!IS_LOCAL(user))
 			return 0;
 
-		Expire();
-	
 		if (target_type == TYPE_USER)
 		{
 			userrec* u = (userrec*)dest;
@@ -319,6 +317,9 @@ class ModuleDCCAllow : public Module
 		
 			if ((text.length()) && (text[0] == '\1'))
 			{
+
+				Expire();
+
 				// :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :DCC SEND m_dnsbl.cpp 3232235786 52650 9676
 				// :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :VERSION
 					
@@ -358,25 +359,19 @@ class ModuleDCCAllow : public Module
 						std::string filename = tokens[2];
 					
 						if (defaultaction == "allow") 
-						{
 							return 0;
-						}
 				
 						for (unsigned int i = 0; i < bfl.size(); i++)
 						{
 							if (ServerInstance->MatchText(filename, bfl[i].filemask))
 							{
-								if (strcmp(bfl[i].action.c_str(), "allow") == 0)
-								{
+								if (bfl[i].action == "allow")
 									return 0;
-								}
 							}
 							else
 							{
 								if (defaultaction == "allow")
-								{
 									return 0;
-								}
 							}
 							user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick, u->nick, filename.c_str());
 							u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, filename.c_str());
@@ -496,7 +491,7 @@ class ModuleDCCAllow : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_COMMON,API_VERSION);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };