Fix test client error cheecking on result types

[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 fce9489b20d78dda28f612d9478e1ec69ef3cc91..c1457765d4e6c487eaf60bc064002e7fbe692ab6 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -25,21 +25,48 @@ using namespace std;
 static ConfigReader *helpop;
 static Server *Srv;
 
-void handle_helpop(char**, int, userrec*);
-bool do_helpop(char**, int, userrec*);
-void sendtohelpop(userrec*, int, char**);
+bool do_helpop(const char**, int, userrec*);
+void sendtohelpop(userrec*, int, const char**);
 
 /* $ModDesc: /helpop Command, Works like Unreal helpop */
 
+class Helpop : public ModeHandler
+{
+ public:
+       Helpop() : ModeHandler('h', 0, 0, false, MODETYPE_USER, true) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               if (adding)
+               {
+                       if (!dest->IsModeSet('h'))
+                       {
+                               dest->SetMode('h',true);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else
+               {
+                       if (dest->IsModeSet('h'))
+                       {
+                               dest->SetMode('h',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_DENY;
+       }
+};
+
 class cmd_helpop : public command_t
 {
  public:
-        cmd_helpop () : command_t("HELPOP",0,0)
+        cmd_helpop () : command_t("HELPOP",0,1)
         {
                 this->source = "m_helpop.so";
         }
 
-       void Handle (char **parameters, int pcnt, userrec *user)
+       void Handle (const char** parameters, int pcnt, userrec *user)
        {
                char a[MAXBUF];
                std::string output = " ";
@@ -53,12 +80,12 @@ class cmd_helpop : public command_t
                        return;
                }
 
-               if (parameters[0][0] == '!')
+               if (*parameters[0] == '!')
                {
                        // Force send to all +h users
                        sendtohelpop(user, pcnt, parameters);
                }
-               else if (parameters[0][0] == '?')
+               else if (*parameters[0] == '?')
                {
                        // Force to the helpop system with no forward if not found.
                        if (do_helpop(parameters, pcnt, user) == false)
@@ -100,26 +127,22 @@ class cmd_helpop : public command_t
 };
 
 
-bool do_helpop(char **parameters, int pcnt, userrec *src)
+bool do_helpop(const char** parameters, int pcnt, userrec *src)
 {
-       char *search;
+       char search[MAXBUF];
        std::string output = " "; // a fix bought to you by brain :p
        char a[MAXBUF];
-       char lower[MAXBUF];
        int nlines = 0;
 
-       if (!parameters)
+       if (!pcnt)
        {
-               search = "start";
+               strcpy(search,"start");
        }
        else
        {
-               search = parameters[0];
-       }
-
-       if (search[0] == '?')
-       {
-               search++;
+               if (*parameters[0] == '?')
+                       parameters[0]++;
+               strlcpy(search,parameters[0],MAXBUF);
        }
 
        strlower(search);
@@ -139,9 +162,9 @@ bool do_helpop(char **parameters, int pcnt, userrec *src)
 
 
 
-void sendtohelpop(userrec *src, int pcnt, char **params)
+void sendtohelpop(userrec *src, int pcnt, const char **params)
 {
-       char* first = params[0];
+       const char* first = params[0];
        if (*first == '!')
        {
                first++;
@@ -161,7 +184,7 @@ class HelpopException : public ModuleException
        std::string err;
  public:
        HelpopException(std::string message) : err(message) { }
-       virtual char* GetReason() { return (char*)err.c_str(); }
+       virtual const char* GetReason() { return err.c_str(); }
 };
 
 class ModuleHelpop : public Module
@@ -170,6 +193,7 @@ class ModuleHelpop : public Module
                ConfigReader *conf;
                std::string  h_file;
                cmd_helpop* mycommand;
+               Helpop* ho;
 
        public:
                ModuleHelpop(Server* Me)
@@ -178,12 +202,8 @@ class ModuleHelpop : public Module
                        Srv  = Me;
 
                        ReadConfig();
-                       if (!Srv->AddExtendedMode('h',MT_CLIENT,true,0,0))
-                       {
-                               Srv->Log(DEFAULT,"Unable to claim the +h usermode.");
-                               return;
-                       }
-
+                       ho = new Helpop();
+                       Srv->AddMode(ho, 'h');
                        mycommand = new cmd_helpop();
                        Srv->AddCommand(mycommand);
                }
@@ -212,30 +232,21 @@ class ModuleHelpop : public Module
 
                void Implements(char* List)
                {
-                       List[I_OnRehash] = List[I_OnExtendedMode] = List[I_OnWhois] = 1;
+                       List[I_OnRehash] = List[I_OnWhois] = 1;
                }
 
-               virtual void OnRehash(std::string parameter)
+               virtual void OnRehash(const std::string &parameter)
                {
-                       delete conf;
+                       DELETE(conf);
                        if (helpop)
-                               delete helpop;
+                               DELETE(helpop);
 
                        ReadConfig();
                }
 
-               virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-               {
-                       if ((modechar == 'h') && (type == MT_CLIENT))
-                       {
-                               return 1;
-                       }
-                       return 0;
-               }
-
                virtual void OnWhois(userrec* src, userrec* dst)
                {
-                       if (strchr(dst->modes,'h'))
+                       if (dst->IsModeSet('h'))
                        {
                                Srv->SendTo(NULL,src,"310 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is available for help.");
                        }
@@ -243,8 +254,9 @@ class ModuleHelpop : public Module
 
                virtual ~ModuleHelpop()
                {
-                       delete conf;
-                       delete helpop;
+                       DELETE(conf);
+                       DELETE(helpop);
+                       DELETE(ho);
                }
        
                virtual Version GetVersion()