Annotations

[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 fa3f4eed92d007f737a24e3f0bdbf32a3cb93f7b..330a5d60ed55d566ab3f92e1c8914a0fbc2d4e3c 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -19,19 +19,18 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 // Global Vars
 static ConfigReader *helpop;
 
-extern InspIRCd* ServerInstance;
-
 bool do_helpop(const char**, int, userrec*);
 void sendtohelpop(userrec*, int, const char**);
 
 /* $ModDesc: /helpop Command, Works like Unreal helpop */
 
+/** Handles user mode +h
+ */
 class Helpop : public ModeHandler
 {
  public:
@@ -60,27 +59,29 @@ class Helpop : public ModeHandler
        }
 };
 
+/** Handles /HELPOP
+ */
 class cmd_helpop : public command_t
 {
  public:
-        cmd_helpop () : command_t("HELPOP",0,1)
+        cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 1)
         {
                 this->source = "m_helpop.so";
                 syntax = "[?|!]<any-text>";
         }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                char a[MAXBUF];
                std::string output = " ";
 
                if (!helpop)
-                       return;
+                       return CMD_FAILURE;
 
                if (pcnt < 1)
                {
                        do_helpop(NULL,pcnt,user);
-                       return;
+                       return CMD_SUCCESS;
                }
 
                if (*parameters[0] == '!')
@@ -126,62 +127,64 @@ class cmd_helpop : public command_t
                                sendtohelpop(user, pcnt, parameters);
                        }
                }
-       }
-};
 
+               return CMD_SUCCESS;
+       }
 
-bool do_helpop(const char** parameters, int pcnt, userrec *src)
-{
-       char search[MAXBUF];
-       std::string output = " "; // a fix bought to you by brain :p
-       char a[MAXBUF];
-       int nlines = 0;
 
-       if (!pcnt)
-       {
-               strcpy(search,"start");
-       }
-       else
+       bool do_helpop(const char** parameters, int pcnt, userrec *src)
        {
-               if (*parameters[0] == '?')
-                       parameters[0]++;
-               strlcpy(search,parameters[0],MAXBUF);
-       }
+               char search[MAXBUF];
+               std::string output = " "; // a fix bought to you by brain :p
+               char a[MAXBUF];
+               int nlines = 0;
 
-       for (char* n = search; *n; n++)
-               *n = tolower(*n);
+               if (!pcnt)
+               {
+                       strcpy(search,"start");
+               }
+               else
+               {
+                       if (*parameters[0] == '?')
+                               parameters[0]++;
+                       strlcpy(search,parameters[0],MAXBUF);
+               }
 
-       for (int i = 1; output != ""; i++)
-       {
-               snprintf(a,MAXBUF,"line%d",i);
-               output = helpop->ReadValue(search, a, 0);
-               if (output != "")
+               for (char* n = search; *n; n++)
+                       *n = tolower(*n);
+
+               for (int i = 1; output != ""; i++)
                {
-                       src->WriteServ("290 "+std::string(src->nick)+" :"+output);
-                       nlines++;
+                       snprintf(a,MAXBUF,"line%d",i);
+                       output = helpop->ReadValue(search, a, 0);
+                       if (output != "")
+                       {
+                               src->WriteServ("290 "+std::string(src->nick)+" :"+output);
+                               nlines++;
+                       }
                }
+               return (nlines>0);
        }
-       return (nlines>0);
-}
-
 
-
-void sendtohelpop(userrec *src, int pcnt, const char **params)
-{
-       const char* first = params[0];
-       if (*first == '!')
+       void sendtohelpop(userrec *src, int pcnt, const char **params)
        {
-               first++;
-       }
+               const char* first = params[0];
+               if (*first == '!')
+               {
+                       first++;
+               }
 
-       std::string line = "*** HELPOPS - From "+std::string(src->nick)+": "+std::string(first)+" ";
-       for (int i = 1; i < pcnt; i++)
-       {
-               line = line + std::string(params[i]) + " ";
+               std::string line = "*** HELPOPS - From "+std::string(src->nick)+": "+std::string(first)+" ";
+               for (int i = 1; i < pcnt; i++)
+               {
+                       line = line + std::string(params[i]) + " ";
+               }
+               ServerInstance->WriteMode("oh",WM_AND,line.c_str());
        }
-       ServerInstance->WriteMode("oh",WM_AND,line.c_str());
-}
+};
 
+/** Thrown by m_helpop
+ */
 class HelpopException : public ModuleException
 {
  private:
@@ -206,13 +209,13 @@ class ModuleHelpop : public Module
                        ReadConfig();
                        ho = new Helpop(ServerInstance);
                        ServerInstance->AddMode(ho, 'h');
-                       mycommand = new cmd_helpop();
+                       mycommand = new cmd_helpop(ServerInstance);
                        ServerInstance->AddCommand(mycommand);
                }
 
                virtual void ReadConfig()
                {
-                       conf = new ConfigReader;
+                       conf = new ConfigReader(ServerInstance);
                        h_file = conf->ReadValue("helpop", "file", 0);
 
                        if (h_file == "")
@@ -222,7 +225,7 @@ class ModuleHelpop : public Module
                                throw(e);
                        }
 
-                       helpop = new ConfigReader(h_file);
+                       helpop = new ConfigReader(ServerInstance, h_file);
                        if ((helpop->ReadValue("nohelp",  "line1", 0) == "") ||
                                (helpop->ReadValue("nohelpo", "line1", 0) == "") ||
                                (helpop->ReadValue("start",   "line1", 0) == ""))
@@ -256,6 +259,7 @@ class ModuleHelpop : public Module
 
                virtual ~ModuleHelpop()
                {
+                       ServerInstance->Modes->DelMode(ho);
                        DELETE(conf);
                        DELETE(helpop);
                        DELETE(ho);
@@ -263,7 +267,7 @@ class ModuleHelpop : public Module
        
                virtual Version GetVersion()
                {
-                       return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+                       return Version(1,0,0,1,VF_COMMON|VF_VENDOR);
                }
 };