Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[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 be49841327f6d6b4ad8855b9f994bc0e33f0d2fa..668eea0e5cc0e8a2d1ae8fa83b247b3150c23b9a 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,94 +1,101 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2003, 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2005 Craig McLure <craig@chatspike.net>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
+/* $ModDesc: Provides random quotes on connect. */
 
-/* $ModDesc: Provides random Quotes on Connect. */
+#include "inspircd.h"
 
-class ModuleRandQuote : public Module
+static FileReader *quotes = NULL;
+
+std::string prefix;
+std::string suffix;
+
+/** Handle /RANDQUOTE
+ */
+class CommandRandquote : public Command
 {
- private:
+ public:
+       CommandRandquote(Module* Creator) : Command(Creator,"RANDQUOTE", 0)
+       {
+       }
+
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       {
+               int fsize = quotes->FileSize();
+               if (fsize)
+               {
+                       std::string str = quotes->GetLine(ServerInstance->GenRandomInt(fsize));
+                       if (!str.empty())
+                               user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),prefix.c_str(),str.c_str(),suffix.c_str());
+               }
 
-        Server *Srv;
-        ConfigReader *conf;
-        FileReader *quotes;
+               return CMD_SUCCESS;
+       }
+};
 
-        std::string q_file;
-        std::string prefix;
-        std::string suffix;
-        
+class ModuleRandQuote : public Module
+{
+ private:
+       CommandRandquote cmd;
  public:
        ModuleRandQuote()
+               : cmd(this)
        {
-               Srv = new Server;
-               conf = new ConfigReader;
+       }
 
-               if (conf->ReadValue("randquote","file",0) == '') {
-                       log(DEBUG,"m_randquote: startup: File Not Specified!, bailing!");
-                       return (ERROR);
-               }
+       void init()
+       {
+               ConfigTag* conf = ServerInstance->Config->ConfValue("randquote");
 
-               q_file = conf->ReadValue("randquote","file",0);
-               prefix = conf->ReadValue("randquote","prefix",0);
-               suffix = conf->ReadValue("randquote","suffix",0);
+               std::string q_file = conf->getString("file","quotes");
+               prefix = conf->getString("prefix");
+               suffix = conf->getString("suffix");
 
                quotes = new FileReader(q_file);
+               if (!quotes->Exists())
+               {
+                       throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
+               }
+               ServerInstance->Modules->AddService(cmd);
+               Implementation eventlist[] = { I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
-       
+
+
        virtual ~ModuleRandQuote()
        {
-               delete Srv;
-               delete conf;
                delete quotes;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version("Provides random quotes on connect.",VF_VENDOR);
        }
-       
-       virtual void OnUserConnect(userrec* user)
-       {
-               std::string str;
-               int fsize;
-               char buf[MAXBUF];
-
-               fsize = quotes->FileSize();
-               srand(time(NULL));
-               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;
-       }
-};
 
-
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-       ModuleRandQuoteFactory()
-       {
-       }
-       
-       ~ModuleRandQuoteFactory()
-       {
-       }
-       
-       virtual Module * CreateModule()
+       virtual void OnUserConnect(LocalUser* user)
        {
-               return new ModuleRandQuote;
+               cmd.Handle(std::vector<std::string>(), user);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRandQuoteFactory;
-}
-
+MODULE_INIT(ModuleRandQuote)