X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=50c8e22a7212d738b33075f15f74a848167f1ea5;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=62d7a54d0b676519c9c8032ca49b0736f2c303c6;hpb=9336468f5bfa60318cb57db5126047147b7a21cb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 62d7a54d0..50c8e22a7 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -1,16 +1,27 @@
-/*       +------------------------------------+
- *       | 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) 2004, 2008-2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * 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/>.
  */
 
+
+/* $ModDesc: Provides user and channel +G mode */
+
 #define _CRT_SECURE_NO_DEPRECATE
 #define _SCL_SECURE_NO_DEPRECATE
 
@@ -19,14 +30,12 @@
 
 typedef std::map<irc::string,irc::string> censor_t;
 
-/* $ModDesc: Provides user and channel +G mode */
-
 /** Handles usermode +G
  */
 class CensorUser : public SimpleUserModeHandler
 {
  public:
-	CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, 'G') { }
+	CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "u_censor", 'G') { }
 };
 
 /** Handles channel mode +G
@@ -34,7 +43,7 @@ class CensorUser : public SimpleUserModeHandler
 class CensorChannel : public SimpleChannelModeHandler
 {
  public:
-	CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, 'G') { }
+	CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, "censor", 'G') { }
 };
 
 class ModuleCensor : public Module
@@ -44,16 +53,17 @@ class ModuleCensor : public Module
 	CensorChannel cc;
 
  public:
-	ModuleCensor()
-		: cu(this), cc(this)
+	ModuleCensor() : cu(this), cc(this) { }
+
+	void init()
 	{
 		/* Read the configuration file on startup.
 		 */
 		OnRehash(NULL);
-		if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		ServerInstance->Modules->AddService(cu);
+		ServerInstance->Modules->AddService(cc);
+		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 
@@ -75,10 +85,10 @@ class ModuleCensor : public Module
 		{
 			active = ((Channel*)dest)->IsModeSet('G');
 			Channel* c = (Channel*)dest;
-			if (CHANOPS_EXEMPT('G') && c->GetPrefixValue(user) == OP_VALUE)
-			{
+			ModResult res = ServerInstance->OnCheckExemption(user,c,"censor");
+
+			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
-			}
 		}
 
 		if (!active)
@@ -113,22 +123,22 @@ class ModuleCensor : public Module
 		 * reload our config file on rehash - we must destroy and re-allocate the classes
 		 * to call the constructor again and re-read our data.
 		 */
-		ConfigReader* MyConf = new ConfigReader;
 		censors.clear();
 
-		for (int index = 0; index < MyConf->Enumerate("badword"); index++)
+		ConfigTagList badwords = ServerInstance->Config->ConfTags("badword");
+		for (ConfigIter i = badwords.first; i != badwords.second; ++i)
 		{
-			irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str();
-			irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str();
-			censors[pattern] = replace;
+			ConfigTag* tag = i->second;
+			std::string str = tag->getString("text");
+			irc::string pattern(str.c_str());
+			str = tag->getString("replace");
+			censors[pattern] = irc::string(str.c_str());
 		}
-
-		delete MyConf;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides user and channel +G mode",VF_VENDOR);
 	}
 
 };