Remove unneeded headers from spanningtree. This was done to the rest of the source...

[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 8e7c4f0f1469e89fc50fe745c74ffdcdad3cfaaf..b25ed7089dd79331aa95b99a014d66b9d690a027 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: /helpop Command, Works like Unreal helpop */
@@ -55,28 +52,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())
@@ -88,14 +89,16 @@ class cmd_helpop : public command_t
                        irc::sepstream stream(value, '\n');
                        std::string token = "*";
 
-                       while ((token = stream.GetToken()) != "")
-                       {
+                       while (stream.GetToken(token))
                                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;
        }
 };
 
@@ -108,11 +111,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);
                }
@@ -126,7 +130,7 @@ 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")
                                {
@@ -154,7 +158,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();
                }
@@ -179,25 +183,4 @@ class ModuleHelpop : public Module
                }
 };
 
-class ModuleHelpopFactory : public ModuleFactory
-{
- public:
-       ModuleHelpopFactory()
-       {
-       }
-       
-       ~ModuleHelpopFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleHelpop(Me);
-       }
-       
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleHelpopFactory;
-}
+MODULE_INIT(ModuleHelpop)