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

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index b7a9ec3ce..7ce44441d 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-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,32 +19,10 @@ static std::map<irc::string, std::string> helpop_map;
 
 /** Handles user mode +h
  */
-class Helpop : public ModeHandler
+class Helpop : public SimpleUserModeHandler
 {
  public:
-	Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, 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;
-	}
+	Helpop(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'h') { }
 };
 
 /** Handles /HELPOP
@@ -58,25 +36,26 @@ class CommandHelpop : public Command
 		syntax = "<any-text>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		irc::string parameter("start");
-		if (pcnt > 0)
-			parameter = parameters[0];
+		if (parameters.size() > 0)
+			parameter = parameters[0].c_str();
 
 		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);
 
@@ -90,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
@@ -115,7 +101,7 @@ class ModuleHelpop : public Module
 		{
 			ReadConfig();
 			ho = new Helpop(ServerInstance);
-			if (!ServerInstance->AddMode(ho))
+			if (!ServerInstance->Modes->AddMode(ho))
 				throw ModuleException("Could not add new modes!");
 			mycommand = new CommandHelpop(ServerInstance);
 			ServerInstance->AddCommand(mycommand);
@@ -125,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")
 				{
@@ -155,10 +141,6 @@ class ModuleHelpop : public Module
 
 		}
 
-		void Implements(char* List)
-		{
-			List[I_OnRehash] = List[I_OnWhois] = 1;
-		}
 
 		virtual void OnRehash(User* user, const std::string &parameter)
 		{
@@ -178,10 +160,10 @@ class ModuleHelpop : public Module
 			ServerInstance->Modes->DelMode(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);
 		}
 };