X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=4c5dc23a99f339350e0937331e23e463169681f4;hb=cb4c516ace8fef75b8a54a141c3644af9697ac0a;hp=5a0a675074f7e32bbe9da3e63c66d85a635e1e51;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 5a0a67507..4c5dc23a9 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -13,18 +13,19 @@
 
 #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
 {
  public:
-	Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { }
+	Helpop(Module* Creator) : ModeHandler(Creator, "helpop", 'h', PARAM_NONE, MODETYPE_USER)
+	{
+		oper = true;
+	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -52,9 +53,8 @@ class Helpop : public ModeHandler
 class CommandHelpop : public Command
 {
  public:
-	CommandHelpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0)
+	CommandHelpop(Module* Creator) : Command(Creator, "HELP", 0)
 	{
-		this->source = "m_helpop.so";
 		syntax = "<any-text>";
 	}
 
@@ -102,11 +102,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;
 	}
 };
 
@@ -114,33 +110,35 @@ class ModuleHelpop : public Module
 {
 	private:
 		std::string  h_file;
-		CommandHelpop* mycommand;
-		Helpop* ho;
+		CommandHelpop cmd;
+		Helpop ho;
 
 	public:
-		ModuleHelpop(InspIRCd* Me)
-			: Module(Me)
+		ModuleHelpop()
+			: cmd(this), ho(this)
 		{
-			ReadConfig();
-			ho = new Helpop(ServerInstance);
-			if (!ServerInstance->Modes->AddMode(ho))
-				throw ModuleException("Could not add new modes!");
-			mycommand = new CommandHelpop(ServerInstance);
-			ServerInstance->AddCommand(mycommand);
-		Implementation eventlist[] = { I_OnRehash, I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
-		virtual void ReadConfig()
+		void init()
 		{
-			ConfigReader MyConf(ServerInstance);
+			ReadConfig();
+			ServerInstance->Modules->AddService(ho);
+			ServerInstance->Modules->AddService(cmd);
+			Implementation eventlist[] = { I_OnRehash, I_OnWhois };
+			ServerInstance->Modules->Attach(eventlist, this, 2);
+		}
 
+		void ReadConfig()
+		{
 			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")
 				{
@@ -153,23 +151,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, const std::string &parameter)
+		void OnRehash(User* user)
 		{
 			ReadConfig();
 		}
 
-		virtual void OnWhois(User* src, User* dst)
+		void OnWhois(User* src, User* dst)
 		{
 			if (dst->IsModeSet('h'))
 			{
@@ -177,15 +174,9 @@ class ModuleHelpop : public Module
 			}
 		}
 
-		virtual ~ModuleHelpop()
-		{
-			ServerInstance->Modes->DelMode(ho);
-			delete ho;
-		}
-
-		virtual Version GetVersion()
+		Version GetVersion()
 		{
-			return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+			return Version("/help command, works like Unreal helpop", VF_VENDOR);
 		}
 };