X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=f8829857681b37b9a775ab2f35c6f9cac6e952ab;hb=c6e40d36b42a7ebf832c3a57d2816a47ee9c9a76;hp=d07898c90801c0a199c9e6bfd24f8d9ebe0ee8a9;hpb=6c7a3ceb6c674a9af09da955ee0238e9291cf29a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index d07898c90..f88298576 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -22,8 +22,16 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
 
-static std::map<irc::string, std::string> helpop_map;
+enum
+{
+	// From UnrealIRCd.
+	RPL_WHOISHELPOP = 310
+};
+
+typedef std::map<std::string, std::string, irc::insensitive_swo> HelpopMap;
+static HelpopMap helpop_map;
 
 /** Handles user mode +h
  */
@@ -40,39 +48,40 @@ class Helpop : public SimpleUserModeHandler
  */
 class CommandHelpop : public Command
 {
+	const std::string startkey;
  public:
-	CommandHelpop(Module* Creator) : Command(Creator, "HELPOP", 0)
+	CommandHelpop(Module* Creator)
+		: Command(Creator, "HELPOP", 0)
+		, startkey("start")
 	{
 		syntax = "<any-text>";
 	}
 
-	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		irc::string parameter("start");
-		if (parameters.size() > 0)
-			parameter = parameters[0].c_str();
+		const std::string& parameter = (!parameters.empty() ? parameters[0] : startkey);
 
 		if (parameter == "index")
 		{
 			/* iterate over all helpop items */
-			user->WriteNumeric(290, ":HELPOP topic index");
-			for (std::map<irc::string, std::string>::iterator iter = helpop_map.begin(); iter != helpop_map.end(); iter++)
-				user->WriteNumeric(292, ":  %s", iter->first.c_str());
-			user->WriteNumeric(292, ":*** End of HELPOP topic index");
+			user->WriteNumeric(290, "HELPOP topic index");
+			for (HelpopMap::const_iterator iter = helpop_map.begin(); iter != helpop_map.end(); iter++)
+				user->WriteNumeric(292, InspIRCd::Format("  %s", iter->first.c_str()));
+			user->WriteNumeric(292, "*** End of HELPOP topic index");
 		}
 		else
 		{
-			user->WriteNumeric(290, ":*** HELPOP for %s", parameter.c_str());
-			user->WriteNumeric(292, ": -");
+			user->WriteNumeric(290, InspIRCd::Format("*** HELPOP for %s", parameter.c_str()));
+			user->WriteNumeric(292, " -");
 
-			std::map<irc::string, std::string>::iterator iter = helpop_map.find(parameter);
+			HelpopMap::const_iterator iter = helpop_map.find(parameter);
 
 			if (iter == helpop_map.end())
 			{
 				iter = helpop_map.find("nohelp");
 			}
 
-			std::string value = iter->second;
+			const std::string& value = iter->second;
 			irc::sepstream stream(value, '\n');
 			std::string token = "*";
 
@@ -80,39 +89,40 @@ class CommandHelpop : public Command
 			{
 				// Writing a blank line will not work with some clients
 				if (token.empty())
-					user->WriteNumeric(292, ": ");
+					user->WriteNumeric(292, ' ');
 				else
-					user->WriteNumeric(292, ":%s", token.c_str());
+					user->WriteNumeric(292, token);
 			}
 
-			user->WriteNumeric(292, ": -");
-			user->WriteNumeric(292, ":*** End of HELPOP");
+			user->WriteNumeric(292, " -");
+			user->WriteNumeric(292, "*** End of HELPOP");
 		}
 		return CMD_SUCCESS;
 	}
 };
 
-class ModuleHelpop : public Module
+class ModuleHelpop : public Module, public Whois::EventListener
 {
-		std::string  h_file;
 		CommandHelpop cmd;
 		Helpop ho;
 
 	public:
 		ModuleHelpop()
-			: cmd(this), ho(this)
+			: Whois::EventListener(this)
+			, cmd(this)
+			, ho(this)
 		{
 		}
 
 		void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 		{
-			helpop_map.clear();
+			HelpopMap help;
 
 			ConfigTagList tags = ServerInstance->Config->ConfTags("helpop");
 			for(ConfigIter i = tags.first; i != tags.second; ++i)
 			{
 				ConfigTag* tag = i->second;
-				irc::string key = assign(tag->getString("key"));
+				std::string key = tag->getString("key");
 				std::string value;
 				tag->readString("value", value, true); /* Linefeeds allowed */
 
@@ -121,27 +131,28 @@ 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);
 		}
 
-		void OnWhois(User* src, User* dst) CXX11_OVERRIDE
+		void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
 		{
-			if (dst->IsModeSet(ho))
+			if (whois.GetTarget()->IsModeSet(ho))
 			{
-				ServerInstance->SendWhoisLine(src, dst, 310, dst->nick+" :is available for help.");
+				whois.SendLine(RPL_WHOISHELPOP, "is available for help.");
 			}
 		}