X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dccallow.cpp;h=829c1d3378ce91a3229f4de51ef15a6fc7a47611;hb=9f69e159adcc0892f0bdef16ac4617630737b156;hp=fb68478724266f6ab168964675e919d498a6cd1c;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index fb6847872..829c1d337 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -1,30 +1,40 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Jamie ??? <???@???>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Povides support for the /DCCALLOW command */
+#include "inspircd.h"
 
-static ConfigReader *Conf;
+/* $ModDesc: Provides support for the /DCCALLOW command */
 
-class BannedFileList : public classbase
+class BannedFileList
 {
  public:
 	std::string filemask;
 	std::string action;
 };
 
-class DCCAllow : public classbase
+class DCCAllow
 {
  public:
 	std::string nickname;
@@ -50,7 +60,7 @@ class CommandDccallow : public Command
  public:
 	CommandDccallow(Module* parent) : Command(parent, "DCCALLOW", 0)
 	{
-		syntax = "{[+|-]<nick> <time>|HELP|LIST}";
+		syntax = "[(+|-)<nick> [<time>]]|[LIST|HELP]";
 		/* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
 	}
 
@@ -90,9 +100,9 @@ class CommandDccallow : public Command
 			}
 
 			std::string nick = parameters[0].substr(1);
-			User *target = ServerInstance->FindNick(nick);
+			User *target = ServerInstance->FindNickOnly(nick);
 
-			if (target)
+			if ((target) && (!IS_SERVER(target)) && (!target->quitting) && (target->registered == REG_ALL))
 			{
 
 				if (action == '-')
@@ -139,8 +149,8 @@ class CommandDccallow : public Command
 						}
 					}
 
-					std::string mask = std::string(target->nick)+"!"+std::string(target->ident)+"@"+std::string(target->dhost);
-					std::string default_length = Conf->ReadValue("dccallow", "length", 0);
+					std::string mask = target->nick+"!"+target->ident+"@"+target->dhost;
+					std::string default_length = ServerInstance->Config->ConfValue("dccallow")->getString("length");
 
 					long length;
 					if (parameters.size() < 2)
@@ -156,7 +166,7 @@ class CommandDccallow : public Command
 						length = ServerInstance->Duration(parameters[1]);
 					}
 
-					if (!ServerInstance->IsValidMask(mask.c_str()))
+					if (!ServerInstance->IsValidMask(mask))
 					{
 						return CMD_FAILURE;
 					}
@@ -193,7 +203,7 @@ class CommandDccallow : public Command
 
 	void DisplayHelp(User* user)
 	{
-		user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick.c_str());
+		user->WriteNumeric(998, "%s :DCCALLOW [(+|-)<nick> [<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());
@@ -213,6 +223,10 @@ class CommandDccallow : public Command
 		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());
+
+		LocalUser* localuser = IS_LOCAL(user);
+		if (localuser)
+			localuser->CommandFloodPenalty += 4000;
 	}
 
 	void DisplayDCCAllowList(User* user)
@@ -239,23 +253,24 @@ class ModuleDCCAllow : public Module
 	CommandDccallow cmd;
  public:
 
-	ModuleDCCAllow(InspIRCd* Me)
-		: Module(Me), cmd(this)
+	ModuleDCCAllow()
+		: cmd(this)
+	{
+		ext = NULL;
+	}
+
+	void init()
 	{
-		Conf = new ConfigReader(ServerInstance);
 		ext = new SimpleExtItem<dccallowlist>("dccallow", this);
-		Extensible::Register(ext);
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(*ext);
+		ServerInstance->Modules->AddService(cmd);
 		ReadFileConf();
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPreNick, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPostNick, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
 	virtual void OnRehash(User* user)
 	{
-		delete Conf;
-		Conf = new ConfigReader(ServerInstance);
 		ReadFileConf();
 	}
 
@@ -266,7 +281,9 @@ class ModuleDCCAllow : public Module
 		// remove their DCCALLOW list if they have one
 		if (udl)
 		{
-			RemoveFromUserlist(user);
+			userlist::iterator it = std::find(ul.begin(), ul.end(), user);
+			if (it != ul.end())
+				ul.erase(it);
 		}
 
 		// remove them from any DCCALLOW lists
@@ -274,10 +291,9 @@ class ModuleDCCAllow : public Module
 		RemoveNick(user);
 	}
 
-	virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
+	virtual void OnUserPostNick(User* user, const std::string &oldnick)
 	{
 		RemoveNick(user);
-		return MOD_RES_PASSTHRU;
 	}
 
 	virtual ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
@@ -323,13 +339,20 @@ class ModuleDCCAllow : public Module
 					while (ss >> buf)
 						tokens.push_back(buf);
 
+					if (tokens.size() < 2)
+						return MOD_RES_PASSTHRU;
+
 					irc::string type = tokens[1].c_str();
 
-					bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0);
+					ConfigTag* conftag = ServerInstance->Config->ConfValue("dccallow");
+					bool blockchat = conftag->getBool("blockchat");
 
 					if (type == "SEND")
 					{
-						std::string defaultaction = Conf->ReadValue("dccallow", "action", 0);
+						if (tokens.size() < 3)
+							return MOD_RES_PASSTHRU;
+
+						std::string defaultaction = conftag->getString("action");
 						std::string filename = tokens[2];
 
 						bool found = false;
@@ -372,7 +395,7 @@ class ModuleDCCAllow : public Module
 
 	void Expire()
 	{
-		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+		for (userlist::iterator iter = ul.begin(); iter != ul.end();)
 		{
 			User* u = (User*)(*iter);
 			dl = ext->get(u);
@@ -394,10 +417,11 @@ class ModuleDCCAllow : public Module
 						}
 					}
 				}
+				++iter;
 			}
 			else
 			{
-				RemoveFromUserlist(u);
+				iter = ul.erase(iter);
 			}
 		}
 	}
@@ -405,7 +429,7 @@ 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)
+		for (userlist::iterator iter = ul.begin(); iter != ul.end();)
 		{
 			User *u = (User*)(*iter);
 			dl = ext->get(u);
@@ -425,10 +449,11 @@ class ModuleDCCAllow : public Module
 						}
 					}
 				}
+				++iter;
 			}
 			else
 			{
-				RemoveFromUserlist(u);
+				iter = ul.erase(iter);
 			}
 		}
 	}
@@ -450,28 +475,24 @@ class ModuleDCCAllow : public Module
 	void ReadFileConf()
 	{
 		bfl.clear();
-		for (int i = 0; i < Conf->Enumerate("banfile"); i++)
+		ConfigTagList tags = ServerInstance->Config->ConfTags("banfile");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
 			BannedFileList bf;
-			std::string fileglob = Conf->ReadValue("banfile", "pattern", i);
-			std::string action = Conf->ReadValue("banfile", "action", i);
-			bf.filemask = fileglob;
-			bf.action = action;
+			bf.filemask = i->second->getString("pattern");
+			bf.action = i->second->getString("action");
 			bfl.push_back(bf);
 		}
-
 	}
 
 	virtual ~ModuleDCCAllow()
 	{
-		delete Conf;
 		delete ext;
-		Conf = NULL;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR);
 	}
 };