Change /HELPOP => /HELP to be sensible and match every other ircd

[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 c1b669d3f5651ae23fd437cba60bf0608d205089..b36bf2e803e17450d518592d11428d04ae0ce26d 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -22,7 +22,7 @@ static std::map<irc::string, std::string> helpop_map;
 class Helpop : public ModeHandler
 {
  public:
-       Helpop(Module* Creator) : ModeHandler(Creator, 'h', PARAM_NONE, MODETYPE_USER)
+       Helpop(Module* Creator) : ModeHandler(Creator, "helpop", 'h', PARAM_NONE, MODETYPE_USER)
        {
                oper = true;
        }
@@ -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;
        }
 };
 
@@ -137,10 +133,13 @@ class ModuleHelpop : public Module
 
                        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 +152,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 +182,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 | VF_COMMON);
                }
 };