X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dccallow.cpp;h=39c8e33c63f61e0a9827975f55ac06b35aaf2499;hb=73b5d276db1903256c7432e333b4db8d01d58d05;hp=7ac1bc73756389c97a0b063cb4955fc5aab82126;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 7ac1bc737..39c8e33c6 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -17,14 +17,14 @@
 
 static ConfigReader *Conf;
 
-class BannedFileList
+class BannedFileList : public classbase
 {
  public:
 	std::string filemask;
 	std::string action;
 };
 
-class DCCAllow
+class DCCAllow : public classbase
 {
  public:
 	std::string nickname;
@@ -54,59 +54,55 @@ class CommandDccallow : public Command
 		/* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
 	}
 
-	CmdResult Handle(const char **parameters, int pcnt, User *user)
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
 		/* syntax: DCCALLOW [+|-]<nick> (<time>) */
-		if (!pcnt)
+		if (!parameters.size())
 		{
 			// display current DCCALLOW list
 			DisplayDCCAllowList(user);
 			return CMD_FAILURE;
 		}
-		else if (pcnt > 0)
+		else if (parameters.size() > 0)
 		{
-			char action = *parameters[0];
-		
+			char action = *parameters[0].c_str();
+
 			// if they didn't specify an action, this is probably a command
 			if (action != '+' && action != '-')
 			{
-				if (!strcasecmp(parameters[0], "LIST"))
+				if (!strcasecmp(parameters[0].c_str(), "LIST"))
 				{
 					// list current DCCALLOW list
 					DisplayDCCAllowList(user);
 					return CMD_FAILURE;
-				} 
-				else if (!strcasecmp(parameters[0], "HELP"))
+				}
+				else if (!strcasecmp(parameters[0].c_str(), "HELP"))
 				{
 					// display help
 					DisplayHelp(user);
 					return CMD_FAILURE;
 				}
 			}
-			
-			std::string nick = parameters[0] + 1;
+
+			std::string nick = parameters[0].substr(1);
 			User *target = ServerInstance->FindNick(nick);
-	
+
 			if (target)
 			{
-				
+
 				if (action == '-')
 				{
-					user->GetExt("dccallow_list", dl);
 					// check if it contains any entries
-					if (dl)
+					if (user->GetExt("dccallow_list", dl))
 					{
-						if (dl->size())
+						for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
 						{
-							for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
+							// search through list
+							if (i->nickname == target->nick)
 							{
-								// search through list
-								if (i->nickname == target->nick)
-								{
-									dl->erase(i);
-									user->WriteServ("995 %s %s :Removed %s from your DCCALLOW list", user->nick, user->nick, target->nick);
-									break;
-								}
+								dl->erase(i);
+								user->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
+								break;
 							}
 						}
 					}
@@ -114,7 +110,7 @@ class CommandDccallow : public Command
 					{
 						delete  dl;
 						user->Shrink("dccallow_list");
-				
+
 						// remove from userlist
 						for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
 						{
@@ -129,10 +125,7 @@ class CommandDccallow : public Command
 				}
 				else if (action == '+')
 				{
-					// fetch current DCCALLOW list
-					user->GetExt("dccallow_list", dl);
-					// they don't have one, create it
-					if (!dl)
+					if (!user->GetExt("dccallow_list", dl))
 					{
 						dl = new dccallowlist;
 						user->Extend("dccallow_list", dl);
@@ -143,25 +136,25 @@ class CommandDccallow : public Command
 					{
 						if (k->nickname == target->nick)
 						{
-							user->WriteServ("996 %s %s :%s is already on your DCCALLOW list", user->nick, user->nick, target->nick);
+							user->WriteNumeric(996, "%s %s :%s is already on your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
 							return CMD_FAILURE;
 						}
-						else if (ServerInstance->MatchText(user->GetFullHost(), k->hostmask))
+						else if (InspIRCd::Match(user->GetFullHost(), k->hostmask))
 						{
-							user->WriteServ("996 %s %s :You cannot add yourself to your own DCCALLOW list!", user->nick, user->nick);
+							user->WriteNumeric(996, "%s %s :You cannot add yourself to your own DCCALLOW list!", user->nick.c_str(), user->nick.c_str());
 							return CMD_FAILURE;
 						}
 					}
-				
+
 					std::string mask = std::string(target->nick)+"!"+std::string(target->ident)+"@"+std::string(target->dhost);
 					std::string default_length = Conf->ReadValue("dccallow", "length", 0);
-		
+
 					long length;
-					if (pcnt < 2)
+					if (parameters.size() < 2)
 					{
 						length = ServerInstance->Duration(default_length);
-					} 
-					else if (!atoi(parameters[1]))
+					}
+					else if (!atoi(parameters[1].c_str()))
 					{
 						length = 0;
 					}
@@ -169,21 +162,21 @@ class CommandDccallow : public Command
 					{
 						length = ServerInstance->Duration(parameters[1]);
 					}
-	
+
 					if (!ServerInstance->IsValidMask(mask.c_str()))
 					{
 						return CMD_FAILURE;
 					}
-			
+
 					dl->push_back(DCCAllow(target->nick, mask, ServerInstance->Time(), length));
-			
+
 					if (length > 0)
 					{
-						user->WriteServ("993 %s %s :Added %s to DCCALLOW list for %d seconds", user->nick, user->nick, target->nick, length);
+						user->WriteNumeric(993, "%s %s :Added %s to DCCALLOW list for %ld seconds", user->nick.c_str(), user->nick.c_str(), target->nick.c_str(), length);
 					}
 					else
 					{
-						user->WriteServ("994 %s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
+						user->WriteNumeric(994, "%s %s :Added %s to DCCALLOW list for this session", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
 					}
 
 					/* route it. */
@@ -193,7 +186,7 @@ class CommandDccallow : public Command
 			else
 			{
 				// nick doesn't exist
-				user->WriteServ("401 %s %s :No such nick/channel", user->nick, nick.c_str());
+				user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), nick.c_str());
 				return CMD_FAILURE;
 			}
 		}
@@ -202,47 +195,46 @@ class CommandDccallow : public Command
 
 	void DisplayHelp(User* user)
 	{
-		user->WriteServ("998 %s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick);
-		user->WriteServ("998 %s :You may allow DCCs from specific users by specifying a", user->nick);
-		user->WriteServ("998 %s :DCC allow for the user you want to receive DCCs from.", user->nick);
-		user->WriteServ("998 %s :For example, to allow the user Brain to send you inspircd.exe", user->nick);
-		user->WriteServ("998 %s :you would type:", user->nick);
-		user->WriteServ("998 %s :/DCCALLOW +Brain", user->nick);
-		user->WriteServ("998 %s :Brain would then be able to send you files. They would have to", user->nick);
-		user->WriteServ("998 %s :resend the file again if the server gave them an error message", user->nick);
-		user->WriteServ("998 %s :before you added them to your DCCALLOW list.", user->nick);
-		user->WriteServ("998 %s :DCCALLOW entries will be temporary by default, if you want to add", user->nick);
-		user->WriteServ("998 %s :them to your DCCALLOW list until you leave IRC, type:", user->nick);
-		user->WriteServ("998 %s :/DCCALLOW +Brain 0", user->nick);
-		user->WriteServ("998 %s :To remove the user from your DCCALLOW list, type:", user->nick);
-		user->WriteServ("998 %s :/DCCALLOW -Brain", user->nick);
-		user->WriteServ("998 %s :To see the users in your DCCALLOW list, type:", user->nick);
-		user->WriteServ("998 %s :/DCCALLOW LIST", user->nick);
-		user->WriteServ("998 %s :NOTE: If the user leaves IRC or changes their nickname", user->nick);
-		user->WriteServ("998 %s :  they will be removed from your DCCALLOW list.", user->nick);
-		user->WriteServ("998 %s :  your DCCALLOW list will be deleted when you leave IRC.", user->nick);
-		user->WriteServ("999 %s :End of DCCALLOW HELP", user->nick);
+		user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick.c_str() [time]] [list] [help]", user->nick.c_str());
+		user->WriteNumeric(998, "%s :You may allow DCCs from specific users by specifying a", user->nick.c_str());
+		user->WriteNumeric(998, "%s :DCC allow for the user you want to receive DCCs from.", user->nick.c_str());
+		user->WriteNumeric(998, "%s :For example, to allow the user Brain to send you inspircd.exe", user->nick.c_str());
+		user->WriteNumeric(998, "%s :you would type:", user->nick.c_str());
+		user->WriteNumeric(998, "%s :/DCCALLOW +Brain", user->nick.c_str());
+		user->WriteNumeric(998, "%s :Brain would then be able to send you files. They would have to", user->nick.c_str());
+		user->WriteNumeric(998, "%s :resend the file again if the server gave them an error message", user->nick.c_str());
+		user->WriteNumeric(998, "%s :before you added them to your DCCALLOW list.", user->nick.c_str());
+		user->WriteNumeric(998, "%s :DCCALLOW entries will be temporary by default, if you want to add", user->nick.c_str());
+		user->WriteNumeric(998, "%s :them to your DCCALLOW list until you leave IRC, type:", user->nick.c_str());
+		user->WriteNumeric(998, "%s :/DCCALLOW +Brain 0", user->nick.c_str());
+		user->WriteNumeric(998, "%s :To remove the user from your DCCALLOW list, type:", user->nick.c_str());
+		user->WriteNumeric(998, "%s :/DCCALLOW -Brain", user->nick.c_str());
+		user->WriteNumeric(998, "%s :To see the users in your DCCALLOW list, type:", user->nick.c_str());
+		user->WriteNumeric(998, "%s :/DCCALLOW LIST", user->nick.c_str());
+		user->WriteNumeric(998, "%s :NOTE: If the user leaves IRC or changes their nickname", user->nick.c_str());
+		user->WriteNumeric(998, "%s :  they will be removed from your DCCALLOW list.", user->nick.c_str());
+		user->WriteNumeric(998, "%s :  your DCCALLOW list will be deleted when you leave IRC.", user->nick.c_str());
+		user->WriteNumeric(999, "%s :End of DCCALLOW HELP", user->nick.c_str());
 	}
-	
+
 	void DisplayDCCAllowList(User* user)
 	{
 		 // display current DCCALLOW list
-		user->WriteServ("990 %s :Users on your DCCALLOW list:", user->nick);
-		user->GetExt("dccallow_list", dl);
-		
-		if (dl)
+		user->WriteNumeric(990, "%s :Users on your DCCALLOW list:", user->nick.c_str());
+
+		if (user->GetExt("dccallow_list", dl))
 		{
 			for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
 			{
-				user->WriteServ("991 %s %s :%s (%s)", user->nick, user->nick, c->nickname.c_str(), c->hostmask.c_str());
+				user->WriteNumeric(991, "%s %s :%s (%s)", user->nick.c_str(), user->nick.c_str(), c->nickname.c_str(), c->hostmask.c_str());
 			}
 		}
-		
-		user->WriteServ("992 %s :End of DCCALLOW list", user->nick);
-	}			
+
+		user->WriteNumeric(992, "%s :End of DCCALLOW list", user->nick.c_str());
+	}
 
 };
-	
+
 class ModuleDCCAllow : public Module
 {
 	CommandDccallow* mycommand;
@@ -268,17 +260,16 @@ class ModuleDCCAllow : public Module
 
 	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
-		dccallowlist* dl;
-	
+		dccallowlist* udl;
+
 		// remove their DCCALLOW list if they have one
-		user->GetExt("dccallow_list", dl);
-		if (dl)
+		if (user->GetExt("dccallow_list", udl))
 		{
-			delete dl;
+			delete udl;
 			user->Shrink("dccallow_list");
 			RemoveFromUserlist(user);
 		}
-		
+
 		// remove them from any DCCALLOW lists
 		// they are currently on
 		RemoveNick(user);
@@ -308,48 +299,46 @@ class ModuleDCCAllow : public Module
 			/* Always allow a user to dcc themselves (although... why?) */
 			if (user == u)
 				return 0;
-		
+
 			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
-					
+
 				if (strncmp(text.c_str(), "\1DCC ", 5) == 0)
 				{
-					u->GetExt("dccallow_list", dl);
-		
-					if (dl && dl->size())
+					if (u->GetExt("dccallow_list", dl) && dl->size())
 					{
 						for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
-							if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
+							if (InspIRCd::Match(user->GetFullHost(), iter->hostmask))
 								return 0;
 					}
-		
+
 					// tokenize
 					std::stringstream ss(text);
 					std::string buf;
 					std::vector<std::string> tokens;
-		
+
 					while (ss >> buf)
 						tokens.push_back(buf);
-		
+
 					irc::string type = tokens[1].c_str();
-		
+
 					bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0);
-		
+
 					if (type == "SEND")
 					{
 						std::string defaultaction = Conf->ReadValue("dccallow", "action", 0);
 						std::string filename = tokens[2];
-					
-						if (defaultaction == "allow") 
+
+						if (defaultaction == "allow")
 							return 0;
-				
+
 						for (unsigned int i = 0; i < bfl.size(); i++)
 						{
-							if (ServerInstance->MatchText(filename, bfl[i].filemask))
+							if (InspIRCd::Match(filename, bfl[i].filemask))
 							{
 								if (bfl[i].action == "allow")
 									return 0;
@@ -359,17 +348,17 @@ class ModuleDCCAllow : public Module
 								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());
-							u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+							user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick.c_str(), u->nick.c_str(), filename.c_str());
+							u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), filename.c_str());
+							u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick.c_str(), user->nick.c_str());
 							return 1;
 						}
 					}
 					else if ((type == "CHAT") && (blockchat))
 					{
-						user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick, u->nick);
-						u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick, user->nick, user->ident, user->dhost);
-						u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+						user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick.c_str(), u->nick.c_str());
+						u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str());
+						u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick.c_str(), user->nick.c_str());
 						return 1;
 					}
 				}
@@ -377,29 +366,27 @@ class ModuleDCCAllow : public Module
 		}
 		return 0;
 	}
-	
+
 	void Expire()
 	{
 		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
 		{
 			User* u = (User*)(*iter);
-			u->GetExt("dccallow_list", dl);
-	
-			if (dl)
+			if (u->GetExt("dccallow_list", dl))
 			{
 				if (dl->size())
 				{
-					dccallowlist::iterator iter = dl->begin();
-					while (iter != dl->end())
+					dccallowlist::iterator iter2 = dl->begin();
+					while (iter2 != dl->end())
 					{
-						if ((iter->set_on + iter->length) <= ServerInstance->Time())
+						if (iter2->length != 0 && (iter2->set_on + iter2->length) <= ServerInstance->Time())
 						{
-							u->WriteServ("997 %s %s :DCCALLOW entry for %s has expired", u->nick, u->nick, iter->nickname.c_str());
-							iter = dl->erase(iter);
+							u->WriteNumeric(997, "%s %s :DCCALLOW entry for %s has expired", u->nick.c_str(), u->nick.c_str(), iter2->nickname.c_str());
+							iter2 = dl->erase(iter2);
 						}
 						else
 						{
-							++iter;
+							++iter2;
 						}
 					}
 				}
@@ -410,16 +397,14 @@ class ModuleDCCAllow : public Module
 			}
 		}
 	}
-	
+
 	void RemoveNick(User* user)
 	{
 		/* Iterate through all DCCALLOW lists and remove user */
 		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
 		{
 			User *u = (User*)(*iter);
-			u->GetExt("dccallow_list", dl);
-	
-			if (dl)
+			if (u->GetExt("dccallow_list", dl))
 			{
 				if (dl->size())
 				{
@@ -427,9 +412,9 @@ class ModuleDCCAllow : public Module
 					{
 						if (i->nickname == user->nick)
 						{
-					
-							u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick, i->nickname.c_str());
-							u->WriteServ("995 %s %s :Removed %s from your DCCALLOW list", u->nick, u->nick, i->nickname.c_str());
+
+							u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick.c_str(), i->nickname.c_str());
+							u->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", u->nick.c_str(), u->nick.c_str(), i->nickname.c_str());
 							dl->erase(i);
 							break;
 						}
@@ -469,7 +454,7 @@ class ModuleDCCAllow : public Module
 			bf.action = action;
 			bfl.push_back(bf);
 		}
-	
+
 	}
 
 	virtual ~ModuleDCCAllow()
@@ -478,8 +463,9 @@ class ModuleDCCAllow : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
 MODULE_INIT(ModuleDCCAllow)
+