Windows support. Tested and working to compile on freebsd and linux. Next step is...

[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 cc78c3257bd5d622e391c52b02a208576662fb67..5a02f2bf08291d84626de06fb67d1a2d84554e0a 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -55,28 +55,32 @@ class Helpop : public ModeHandler
 class cmd_helpop : public command_t
 {
  public:
-        cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 1)
-        {
-                this->source = "m_helpop.so";
-                syntax = "<any-text>";
-        }
+       cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 0)
+       {
+               this->source = "m_helpop.so";
+               syntax = "<any-text>";
+       }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
-       {               
-               irc::string parameter = parameters[0];
-
-               user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick, parameters[0]);
+       {
+               irc::string parameter;
+               if (pcnt > 0)
+                       parameter = parameters[0];
 
-               if (parameter == "index")
+               if (pcnt == 0 || parameter == "index")
                {
                        /* iterate over all helpop items */
+                       user->WriteServ("NOTICE %s :HELPOP topic index", user->nick);
                        for (std::map<irc::string, std::string>::iterator iter = helpop_map.begin(); iter != helpop_map.end(); iter++)
                        {
-                               user->WriteServ("NOTICE %s :HELPOP KEY: %s", user->nick, iter->first.c_str());                          
+                               user->WriteServ("NOTICE %s :    %s", user->nick, iter->first.c_str());                          
                        }
+                       user->WriteServ("NOTICE %s :*** End of HELPOP topic index", user->nick);
                }
                else
                {
+                       user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick, parameters[0]);
+
                        std::map<irc::string, std::string>::iterator iter = helpop_map.find(parameter);
 
                        if (iter == helpop_map.end())
@@ -92,25 +96,17 @@ class cmd_helpop : public command_t
                        {
                                user->WriteServ("NOTICE %s :%s", user->nick, token.c_str());
                        }
+
+                       user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick);
                }
 
-               user->WriteServ("NOTICE %s :*** HELPOP End", user->nick);
-               return CMD_SUCCESS;
+               /* 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;
        }
 };
 
-/** Thrown by m_helpop
- */
-class HelpopException : public ModuleException
-{
- private:
-       std::string err;
- public:
-       HelpopException(std::string message) : err(message) { }
-       ~HelpopException() throw() { };
-       virtual const char* GetReason() { return err.c_str(); }
-};
-
 class ModuleHelpop : public Module
 {
        private:
@@ -120,11 +116,12 @@ class ModuleHelpop : public Module
 
        public:
                ModuleHelpop(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
                        ReadConfig();
                        ho = new Helpop(ServerInstance);
-                       ServerInstance->AddMode(ho, 'h');
+                       if (!ServerInstance->AddMode(ho, 'h'))
+                               throw ModuleException("Could not add new modes!");
                        mycommand = new cmd_helpop(ServerInstance);
                        ServerInstance->AddCommand(mycommand);
                }
@@ -138,12 +135,11 @@ class ModuleHelpop : public Module
                        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);
+                               std::string value = MyConf->ReadValue("helpop", "value", i, true); /* Linefeeds allowed! */
 
                                if (key == "index")
                                {
-                                       HelpopException e("m_helpop: The key 'index' is reserved for internal purposes. Please remove it.");
-                                       throw(e);
+                                       throw ModuleException("m_helpop: The key 'index' is reserved for internal purposes. Please remove it.");
                                }
 
                                helpop_map[key] = value;
@@ -152,14 +148,12 @@ class ModuleHelpop : public Module
                        if (helpop_map.find("start") == helpop_map.end())
                        {
                                // error!
-                               HelpopException e("m_helpop: Helpop file is missing important entries. Please check the example conf.");
-                               throw(e);
+                               throw ModuleException("m_helpop: Helpop file is missing important entries. Please check the example conf.");
                        }
                        else if (helpop_map.find("nohelp") == helpop_map.end())
                        {
                                // error!
-                               HelpopException e("m_helpop: Helpop file is missing important entries. Please check the example conf.");
-                               throw(e);
+                               throw ModuleException("m_helpop: Helpop file is missing important entries. Please check the example conf.");
                        }
 
                }
@@ -169,7 +163,7 @@ class ModuleHelpop : public Module
                        List[I_OnRehash] = List[I_OnWhois] = 1;
                }
 
-               virtual void OnRehash(const std::string &parameter)
+               virtual void OnRehash(userrec* user, const std::string &parameter)
                {
                        ReadConfig();
                }
@@ -212,7 +206,7 @@ class ModuleHelpopFactory : public ModuleFactory
        
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleHelpopFactory;
 }