X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_dccallow.cpp;h=abcad9de92333f65b3b79843f9c33b3a1e90e83c;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=ebd3b863082afe17391de8f426489c4083eb4661;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index ebd3b8630..abcad9de9 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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;
@@ -44,39 +44,39 @@ dccallowlist* dl;
 typedef std::vector<BannedFileList> bannedfilelist;
 bannedfilelist bfl;
 
-class cmd_dccallow : public Command
+class CommandDccallow : public Command
 {
  public:
-	cmd_dccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0)
+	CommandDccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0)
 	{
 		this->source = "m_dccallow.so";
 		syntax = "{[+|-]<nick> <time>|HELP|LIST}";
 		/* 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);
@@ -84,7 +84,7 @@ class cmd_dccallow : public Command
 				}
 			}
 			
-			std::string nick = parameters[0] + 1;
+			std::string nick = parameters[0].substr(1);
 			User *target = ServerInstance->FindNick(nick);
 	
 			if (target)
@@ -92,21 +92,17 @@ class cmd_dccallow : public Command
 				
 				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, user->nick, target->nick);
+								break;
 							}
 						}
 					}
@@ -129,10 +125,7 @@ class cmd_dccallow : 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,12 +136,12 @@ class cmd_dccallow : 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, user->nick, target->nick);
 							return CMD_FAILURE;
 						}
 						else if (ServerInstance->MatchText(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, user->nick);
 							return CMD_FAILURE;
 						}
 					}
@@ -157,11 +150,11 @@ class cmd_dccallow : public Command
 					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;
 					}
@@ -179,11 +172,11 @@ class cmd_dccallow : public Command
 			
 					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, user->nick, target->nick, 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, user->nick, target->nick);
 					}
 
 					/* route it. */
@@ -193,7 +186,7 @@ class cmd_dccallow : 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, nick.c_str());
 				return CMD_FAILURE;
 			}
 		}
@@ -202,65 +195,62 @@ class cmd_dccallow : 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 [time]] [list] [help]", user->nick);
+		user->WriteNumeric(998, "%s :You may allow DCCs from specific users by specifying a", user->nick);
+		user->WriteNumeric(998, "%s :DCC allow for the user you want to receive DCCs from.", user->nick);
+		user->WriteNumeric(998, "%s :For example, to allow the user Brain to send you inspircd.exe", user->nick);
+		user->WriteNumeric(998, "%s :you would type:", user->nick);
+		user->WriteNumeric(998, "%s :/DCCALLOW +Brain", user->nick);
+		user->WriteNumeric(998, "%s :Brain would then be able to send you files. They would have to", user->nick);
+		user->WriteNumeric(998, "%s :resend the file again if the server gave them an error message", user->nick);
+		user->WriteNumeric(998, "%s :before you added them to your DCCALLOW list.", user->nick);
+		user->WriteNumeric(998, "%s :DCCALLOW entries will be temporary by default, if you want to add", user->nick);
+		user->WriteNumeric(998, "%s :them to your DCCALLOW list until you leave IRC, type:", user->nick);
+		user->WriteNumeric(998, "%s :/DCCALLOW +Brain 0", user->nick);
+		user->WriteNumeric(998, "%s :To remove the user from your DCCALLOW list, type:", user->nick);
+		user->WriteNumeric(998, "%s :/DCCALLOW -Brain", user->nick);
+		user->WriteNumeric(998, "%s :To see the users in your DCCALLOW list, type:", user->nick);
+		user->WriteNumeric(998, "%s :/DCCALLOW LIST", user->nick);
+		user->WriteNumeric(998, "%s :NOTE: If the user leaves IRC or changes their nickname", user->nick);
+		user->WriteNumeric(998, "%s :  they will be removed from your DCCALLOW list.", user->nick);
+		user->WriteNumeric(998, "%s :  your DCCALLOW list will be deleted when you leave IRC.", user->nick);
+		user->WriteNumeric(999, "%s :End of DCCALLOW HELP", user->nick);
 	}
 	
 	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);
+	
+		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, user->nick, 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);
 	}			
 
 };
 	
 class ModuleDCCAllow : public Module
 {
-	cmd_dccallow* mycommand;
+	CommandDccallow* mycommand;
  public:
 
 	ModuleDCCAllow(InspIRCd* Me)
 		: Module(Me)
 	{
 		Conf = new ConfigReader(ServerInstance);
-		mycommand = new cmd_dccallow(ServerInstance);
+		mycommand = new CommandDccallow(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		ReadFileConf();
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPreNick, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
-	}
 
 	virtual void OnRehash(User* user, const std::string &parameter)
 	{
@@ -270,13 +260,12 @@ 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);
 		}
@@ -319,10 +308,8 @@ class ModuleDCCAllow : public Module
 				// :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))
@@ -385,23 +372,21 @@ class ModuleDCCAllow : public Module
 		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, u->nick, iter2->nickname.c_str());
+							iter2 = dl->erase(iter2);
 						}
 						else
 						{
-							++iter;
+							++iter2;
 						}
 					}
 				}
@@ -419,9 +404,7 @@ class ModuleDCCAllow : public Module
 		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())
 				{
@@ -431,7 +414,7 @@ class ModuleDCCAllow : public Module
 						{
 					
 							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->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", u->nick, u->nick, i->nickname.c_str());
 							dl->erase(i);
 							break;
 						}
@@ -480,8 +463,9 @@ class ModuleDCCAllow : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
 MODULE_INIT(ModuleDCCAllow)
+