Annotations

[user/henk/code/inspircd.git] / src / modules / m_swhois.cpp

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 23001d203959b814f32879fea05c830f0f48e63a..4b62db699ad680c399c980cce1abff04d2b2f765 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */
@@ -28,13 +28,13 @@ class cmd_swhois : public command_t
 {
        
  public:
- cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
+       cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
        {
                this->source = "m_swhois.so";
                syntax = "<nick> <swhois>";
        }
 
-       void Handle(const char** parameters, int pcnt, userrec* user)
+       CmdResult Handle(const char** parameters, int pcnt, userrec* user)
        {
                userrec* dest = ServerInstance->FindNick(parameters[0]);
                if(dest)
@@ -55,14 +55,14 @@ class cmd_swhois : public command_t
                        {
                                // We already had it set...
                                
-                               if (!ServerInstance->IsUlined(user->server))
+                               if (!ServerInstance->ULine(user->server))
                                        // Ulines set SWHOISes silently
                                        ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
                                
                                dest->Shrink("swhois");
                                DELETE(text);
                        }
-                       else if(!ServerInstance->IsUlined(user->server))
+                       else if(!ServerInstance->ULine(user->server))
                        {
                                // Ulines set SWHOISes silently
                                ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
@@ -70,7 +70,11 @@ class cmd_swhois : public command_t
                        
                        text = new std::string(line);
                        dest->Extend("swhois", text);
+
+                       return CMD_SUCCESS;
                }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -84,7 +88,7 @@ class ModuleSWhois : public Module
        ModuleSWhois(InspIRCd* Me) : Module::Module(Me)
        {
                
-               Conf = new ConfigReader();
+               Conf = new ConfigReader(ServerInstance);
                mycommand = new cmd_swhois(ServerInstance);
                ServerInstance->AddCommand(mycommand);
        }
@@ -92,7 +96,7 @@ class ModuleSWhois : public Module
        void OnRehash(const std::string &parameter)
        {
                DELETE(Conf);
-               Conf = new ConfigReader();
+               Conf = new ConfigReader(ServerInstance);
        }
 
        void Implements(char* List)