m_namedmodes Only show chan key to members and opers with channels/auspex

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

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 446ac2475b7339db724622670062ff0e2c253542..c65645bc9209426d0382f3e81cfdc2725daca441 100644 (file)
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | 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) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Dennis Friis <peavey@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: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */
@@ -25,7 +33,6 @@ class CommandTitle : public Command
                ctitle("ctitle", Creator)
        {
                syntax = "<user> <password>";
-               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
        bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
@@ -50,17 +57,17 @@ class CommandTitle : public Command
                snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(), user->host.c_str());
                snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(), user->GetIPString());
 
-               ConfigReader Conf;
-               for (int i=0; i<Conf.Enumerate("title"); i++)
+               ConfigTagList tags = ServerInstance->Config->ConfTags("title");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
-                       std::string Name = Conf.ReadValue("title", "name", "", i);
-                       std::string pass = Conf.ReadValue("title", "password", "", i);
-                       std::string hash = Conf.ReadValue("title", "hash", "", i);
-                       std::string host = Conf.ReadValue("title", "host", "*@*", i);
-                       std::string title = Conf.ReadValue("title", "title", "", i);
-                       std::string vhost = Conf.ReadValue("title", "vhost", "", i);
-
-                       if (!strcmp(Name.c_str(),parameters[0].c_str()) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
+                       std::string Name = i->second->getString("name");
+                       std::string pass = i->second->getString("password");
+                       std::string hash = i->second->getString("hash");
+                       std::string host = i->second->getString("host", "*@*");
+                       std::string title = i->second->getString("title");
+                       std::string vhost = i->second->getString("vhost");
+
+                       if (Name == parameters[0] && !ServerInstance->PassCompare(user, pass, parameters[1], hash) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
                        {
                                ctitle.set(user, title);
 
@@ -88,8 +95,12 @@ class ModuleCustomTitle : public Module
  public:
        ModuleCustomTitle() : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               ServerInstance->Extensions.Register(&cmd.ctitle);
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(cmd);
+               ServerInstance->Modules->AddService(cmd.ctitle);
                ServerInstance->Modules->Attach(I_OnWhoisLine, this);
        }