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 510e4e899f793a55a5a8f994226f2441b7ad9c3b..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,17 +52,19 @@ 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];
+       {
+               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);
@@ -90,10 +89,8 @@ 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);
                }
@@ -114,7 +111,7 @@ class ModuleHelpop : public Module
 
        public:
                ModuleHelpop(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
                        ReadConfig();
                        ho = new Helpop(ServerInstance);
@@ -161,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();
                }
@@ -186,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)