DOH! Fix my muppetry of a segfault, and fix some warnings

[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 eda4de2bcb3ecb990af420c69a8ccd860a865c77..02572e7de437e6e0e4bbb2d524c8b87db03c6d52 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,129 +2,115 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 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.
  *
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
-Server *Srv;
-FileReader *quotes;
+static FileReader *quotes = NULL;
 
 std::string q_file;
 std::string prefix;
 std::string suffix;
 
-
-
 /* $ModDesc: Provides random Quotes on Connect. */
 
-void handle_randquote(char** parameters, int pcntl, userrec *user)
+/** Handle /RANDQUOTE
+ */
+class CommandRandquote : public Command
 {
-       std::string str;
-       int fsize;
-       char buf[MAXBUF];
-
-       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);
-       return;
-}
+ public:
+       CommandRandquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
+       {
+               this->source = "m_randquote.so";
+       }
 
+       CmdResult Handle (const char* const* parameters, int pcntl, User *user)
+       {
+               std::string str;
+               int fsize;
 
+               if (q_file.empty() || quotes->Exists())
+               {
+                       fsize = quotes->FileSize();
+                       str = quotes->GetLine(rand() % fsize);
+                       user->WriteServ("NOTICE %s :%s%s%s",user->nick,prefix.c_str(),str.c_str(),suffix.c_str());
+               }
+               else
+               {
+                       user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
+                       return CMD_FAILURE;
+               }
 
+               return CMD_LOCALONLY;
+       }
+};
 
 class ModuleRandQuote : public Module
 {
  private:
-
+       CommandRandquote* mycommand;
        ConfigReader *conf;
  public:
-       ModuleRandQuote()
+       ModuleRandQuote(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = new Server;
-               conf = new ConfigReader;
+               
+               conf = new ConfigReader(ServerInstance);
                // Sort the Randomizer thingie..
                srand(time(NULL));
 
-
                q_file = conf->ReadValue("randquote","file",0);
                prefix = conf->ReadValue("randquote","prefix",0);
                suffix = conf->ReadValue("randquote","suffix",0);
 
-               if (q_file == "") {
-                       printf("m_randquote: Quotefile not specified.. Please check your config.\n\n");
-                       exit(0);
-                }
+               mycommand = NULL;
 
+               if (q_file.empty())
+               {
+                       CoreException 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())
                {
-                       printf("m_randquote: QuoteFile not Found!! Please check your config.\n\n");
-                       exit(0);
+                       CoreException e("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
+                       throw(e);
                }
-               /* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-               Srv->AddCommand("QUOTE",handle_randquote,0,0,"m_randquote.so");
+               else
+               {
+                       /* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
+                       mycommand = new CommandRandquote(ServerInstance);
+                       ServerInstance->AddCommand(mycommand);
+               }
+               Implementation eventlist[] = { I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
+
        
        virtual ~ModuleRandQuote()
        {
-               delete Srv;
                delete conf;
                delete quotes;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
        
-       virtual void OnUserConnect(userrec* user)
+       virtual void OnUserConnect(User* user)
        {
-               // Make a fake pointer to be passed to handle_randquote()
-               // Dont try this at home kiddies :D
-               char *rar = "RAR";
-               handle_randquote(&rar, 0, user);
+               if (mycommand)
+                       mycommand->Handle(NULL, 0, user);
        }
 };
 
-
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-       ModuleRandQuoteFactory()
-       {
-       }
-       
-       ~ModuleRandQuoteFactory()
-       {
-       }
-       
-       virtual Module * CreateModule()
-       {
-               return new ModuleRandQuote;
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRandQuoteFactory;
-}
+MODULE_INIT(ModuleRandQuote)