X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=60c23f45bd44820c39b5e01496a804551c535a1c;hb=2ab2de1dda8f2043898b9df8004ba5b6c4df7349;hp=d8a5440391dc2ee0dbacc30dd8398f9e5ea813b0;hpb=3d8ec5dbd9cfde34fcbc63ad7b9b1369866f0a33;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index d8a544039..60c23f45b 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -1,49 +1,40 @@
-/*       +------------------------------------+
- *       | 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) 2005-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004-2005 Craig McLure <craig@chatspike.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 the /HELPOP command for useful information */
+
 #include "inspircd.h"
 
-/* $ModDesc: /helpop Command, Works like Unreal helpop */
 static std::map<irc::string, std::string> helpop_map;
 
-
 /** Handles user mode +h
  */
-class Helpop : public ModeHandler
+class Helpop : public SimpleUserModeHandler
 {
  public:
-	Helpop(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'h', 0, 0, false, MODETYPE_USER, true) { }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	Helpop(Module* Creator) : SimpleUserModeHandler(Creator, "helpop", 'h')
 	{
-		if (adding)
-		{
-			if (!dest->IsModeSet('h'))
-			{
-				dest->SetMode('h',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('h'))
-			{
-				dest->SetMode('h',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
+		oper = true;
 	}
 };
 
@@ -52,7 +43,7 @@ class Helpop : public ModeHandler
 class CommandHelpop : public Command
 {
  public:
-	CommandHelpop (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "HELPOP", 0, 0)
+	CommandHelpop(Module* Creator) : Command(Creator, "HELPOP", 0)
 	{
 		syntax = "<any-text>";
 	}
@@ -101,11 +92,7 @@ class CommandHelpop : public Command
 			user->WriteServ("292 %s : -", user->nick.c_str());
 			user->WriteServ("292 %s :*** End of HELPOP", user->nick.c_str());
 		}
-
-		/* We dont want these going out over the network, return CMD_FAILURE
-		 * to make sure the protocol module thinks theyre not worth sending.
-		 */
-		return CMD_FAILURE;
+		return CMD_SUCCESS;
 	}
 };
 
@@ -117,27 +104,31 @@ class ModuleHelpop : public Module
 		Helpop ho;
 
 	public:
-		ModuleHelpop(InspIRCd* Me)
-			: Module(Me), cmd(Me, this), ho(Me, this)
+		ModuleHelpop()
+			: cmd(this), ho(this)
+		{
+		}
+
+		void init()
 		{
 			ReadConfig();
-			if (!ServerInstance->Modes->AddMode(&ho))
-				throw ModuleException("Could not add new modes!");
-			ServerInstance->AddCommand(&cmd);
+			ServerInstance->Modules->AddService(ho);
+			ServerInstance->Modules->AddService(cmd);
 			Implementation eventlist[] = { I_OnRehash, I_OnWhois };
 			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
-		virtual void ReadConfig()
+		void ReadConfig()
 		{
-			ConfigReader MyConf(ServerInstance);
-
 			helpop_map.clear();
 
-			for (int i = 0; i < MyConf.Enumerate("helpop"); i++)
+			ConfigTagList tags = ServerInstance->Config->ConfTags("helpop");
+			for(ConfigIter i = tags.first; i != tags.second; ++i)
 			{
-				irc::string key = assign(MyConf.ReadValue("helpop", "key", i));
-				std::string value = MyConf.ReadValue("helpop", "value", i, true); /* Linefeeds allowed! */
+				ConfigTag* tag = i->second;
+				irc::string key = assign(tag->getString("key"));
+				std::string value;
+				tag->readString("value", value, true); /* Linefeeds allowed */
 
 				if (key == "index")
 				{
@@ -150,23 +141,22 @@ class ModuleHelpop : public Module
 			if (helpop_map.find("start") == helpop_map.end())
 			{
 				// error!
-				throw ModuleException("m_helpop: Helpop file is missing important entries. Please check the example conf.");
+				throw ModuleException("m_helpop: Helpop file is missing important entry 'start'. Please check the example conf.");
 			}
 			else if (helpop_map.find("nohelp") == helpop_map.end())
 			{
 				// error!
-				throw ModuleException("m_helpop: Helpop file is missing important entries. Please check the example conf.");
+				throw ModuleException("m_helpop: Helpop file is missing important entry 'nohelp'. Please check the example conf.");
 			}
 
 		}
 
-
-		virtual void OnRehash(User* user)
+		void OnRehash(User* user)
 		{
 			ReadConfig();
 		}
 
-		virtual void OnWhois(User* src, User* dst)
+		void OnWhois(User* src, User* dst)
 		{
 			if (dst->IsModeSet('h'))
 			{
@@ -174,14 +164,9 @@ class ModuleHelpop : public Module
 			}
 		}
 
-		virtual ~ModuleHelpop()
-		{
-			ServerInstance->Modes->DelMode(&ho);
-		}
-
-		virtual Version GetVersion()
+		Version GetVersion()
 		{
-			return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+			return Version("Provides the /HELPOP command for useful information", VF_VENDOR);
 		}
 };