fixed some indentation and spacing in modules

[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 0bb0be1db1d539fe800f1ad8f4621c488c044bd5..503156eef73721c161e9c992f59e0e5865d512ec 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,87 +2,66 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
-
 static FileReader *quotes = NULL;
 
-std::string q_file = "";
-std::string prefix = "";
-std::string suffix = "";
+std::string q_file;
+std::string prefix;
+std::string suffix;
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
-class cmd_randquote : public command_t
+/** Handle /RANDQUOTE
+ */
+class CommandRandquote : public Command
 {
  public:
- cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
+       CommandRandquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
        {
                this->source = "m_randquote.so";
        }
 
-       void Handle (const char** parameters, int pcntl, userrec *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                std::string str;
                int fsize;
-               char buf[MAXBUF];
-               if (q_file == "" || quotes->Exists())
+
+               if (q_file.empty() || quotes->Exists())
                {
                        fsize = quotes->FileSize();
                        str = quotes->GetLine(rand() % fsize);
-                       sprintf(buf,"NOTICE %s :%s%s%s",user->nick,prefix.c_str(),str.c_str(),suffix.c_str());
-                       user->WriteServ(std::string(buf));
+                       user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),prefix.c_str(),str.c_str(),suffix.c_str());
                }
                else
                {
-                       sprintf(buf, "NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
-                       user->WriteServ(std::string(buf));
+                       user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick.c_str());
+                       return CMD_FAILURE;
                }
-               return;
-       }
-};
 
-class RandquoteException : public ModuleException
-{
- private:
-       std::string err;
- public:
-       RandquoteException(std::string message) : err(message) { }
-
-       virtual const char* GetReason()
-       {
-               return (char*)err.c_str();
+               return CMD_LOCALONLY;
        }
 };
 
 class ModuleRandQuote : public Module
 {
  private:
-       cmd_randquote* mycommand;
+       CommandRandquote* mycommand;
        ConfigReader *conf;
  public:
        ModuleRandQuote(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
-               
+
                conf = new ConfigReader(ServerInstance);
                // Sort the Randomizer thingie..
                srand(time(NULL));
@@ -93,70 +72,43 @@ class ModuleRandQuote : public Module
 
                mycommand = NULL;
 
-               if (q_file == "")
+               if (q_file.empty())
                {
-                       RandquoteException 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())
                {
-                       RandquoteException 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
                {
                        /* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-                       mycommand = new cmd_randquote(ServerInstance);
+                       mycommand = new CommandRandquote(ServerInstance);
                        ServerInstance->AddCommand(mycommand);
                }
+               Implementation eventlist[] = { I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserConnect] = 1;
-       }
-       
+
        virtual ~ModuleRandQuote()
        {
-               DELETE(conf);
-               DELETE(quotes);
+               delete conf;
+               delete quotes;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
-       }
-       
-       virtual void OnUserConnect(userrec* user)
-       {
-               if (mycommand)
-                       mycommand->Handle(NULL, 0, user);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
-};
 
-
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-       ModuleRandQuoteFactory()
-       {
-       }
-       
-       ~ModuleRandQuoteFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+       virtual void OnUserConnect(User* user)
        {
-               return new ModuleRandQuote(Me);
+               if (mycommand)
+                       mycommand->Handle(std::vector<std::string>(), user);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRandQuoteFactory;
-}
+MODULE_INIT(ModuleRandQuote)