m_spanningtree SVSNICK needs 3 parameters

[user/henk/code/inspircd.git] / src / modules / m_censor.cpp

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index bf1f0225dcba4bfc597de9248b79c6bcda196237..bbf061f7ea3cd6ec719959e2d3e09e4321377ba3 100644 (file)
--- 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-2010 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,8 +30,6 @@
 
 typedef std::map<irc::string,irc::string> censor_t;
 
-/* $ModDesc: Provides user and channel +G mode */
-
 /** Handles usermode +G
  */
 class CensorUser : public SimpleUserModeHandler
@@ -119,9 +128,10 @@ class ModuleCensor : public Module
 
                for (int index = 0; index < MyConf.Enumerate("badword"); index++)
                {
-                       irc::string pattern = (MyConf.ReadValue("badword","text",index)).c_str();
-                       irc::string replace = (MyConf.ReadValue("badword","replace",index)).c_str();
-                       censors[pattern] = replace;
+                       std::string str = MyConf.ReadValue("badword","text",index);
+                       irc::string pattern(str.c_str());
+                       str = MyConf.ReadValue("badword","replace",index);
+                       censors[pattern] = irc::string(str.c_str());
                }
        }