Fix iteration of ServerInstance->Users->local_users now that QuitUser can modify...

[user/henk/code/inspircd.git] / src / modules / m_helpop.cpp

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 0cfca57d06065b9591081b172ce51b85cf1996cc..2ff22d4d34d83cca4c39bdec6bcaa4b274f4915a 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, '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,21 +116,19 @@ class ModuleHelpop : public Module
 {
        private:
                std::string  h_file;
-               CommandHelpop* mycommand;
-               Helpop* ho;
+               CommandHelpop cmd;
+               Helpop ho;
 
        public:
                ModuleHelpop(InspIRCd* Me)
-                       : Module(Me)
+                       : Module(Me), cmd(this), ho(Me, 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()
@@ -164,7 +164,7 @@ class ModuleHelpop : public Module
                }
 
 
-               virtual void OnRehash(User* user, const std::string &parameter)
+               virtual void OnRehash(User* user)
                {
                        ReadConfig();
                }
@@ -179,8 +179,7 @@ class ModuleHelpop : public Module
 
                virtual ~ModuleHelpop()
                {
-                       ServerInstance->Modes->DelMode(ho);
-                       delete ho;
+                       ServerInstance->Modes->DelMode(&ho);
                }
 
                virtual Version GetVersion()