Eliminate duplicate names between user and channel modes

[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 716b9bfb7e41078df815fac9a1a1dea1163d874d..5cd8d8ea0701f1845a3ccdc4a4b100f2f75603dd 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -55,7 +55,7 @@ class Helpop : public ModeHandler
 class CommandHelpop : public Command
 {
  public:
-       CommandHelpop(Module* Creator) : Command(Creator, "HELPOP", 0)
+       CommandHelpop(Module* Creator) : Command(Creator, "HELP", 0)
        {
                syntax = "<any-text>";
        }
@@ -104,11 +104,7 @@ class CommandHelpop : public Command
                        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
-                * to make sure the protocol module thinks theyre not worth sending.
-                */
-               return CMD_FAILURE;
+               return CMD_SUCCESS;
        }
 };
 
@@ -122,25 +118,31 @@ class ModuleHelpop : public Module
        public:
                ModuleHelpop()
                        : cmd(this), ho(this)
+               {
+               }
+
+               void init()
                {
                        ReadConfig();
-                       if (!ServerInstance->Modes->AddMode(&ho))
-                               throw ModuleException("Could not add new modes!");
-                       ServerInstance->AddCommand(&cmd);
+                       ServerInstance->Modules->AddService(ho);
+                       ServerInstance->Modules->AddService(cmd);
                        Implementation eventlist[] = { I_OnRehash, I_OnWhois };
                        ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
-               virtual void ReadConfig()
+               void ReadConfig()
                {
                        ConfigReader MyConf;
 
                        helpop_map.clear();
 
-                       for (int i = 0; i < MyConf.Enumerate("helpop"); i++)
+                       ConfigTagList tags = ServerInstance->Config->ConfTags("helpop");
+                       for(ConfigIter i = tags.first; i != tags.second; ++i)
                        {
-                               irc::string key = assign(MyConf.ReadValue("helpop", "key", i));
-                               std::string value = MyConf.ReadValue("helpop", "value", i, true); /* Linefeeds allowed! */
+                               ConfigTag* tag = i->second;
+                               irc::string key = assign(tag->getString("key"));
+                               std::string value;
+                               tag->readString("value", value, true); /* Linefeeds allowed */
 
                                if (key == "index")
                                {
@@ -153,12 +155,12 @@ class ModuleHelpop : public Module
                        if (helpop_map.find("start") == helpop_map.end())
                        {
                                // error!
-                               throw ModuleException("m_helpop: Helpop file is missing important entries. Please check the example conf.");
+                               throw ModuleException("m_helpop: Helpop file is missing important entry 'start'. Please check the example conf.");
                        }
                        else if (helpop_map.find("nohelp") == helpop_map.end())
                        {
                                // error!
-                               throw ModuleException("m_helpop: Helpop file is missing important entries. Please check the example conf.");
+                               throw ModuleException("m_helpop: Helpop file is missing important entry 'nohelp'. Please check the example conf.");
                        }
 
                }
@@ -183,7 +185,7 @@ class ModuleHelpop : public Module
 
                virtual Version GetVersion()
                {
-                       return Version("/helpop Command, Works like Unreal helpop", VF_COMMON | VF_VENDOR, API_VERSION);
+                       return Version("/helpop Command, Works like Unreal helpop", VF_VENDOR);
                }
 };