X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=be861447f36effcab132852d2f8e32836fe45387;hb=e5518238259b9988a2a6d8ef654b69034628c10d;hp=ffdbb65c0445c5b69c717d3e7802ffbdeba0a75e;hpb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index ffdbb65c0..be861447f 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -1,16 +1,26 @@
-/*       +------------------------------------+
- *       | 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 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
  *
- * 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: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
@@ -25,7 +35,7 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP
 
 /** Holds a blocked message's details
  */
-class BlockedMessage : public classbase
+class BlockedMessage
 {
 public:
 	std::string message;
@@ -46,33 +56,31 @@ class ModuleBlockAmsg : public Module
 
  public:
 	ModuleBlockAmsg() : blockamsg("blockamsg", this)
+	{
+	}
+
+	void init()
 	{
 		this->OnRehash(NULL);
-		ServerInstance->Extensions.Register(&blockamsg);
+		ServerInstance->Modules->AddService(blockamsg);
 		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
 	virtual ~ModuleBlockAmsg()
 	{
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR,API_VERSION);
+		return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
 	}
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf;
-
-		ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false);
-
-		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
-			ForgetDelay = -1;
-
-		std::string act = Conf.ReadValue("blockamsg", "action", 0);
+		ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg");
+		ForgetDelay = tag->getInt("delay", -1);
+		std::string act = tag->getString("action");
 
 		if(act == "notice")
 			action = IBLOCK_NOTICE;
@@ -86,17 +94,13 @@ class ModuleBlockAmsg : public Module
 			action = IBLOCK_KILLOPERS;
 	}
 
-	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
 	{
-		// Don't do anything with unregistered users, or remote ones.
-		if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user))
+		// Don't do anything with unregistered users
+		if (user->registered != REG_ALL)
 			return MOD_RES_PASSTHRU;
 
-		// We want case insensitive command comparison.
-		// Add std::string contructor for irc::string :x
-		irc::string cmd = command.c_str();
-
-		if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (parameters.size() >= 2))
+		if ((validated) && (parameters.size() >= 2) && ((command == "PRIVMSG") || (command == "NOTICE")))
 		{
 			// parameters[0] should have the target(s) in it.
 			// I think it will be faster to first check if there are any commas, and if there are then try and parse it out.
@@ -141,9 +145,9 @@ class ModuleBlockAmsg : public Module
 					ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str());
 
 				if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
-					ServerInstance->Users->QuitUser(user, "Global message (/amsg or /ame) detected");
+					ServerInstance->Users->QuitUser(user, "Attempted to global message (/amsg or /ame)");
 				else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
-					user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick.c_str());
+					user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) denied", user->nick.c_str());
 
 				return MOD_RES_DENY;
 			}