Merge pull request #495 from SaberUK/master+fix-libcpp

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

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index f89b6ab009bfae90748e9dc0b96f35f510e83a9e..c2bf9feecdb99d57b9eef6e1be278e4fbe3ad71a 100644 (file)
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -1,60 +1,67 @@
-/*       +------------------------------------+
- *       | 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-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * 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: Implements config tags which allow changing characters allowed in channel names */
 
 static std::bitset<256> allowedmap;
 
-class NewIsChannelHandler : public HandlerBase2<bool, const char*, size_t>
+class NewIsChannelHandler : public HandlerBase2<bool, const std::string&, size_t>
 {
  public:
        NewIsChannelHandler() { }
        virtual ~NewIsChannelHandler() { }
-       virtual bool Call(const char*, size_t);
+       virtual bool Call(const std::string&, size_t);
 };
 
-bool NewIsChannelHandler::Call(const char* c, size_t max)
+bool NewIsChannelHandler::Call(const std::string& channame, size_t max)
 {
-               /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
-               if (!c || *c++ != '#')
+       if (channame.empty() || channame.length() > max || channame[0] != '#')
+               return false;
+
+       for (std::string::const_iterator c = channame.begin(); c != channame.end(); ++c)
+       {
+               unsigned int i = *c & 0xFF;
+               if (!allowedmap[i])
                        return false;
+       }
 
-               while (*c && --max)
-               {
-                       unsigned int i = *c++ & 0xFF;
-                       if (!allowedmap[i])
-                               return false;
-               }
-               // a name of exactly max length will have max = 1 here; the null does not trigger --max
-               return max;
+       return true;
 }
 
 class ModuleChannelNames : public Module
 {
- private:
        NewIsChannelHandler myhandler;
-       caller2<bool, const char*, size_t> rememberer;
+       caller2<bool, const std::string&, size_t> rememberer;
        bool badchan;
 
  public:
-       ModuleChannelNames() : rememberer(ServerInstance->IsChannel)
+       ModuleChannelNames() : rememberer(ServerInstance->IsChannel), badchan(false)
+       {
+       }
+
+       void init()
        {
                ServerInstance->IsChannel = &myhandler;
-               badchan = false;
                Implementation eventlist[] = { I_OnRehash, I_OnUserKick };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
@@ -64,7 +71,7 @@ class ModuleChannelNames : public Module
                std::vector<Channel*> chanvec;
                for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ++i)
                {
-                       if (!ServerInstance->IsChannel(i->second->name.c_str(), MAXBUF))
+                       if (!ServerInstance->IsChannel(i->second->name, MAXBUF))
                                chanvec.push_back(i->second);
                }
                std::vector<Channel*>::reverse_iterator c2 = chanvec.rbegin();
@@ -89,9 +96,9 @@ class ModuleChannelNames : public Module
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf;
-               std::string denyToken = Conf.ReadValue("channames", "denyrange", 0);
-               std::string allowToken = Conf.ReadValue("channames", "allowrange", 0);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("channames");
+               std::string denyToken = tag->getString("denyrange");
+               std::string allowToken = tag->getString("allowrange");
                allowedmap.set();
 
                irc::portparser denyrange(denyToken, false);