X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=0cfca57d06065b9591081b172ce51b85cf1996cc;hb=eacd707421be4f2612df9bde4517649061bb062e;hp=fd88651c02bc17fa183e95b734d91dfc35ec8e2f;hpb=deb85740798d3438563628736c0e83edb6966b6e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index fd88651c0..0cfca57d0 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-2007 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
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: /helpop Command, Works like Unreal helpop */
 static std::map<irc::string, std::string> helpop_map;
@@ -27,7 +24,7 @@ class Helpop : public ModeHandler
  public:
 	Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
@@ -52,34 +49,35 @@ class Helpop : public ModeHandler
 
 /** Handles /HELPOP
  */
-class cmd_helpop : public command_t
+class CommandHelpop : public Command
 {
  public:
-	cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 0)
+	CommandHelpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0)
 	{
 		this->source = "m_helpop.so";
 		syntax = "<any-text>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		irc::string parameter;
-		if (pcnt > 0)
-			parameter = parameters[0];
+		irc::string parameter("start");
+		if (parameters.size() > 0)
+			parameter = parameters[0].c_str();
 
-		if (pcnt == 0 || parameter == "index")
+		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, parameters[0]);
+			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);
 
@@ -93,9 +91,16 @@ class cmd_helpop : public command_t
 			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
@@ -109,7 +114,7 @@ class ModuleHelpop : public Module
 {
 	private:
 		std::string  h_file;
-		cmd_helpop* mycommand;
+		CommandHelpop* mycommand;
 		Helpop* ho;
 
 	public:
@@ -118,22 +123,24 @@ class ModuleHelpop : public Module
 		{
 			ReadConfig();
 			ho = new Helpop(ServerInstance);
-			if (!ServerInstance->AddMode(ho, 'h'))
+			if (!ServerInstance->Modes->AddMode(ho))
 				throw ModuleException("Could not add new modes!");
-			mycommand = new cmd_helpop(ServerInstance);
+			mycommand = new CommandHelpop(ServerInstance);
 			ServerInstance->AddCommand(mycommand);
+		Implementation eventlist[] = { I_OnRehash, I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		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")
 				{
@@ -156,17 +163,13 @@ class ModuleHelpop : public Module
 
 		}
 
-		void Implements(char* List)
-		{
-			List[I_OnRehash] = List[I_OnWhois] = 1;
-		}
 
-		virtual void OnRehash(userrec* user, const std::string &parameter)
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			ReadConfig();
 		}
 
-		virtual void OnWhois(userrec* src, userrec* dst)
+		virtual void OnWhois(User* src, User* dst)
 		{
 			if (dst->IsModeSet('h'))
 			{
@@ -177,12 +180,12 @@ class ModuleHelpop : public Module
 		virtual ~ModuleHelpop()
 		{
 			ServerInstance->Modes->DelMode(ho);
-			DELETE(ho);
+			delete ho;
 		}
-	
+
 		virtual Version GetVersion()
 		{
-			return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
+			return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 		}
 };