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 88856c1f07f599bab96da4e63ab7f1593c5a388e..4b62db699ad680c399c980cce1abff04d2b2f765 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -17,24 +17,26 @@
 #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 */
 
+
+
 class cmd_swhois : public command_t
 {
-       Server* Srv;
+       
  public:
-       cmd_swhois(Server* server) : command_t("SWHOIS",'o',2)
+       cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
        {
-               this->Srv = server;
                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 = Srv->FindNick(std::string(parameters[0]));
+               userrec* dest = ServerInstance->FindNick(parameters[0]);
                if(dest)
                {
                        std::string line;
@@ -53,44 +55,48 @@ class cmd_swhois : public command_t
                        {
                                // We already had it set...
                                
-                               if (!Srv->IsUlined(user->server))
+                               if (!ServerInstance->ULine(user->server))
                                        // Ulines set SWHOISes silently
-                                       WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
+                                       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(!Srv->IsUlined(user->server))
+                       else if(!ServerInstance->ULine(user->server))
                        {
                                // Ulines set SWHOISes silently
-                               WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
+                               ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
                        }
                        
                        text = new std::string(line);
                        dest->Extend("swhois", text);
+
+                       return CMD_SUCCESS;
                }
+
+               return CMD_FAILURE;
        }
 };
 
 class ModuleSWhois : public Module
 {
        cmd_swhois* mycommand;
-       Server* Srv;
+       
        ConfigReader* Conf;
        
  public:
-       ModuleSWhois(Server* Me) : Module::Module(Me)
+       ModuleSWhois(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               Conf = new ConfigReader();
-               mycommand = new cmd_swhois(Srv);
-               Srv->AddCommand(mycommand);
+               
+               Conf = new ConfigReader(ServerInstance);
+               mycommand = new cmd_swhois(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
 
        void OnRehash(const std::string &parameter)
        {
                DELETE(Conf);
-               Conf = new ConfigReader();
+               Conf = new ConfigReader(ServerInstance);
        }
 
        void Implements(char* List)
@@ -233,7 +239,7 @@ class ModuleSWhoisFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSWhois(Me);
        }