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 94cd3dbac775b244738df8308862e150b00b0b97..668eea0e5cc0e8a2d1ae8fa83b247b3150c23b9a 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -21,6 +21,8 @@
  */
 
 
+/* $ModDesc: Provides random quotes on connect. */
+
 #include "inspircd.h"
 
 static FileReader *quotes = NULL;
@@ -28,8 +30,6 @@ static FileReader *quotes = NULL;
 std::string prefix;
 std::string suffix;
 
-/* $ModDesc: Provides random Quotes on Connect. */
-
 /** Handle /RANDQUOTE
  */
 class CommandRandquote : public Command
@@ -41,12 +41,13 @@ class CommandRandquote : public Command
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               std::string str;
-               int fsize;
-
-               fsize = quotes->FileSize();
-               str = quotes->GetLine(ServerInstance->GenRandomInt(fsize));
-               user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),prefix.c_str(),str.c_str(),suffix.c_str());
+               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());
+               }
 
                return CMD_SUCCESS;
        }
@@ -75,9 +76,9 @@ class ModuleRandQuote : public Module
                {
                        throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
                }
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
                Implementation eventlist[] = { I_OnUserConnect };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
 
@@ -88,7 +89,7 @@ class ModuleRandQuote : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides random Quotes on Connect.",VF_VENDOR);
+               return Version("Provides random quotes on connect.",VF_VENDOR);
        }
 
        virtual void OnUserConnect(LocalUser* user)