Fix IPv6 cloaking in compatability mode (was using the wrong xtab confusor)

[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 435c41453ae4834ce53781e912bc83a8a5df115b..7d4ad042f502dc5d47498c06887b6ebc12063f39 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -15,7 +15,6 @@
 
 static FileReader *quotes = NULL;
 
-std::string q_file;
 std::string prefix;
 std::string suffix;
 
@@ -23,112 +22,68 @@ std::string suffix;
 
 /** Handle /RANDQUOTE
  */
-class cmd_randquote : public Command
+class CommandRandquote : public Command
 {
  public:
-       cmd_randquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
+       CommandRandquote(Module* Creator) : Command(Creator,"RANDQUOTE", 0)
        {
-               this->source = "m_randquote.so";
        }
 
-       CmdResult Handle (const char** parameters, int pcntl, User *user)
+       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,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);
-                       return CMD_FAILURE;
-               }
+               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());
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
-/** Thrown by m_randquote
- */
-class RandquoteException : public ModuleException
+class ModuleRandQuote : public Module
 {
  private:
-       const std::string err;
+       CommandRandquote cmd;
  public:
-       RandquoteException(const std::string &message) : err(message) { }
-
-       ~RandquoteException() throw () { }
-
-       virtual const char* GetReason()
+       ModuleRandQuote()
+               : cmd(this)
        {
-               return err.c_str();
        }
-};
 
-class ModuleRandQuote : public Module
-{
- private:
-       cmd_randquote* mycommand;
-       ConfigReader *conf;
- public:
-       ModuleRandQuote(InspIRCd* Me)
-               : Module(Me)
+       void init()
        {
-               
-               conf = new ConfigReader(ServerInstance);
-               // Sort the Randomizer thingie..
-               srand(time(NULL));
-
-               q_file = conf->ReadValue("randquote","file",0);
-               prefix = conf->ReadValue("randquote","prefix",0);
-               suffix = conf->ReadValue("randquote","suffix",0);
-
-               mycommand = NULL;
+               ConfigTag* conf = ServerInstance->Config->ConfValue("randquote");
 
-               if (q_file.empty())
-               {
-                       RandquoteException e("m_randquote: Quotefile not specified - Please check your config.");
-                       throw(e);
-               }
+               std::string q_file = conf->getString("file","quotes");
+               prefix = conf->getString("prefix");
+               suffix = conf->getString("suffix");
 
-               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);
-               }
-               else
+               quotes = new FileReader(q_file);
+               if (!quotes->Exists())
                {
-                       /* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-                       mycommand = new cmd_randquote(ServerInstance);
-                       ServerInstance->AddCommand(mycommand);
+                       throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
                }
+               ServerInstance->AddCommand(&cmd);
+               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 quotes;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,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(NULL, 0, user);
+               cmd.Handle(std::vector<std::string>(), user);
        }
 };