X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=661860b0a31ae1ea01acf5de850503b195951b6f;hb=92796ffe6430162a9cb70f1361aaa9ca64645c90;hp=9c7d409a8be93acd496b6cce7662c3536d6ddb87;hpb=a5dd6bbd4b82ee4ffa7b790b353975a304ced6bb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 9c7d409a8..661860b0a 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-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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.c_str());
+			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.c_str(), 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.c_str());
+			user->WriteServ("292 %s :*** End of HELPOP topic index", user->nick.c_str());
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick.c_str(), 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.c_str(), 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.c_str());
+			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