Convert more modules

[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 f501676c3070a55dc2c70d17446dc06334bb0c95..d25e2c0bdda3a081cd53f78f5adef35dfee6b0f0 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: /helpop Command, Works like Unreal helpop */
 static std::map<irc::string, std::string> helpop_map;
@@ -55,17 +55,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);
@@ -114,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);
                }
@@ -160,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();
                }
@@ -203,7 +206,7 @@ class ModuleHelpopFactory : public ModuleFactory
        
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleHelpopFactory;
 }