there were two.. yes, you're right Special

[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..2ad7831ce90f0f5aba9e3a1b6d32c9b362b92f39 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,76 +2,73 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 
-static Server *Srv;
 static FileReader *quotes = NULL;
 
-std::string q_file = "";
-std::string prefix = "";
-std::string suffix = "";
+std::string q_file;
+std::string prefix;
+std::string suffix;
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
+/** Handle /RANDQUOTE
+ */
 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;
-               char buf[MAXBUF];
-               if (q_file == "" || quotes->Exists())
+
+               if (q_file.empty() || 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());
-                       Srv->SendServ(user->fd, 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);
-                       Srv->SendServ(user->fd, 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_LOCALONLY;
        }
 };
 
+/** 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();
        }
 };
 
@@ -81,11 +78,11 @@ class ModuleRandQuote : public Module
        cmd_randquote* mycommand;
        ConfigReader *conf;
  public:
-       ModuleRandQuote(Server* Me)
-               : Module::Module(Me)
+       ModuleRandQuote(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = Me;
-               conf = new ConfigReader;
+               
+               conf = new ConfigReader(ServerInstance);
                // Sort the Randomizer thingie..
                srand(time(NULL));
 
@@ -95,13 +92,13 @@ class ModuleRandQuote : public Module
 
                mycommand = NULL;
 
-               if (q_file == "")
+               if (q_file.empty())
                {
                        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 +107,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,13 +119,13 @@ class ModuleRandQuote : public Module
        
        virtual ~ModuleRandQuote()
        {
-               delete conf;
-               delete quotes;
+               DELETE(conf);
+               DELETE(quotes);
        }
        
        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)
@@ -138,27 +135,4 @@ class ModuleRandQuote : public Module
        }
 };
 
-
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-       ModuleRandQuoteFactory()
-       {
-       }
-       
-       ~ModuleRandQuoteFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleRandQuote(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRandQuoteFactory;
-}
+MODULE_INIT(ModuleRandQuote)