X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=4bbe8785e4ef4f7b2f22d059b56f81682eb8d6fe;hb=91c34d4e971dcc9370d205ff6d8189cd92f1d556;hp=8f19bd72b739bfbae57e3363b91de7d83e942d2c;hpb=4fca1ffbc43dd0eda8e6df665dac0fa83512daf8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 8f19bd72b..4bbe8785e 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -1,53 +1,41 @@
-/*       +------------------------------------+
- *       | 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(Module* Creator) : ModeHandler(Creator, "helpop", 'h', PARAM_NONE, MODETYPE_USER)
+	Helpop(Module* Creator) : SimpleUserModeHandler(Creator, "helpop", 'h')
 	{
 		oper = true;
 	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		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;
-	}
 };
 
 /** Handles /HELPOP
@@ -111,33 +99,32 @@ class CommandHelpop : public Command
 class ModuleHelpop : public Module
 {
 	private:
-		std::string  h_file;
 		CommandHelpop cmd;
 		Helpop ho;
 
 	public:
 		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);
+			ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		}
 
-		virtual void ReadConfig()
+		void ReadConfig()
 		{
-			ConfigReader MyConf;
-
-			helpop_map.clear();
+			std::map<irc::string, std::string> help;
 
-			for (int i = 0;; i++)
+			ConfigTagList tags = ServerInstance->Config->ConfTags("helpop");
+			for(ConfigIter i = tags.first; i != tags.second; ++i)
 			{
-				ConfigTag* tag = ServerInstance->Config->ConfValue("helpop", i);
-				if (!tag)
-					break;
+				ConfigTag* tag = i->second;
 				irc::string key = assign(tag->getString("key"));
 				std::string value;
 				tag->readString("value", value, true); /* Linefeeds allowed */
@@ -147,43 +134,39 @@ class ModuleHelpop : public Module
 					throw ModuleException("m_helpop: The key 'index' is reserved for internal purposes. Please remove it.");
 				}
 
-				helpop_map[key] = value;
+				help[key] = value;
 			}
 
-			if (helpop_map.find("start") == helpop_map.end())
+			if (help.find("start") == help.end())
 			{
 				// error!
 				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())
+			else if (help.find("nohelp") == help.end())
 			{
 				// error!
 				throw ModuleException("m_helpop: Helpop file is missing important entry 'nohelp'. Please check the example conf.");
 			}
 
+			helpop_map.swap(help);
 		}
 
-
-		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'))
 			{
-				ServerInstance->SendWhoisLine(src, dst, 310, std::string(src->nick)+" "+std::string(dst->nick)+" :is available for help.");
+				ServerInstance->SendWhoisLine(src, dst, 310, src->nick+" "+dst->nick+" :is available for help.");
 			}
 		}
 
-		virtual ~ModuleHelpop()
-		{
-		}
-
-		virtual Version GetVersion()
+		Version GetVersion()
 		{
-			return Version("/helpop Command, Works like Unreal helpop", VF_VENDOR | VF_COMMON);
+			return Version("Provides the /HELPOP command for useful information", VF_VENDOR);
 		}
 };