Fix m_randquote with 0 quotes

[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 b3bd82995722fef9cd17d14ca03a38fe31e9a053..668eea0e5cc0e8a2d1ae8fa83b247b3150c23b9a 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,113 +1,100 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
+
+/* $ModDesc: Provides random quotes on connect. */
+
 #include "inspircd.h"
 
 static FileReader *quotes = NULL;
 
-std::string q_file;
 std::string prefix;
 std::string suffix;
 
-/* $ModDesc: Provides random Quotes on Connect. */
-
 /** Handle /RANDQUOTE
  */
 class CommandRandquote : public Command
 {
  public:
-       CommandRandquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
+       CommandRandquote(Module* Creator) : Command(Creator,"RANDQUOTE", 0)
        {
-               this->source = "m_randquote.so";
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, 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.c_str(),prefix.c_str(),str.c_str(),suffix.c_str());
-               }
-               else
+               int fsize = quotes->FileSize();
+               if (fsize)
                {
-                       user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick.c_str());
-                       return CMD_FAILURE;
+                       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());
                }
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
 class ModuleRandQuote : public Module
 {
  private:
-       CommandRandquote* mycommand;
-       ConfigReader *conf;
+       CommandRandquote cmd;
  public:
-       ModuleRandQuote(InspIRCd* Me)
-               : Module(Me)
+       ModuleRandQuote()
+               : cmd(this)
        {
+       }
 
-               conf = new ConfigReader(ServerInstance);
-               // Sort the Randomizer thingie..
-               srand(ServerInstance->Time());
-
-               q_file = conf->ReadValue("randquote","file",0);
-               prefix = conf->ReadValue("randquote","prefix",0);
-               suffix = conf->ReadValue("randquote","suffix",0);
+       void init()
+       {
+               ConfigTag* conf = ServerInstance->Config->ConfValue("randquote");
 
-               mycommand = NULL;
+               std::string q_file = conf->getString("file","quotes");
+               prefix = conf->getString("prefix");
+               suffix = conf->getString("suffix");
 
-               if (q_file.empty())
-               {
-                       throw ModuleException("m_randquote: Quotefile not specified - Please check your config.");
-               }
-
-               quotes = new FileReader(ServerInstance, q_file);
-               if(!quotes->Exists())
+               quotes = new FileReader(q_file);
+               if (!quotes->Exists())
                {
                        throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
                }
-               else
-               {
-                       /* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-                       mycommand = new CommandRandquote(ServerInstance);
-                       ServerInstance->AddCommand(mycommand);
-               }
+               ServerInstance->Modules->AddService(cmd);
                Implementation eventlist[] = { I_OnUserConnect };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
 
        virtual ~ModuleRandQuote()
        {
-               delete conf;
                delete quotes;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$",VF_VENDOR,API_VERSION);
+               return Version("Provides random quotes on connect.",VF_VENDOR);
        }
 
-       virtual void OnUserConnect(User* user)
+       virtual void OnUserConnect(LocalUser* user)
        {
-               if (mycommand)
-                       mycommand->Handle(std::vector<std::string>(), user);
+               cmd.Handle(std::vector<std::string>(), user);
        }
 };