X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=7ce44441dc474679857b6f0b071a18774e5dbf45;hb=39897f56f5f84d8d4c8903fb46a03c2fdcf733ec;hp=af55f9bc8beb922e159edcfd6b3212677d151b47;hpb=5f6955a43ee286925d9f79affcb2fdd5e9306fe6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index af55f9bc8..7ce44441d 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -45,16 +45,17 @@ class CommandHelpop : public Command
 		if (parameter == "index")
 		{
 			/* iterate over all helpop items */
-			user->WriteServ("NOTICE %s :HELPOP topic index", user->nick);
+			user->WriteServ("290 %s :HELPOP topic index", user->nick.c_str());
 			for (std::map<irc::string, std::string>::iterator iter = helpop_map.begin(); iter != helpop_map.end(); iter++)
 			{
-				user->WriteServ("NOTICE %s :    %s", user->nick, iter->first.c_str());				
+				user->WriteServ("292 %s :  %s", user->nick.c_str(), iter->first.c_str());
 			}
-			user->WriteServ("NOTICE %s :*** End of HELPOP topic index", user->nick);
+			user->WriteServ("292 %s :*** End of HELPOP topic index", user->nick.c_str());
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick, parameter.c_str());
+			user->WriteServ("290 %s :*** HELPOP for %s", user->nick.c_str(), parameter.c_str());
+			user->WriteServ("292 %s : -", user->nick.c_str());
 
 			std::map<irc::string, std::string>::iterator iter = helpop_map.find(parameter);
 
@@ -68,9 +69,16 @@ class CommandHelpop : public Command
 			std::string token = "*";
 
 			while (stream.GetToken(token))
-				user->WriteServ("NOTICE %s :%s", user->nick, token.c_str());
+			{
+				// Writing a blank line will not work with some clients
+				if (token.empty())
+					user->WriteServ("292 %s : ", user->nick.c_str());
+				else
+					user->WriteServ("292 %s :%s", user->nick.c_str(), token.c_str());
+			}
 
-			user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick);
+			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
@@ -103,14 +111,14 @@ class ModuleHelpop : public Module
 
 		virtual void ReadConfig()
 		{
-			ConfigReader *MyConf = new ConfigReader(ServerInstance);
+			ConfigReader MyConf(ServerInstance);
 
 			helpop_map.clear();
 
-			for (int i = 0; i < MyConf->Enumerate("helpop"); i++)
+			for (int i = 0; i < MyConf.Enumerate("helpop"); i++)
 			{
-				irc::string key = assign(MyConf->ReadValue("helpop", "key", i));
-				std::string value = MyConf->ReadValue("helpop", "value", i, true); /* Linefeeds allowed! */
+				irc::string key = assign(MyConf.ReadValue("helpop", "key", i));
+				std::string value = MyConf.ReadValue("helpop", "value", i, true); /* Linefeeds allowed! */
 
 				if (key == "index")
 				{
@@ -152,10 +160,10 @@ class ModuleHelpop : public Module
 			ServerInstance->Modes->DelMode(ho);
 			delete ho;
 		}
-	
+
 		virtual Version GetVersion()
 		{
-			return Version(1,2,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
+			return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 		}
 };