Annotations

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

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 430adf9ef16c8d40c37eabea27f31a7cbe4fac52..46af34f63ab56149e3b0a8ea7736c785c74ec5e8 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -16,15 +16,13 @@
 
 using namespace std;
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 
-static Server *Srv;
+#include "inspircd.h"
+
+
 static FileReader *quotes = NULL;
 
 std::string q_file = "";
@@ -36,12 +34,12 @@ std::string suffix = "";
 class cmd_randquote : public command_t
 {
  public:
-       cmd_randquote () : command_t("RANDQUOTE", 0, 0)
+ cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
        {
                this->source = "m_randquote.so";
        }
 
-       void Handle (char** parameters, int pcntl, userrec *user)
+       CmdResult Handle (const char** parameters, int pcntl, userrec *user)
        {
                std::string str;
                int fsize;
@@ -51,14 +49,15 @@ class cmd_randquote : public command_t
                        fsize = quotes->FileSize();
                        str = quotes->GetLine(rand() % fsize);
                        sprintf(buf,"NOTICE %s :%s%s%s",user->nick,prefix.c_str(),str.c_str(),suffix.c_str());
-                       Srv->SendServ(user->fd, buf);
+                       user->WriteServ(std::string(buf));
                }
                else
                {
                        sprintf(buf, "NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
-                       Srv->SendServ(user->fd, buf);
+                       user->WriteServ(std::string(buf));
+                       return CMD_FAILURE;
                }
-               return;
+               return CMD_SUCCESS;
        }
 };
 
@@ -81,11 +80,11 @@ class ModuleRandQuote : public Module
        cmd_randquote* mycommand;
        ConfigReader *conf;
  public:
-       ModuleRandQuote(Server* Me)
+       ModuleRandQuote(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               conf = new ConfigReader;
+               
+               conf = new ConfigReader(ServerInstance);
                // Sort the Randomizer thingie..
                srand(time(NULL));
 
@@ -99,9 +98,9 @@ class ModuleRandQuote : public Module
                {
                        RandquoteException e("m_randquote: Quotefile not specified - Please check your config.");
                        throw(e);
-                }
+               }
 
-               quotes = new FileReader(q_file);
+               quotes = new FileReader(ServerInstance, q_file);
                if(!quotes->Exists())
                {
                        RandquoteException e("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
@@ -110,8 +109,8 @@ class ModuleRandQuote : public Module
                else
                {
                        /* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-                       mycommand = new cmd_randquote();
-                       Srv->AddCommand(mycommand);
+                       mycommand = new cmd_randquote(ServerInstance);
+                       ServerInstance->AddCommand(mycommand);
                }
        }
 
@@ -122,8 +121,8 @@ class ModuleRandQuote : public Module
        
        virtual ~ModuleRandQuote()
        {
-               delete conf;
-               delete quotes;
+               DELETE(conf);
+               DELETE(quotes);
        }
        
        virtual Version GetVersion()
@@ -150,7 +149,7 @@ class ModuleRandQuoteFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleRandQuote(Me);
        }