X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=716b9bfb7e41078df815fac9a1a1dea1163d874d;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=5a0a675074f7e32bbe9da3e63c66d85a635e1e51;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 5a0a67507..716b9bfb7 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -22,9 +22,12 @@ static std::map<irc::string, std::string> helpop_map;
 class Helpop : public ModeHandler
 {
  public:
-	Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { }
+	Helpop(Module* Creator) : ModeHandler(Creator, "helpop", 'h', PARAM_NONE, MODETYPE_USER)
+	{
+		oper = true;
+	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -52,9 +55,8 @@ class Helpop : public ModeHandler
 class CommandHelpop : public Command
 {
  public:
-	CommandHelpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0)
+	CommandHelpop(Module* Creator) : Command(Creator, "HELPOP", 0)
 	{
-		this->source = "m_helpop.so";
 		syntax = "<any-text>";
 	}
 
@@ -114,26 +116,24 @@ class ModuleHelpop : public Module
 {
 	private:
 		std::string  h_file;
-		CommandHelpop* mycommand;
-		Helpop* ho;
+		CommandHelpop cmd;
+		Helpop ho;
 
 	public:
-		ModuleHelpop(InspIRCd* Me)
-			: Module(Me)
+		ModuleHelpop()
+			: cmd(this), ho(this)
 		{
 			ReadConfig();
-			ho = new Helpop(ServerInstance);
-			if (!ServerInstance->Modes->AddMode(ho))
+			if (!ServerInstance->Modes->AddMode(&ho))
 				throw ModuleException("Could not add new modes!");
-			mycommand = new CommandHelpop(ServerInstance);
-			ServerInstance->AddCommand(mycommand);
-		Implementation eventlist[] = { I_OnRehash, I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+			ServerInstance->AddCommand(&cmd);
+			Implementation eventlist[] = { I_OnRehash, I_OnWhois };
+			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		virtual void ReadConfig()
 		{
-			ConfigReader MyConf(ServerInstance);
+			ConfigReader MyConf;
 
 			helpop_map.clear();
 
@@ -164,7 +164,7 @@ class ModuleHelpop : public Module
 		}
 
 
-		virtual void OnRehash(User* user, const std::string &parameter)
+		virtual void OnRehash(User* user)
 		{
 			ReadConfig();
 		}
@@ -179,13 +179,11 @@ class ModuleHelpop : public Module
 
 		virtual ~ModuleHelpop()
 		{
-			ServerInstance->Modes->DelMode(ho);
-			delete ho;
 		}
 
 		virtual Version GetVersion()
 		{
-			return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+			return Version("/helpop Command, Works like Unreal helpop", VF_COMMON | VF_VENDOR, API_VERSION);
 		}
 };