Merge pull request #1147 from SaberUK/insp20+gcc6

[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 7d4ad042f502dc5d47498c06887b6ebc12063f39..668eea0e5cc0e8a2d1ae8fa83b247b3150c23b9a 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,16 +1,28 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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;
@@ -18,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
@@ -31,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;
        }
@@ -65,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));
        }
 
 
@@ -78,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)