Maxpara on these was 3, should be 2

[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 02572e7de437e6e0e4bbb2d524c8b87db03c6d52..b3bd82995722fef9cd17d14ca03a38fe31e9a053 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -31,7 +31,7 @@ class CommandRandquote : public Command
                this->source = "m_randquote.so";
        }
 
-       CmdResult Handle (const char* const* parameters, int pcntl, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                std::string str;
                int fsize;
@@ -40,11 +40,11 @@ class CommandRandquote : public Command
                {
                        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());
+                       user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),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);
+                       user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick.c_str());
                        return CMD_FAILURE;
                }
 
@@ -61,10 +61,10 @@ class ModuleRandQuote : public Module
        ModuleRandQuote(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                conf = new ConfigReader(ServerInstance);
                // Sort the Randomizer thingie..
-               srand(time(NULL));
+               srand(ServerInstance->Time());
 
                q_file = conf->ReadValue("randquote","file",0);
                prefix = conf->ReadValue("randquote","prefix",0);
@@ -74,15 +74,13 @@ class ModuleRandQuote : public Module
 
                if (q_file.empty())
                {
-                       CoreException e("m_randquote: Quotefile not specified - Please check your config.");
-                       throw(e);
+                       throw ModuleException("m_randquote: Quotefile not specified - Please check your config.");
                }
 
                quotes = new FileReader(ServerInstance, q_file);
                if(!quotes->Exists())
                {
-                       CoreException e("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
-                       throw(e);
+                       throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
                }
                else
                {
@@ -94,22 +92,22 @@ class ModuleRandQuote : public Module
                ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       
+
        virtual ~ModuleRandQuote()
        {
                delete conf;
                delete quotes;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
-       
+
        virtual void OnUserConnect(User* user)
        {
                if (mycommand)
-                       mycommand->Handle(NULL, 0, user);
+                       mycommand->Handle(std::vector<std::string>(), user);
        }
 };