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 c1353ef09a1cae06dc764298ac589e47b0bef57d..46af34f63ab56149e3b0a8ea7736c785c74ec5e8 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 
@@ -39,7 +39,7 @@ class cmd_randquote : public command_t
                this->source = "m_randquote.so";
        }
 
-       void Handle (const char** parameters, int pcntl, userrec *user)
+       CmdResult Handle (const char** parameters, int pcntl, userrec *user)
        {
                std::string str;
                int fsize;
@@ -55,8 +55,9 @@ class cmd_randquote : public command_t
                {
                        sprintf(buf, "NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
                        user->WriteServ(std::string(buf));
+                       return CMD_FAILURE;
                }
-               return;
+               return CMD_SUCCESS;
        }
 };
 
@@ -83,7 +84,7 @@ class ModuleRandQuote : public Module
                : Module::Module(Me)
        {
                
-               conf = new ConfigReader;
+               conf = new ConfigReader(ServerInstance);
                // Sort the Randomizer thingie..
                srand(time(NULL));
 
@@ -99,7 +100,7 @@ class ModuleRandQuote : public Module
                        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.");