Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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..35fb02085c30e9e240418e94104154149b6cd44e 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"
 
 
@@ -31,45 +31,50 @@ std::string suffix = "";
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
+/** Handle /RANDQUOTE
+ */
 class cmd_randquote : public command_t
 {
  public:
- cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
+       cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
        {
                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;
-               char buf[MAXBUF];
+
                if (q_file == "" || quotes->Exists())
                {
                        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());
-                       user->WriteServ(std::string(buf));
+                       user->WriteServ("NOTICE %s :%s%s%s",user->nick,prefix.c_str(),str.c_str(),suffix.c_str());
                }
                else
                {
-                       sprintf(buf, "NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
-                       user->WriteServ(std::string(buf));
+                       user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
+                       return CMD_FAILURE;
                }
-               return;
+               return CMD_SUCCESS;
        }
 };
 
+/** Thrown by m_randquote
+ */
 class RandquoteException : public ModuleException
 {
  private:
-       std::string err;
+       const std::string err;
  public:
-       RandquoteException(std::string message) : err(message) { }
+       RandquoteException(const std::string &message) : err(message) { }
+
+       ~RandquoteException() throw () { }
 
        virtual const char* GetReason()
        {
-               return (char*)err.c_str();
+               return err.c_str();
        }
 };
 
@@ -83,7 +88,7 @@ class ModuleRandQuote : public Module
                : Module::Module(Me)
        {
                
-               conf = new ConfigReader;
+               conf = new ConfigReader(ServerInstance);
                // Sort the Randomizer thingie..
                srand(time(NULL));
 
@@ -99,7 +104,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.");
@@ -126,7 +131,7 @@ class ModuleRandQuote : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
        virtual void OnUserConnect(userrec* user)