X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=21cb2257dc8358ba0bfbe2b11dfeb383bd3e6703;hb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;hp=a720be52244535c7b32df5dfcc9caae2032ca2a2;hpb=76d7e8a0684b38a82e6c05ebd7538b69660e1bef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp index a720be522..21cb2257d 100644 --- 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,42 +12,39 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.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. */ /** Handle /RANDQUOTE */ -class cmd_randquote : public command_t +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"; } - CmdResult Handle (const char** parameters, int pcntl, userrec *user) + CmdResult Handle (const std::vector& parameters, User *user) { std::string str; int fsize; - if (q_file == "" || quotes->Exists()) + 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()); + 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; } @@ -55,107 +52,59 @@ class cmd_randquote : public command_t } }; -/** Thrown by m_randquote - */ -class RandquoteException : public ModuleException -{ - private: - const std::string err; - public: - RandquoteException(const std::string &message) : err(message) { } - - ~RandquoteException() throw () { } - - virtual const char* GetReason() - { - return err.c_str(); - } -}; - class ModuleRandQuote : public Module { private: - cmd_randquote* mycommand; + CommandRandquote cmd; ConfigReader *conf; public: ModuleRandQuote(InspIRCd* Me) - : Module(Me) + : Module(Me), cmd(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); suffix = conf->ReadValue("randquote","suffix",0); - 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); - ServerInstance->AddCommand(mycommand); + 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 conf; + delete quotes; } - + virtual Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); - } - - virtual void OnUserConnect(userrec* user) - { - if (mycommand) - mycommand->Handle(NULL, 0, user); + return Version("$Id$",VF_VENDOR,API_VERSION); } -}; - -class ModuleRandQuoteFactory : public ModuleFactory -{ - public: - ModuleRandQuoteFactory() - { - } - - ~ModuleRandQuoteFactory() + virtual void OnUserConnect(User* user) { + cmd.Handle(std::vector(), user); } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleRandQuote(Me); - } - }; - -extern "C" DllExport void * init_module( void ) -{ - return new ModuleRandQuoteFactory; -} +MODULE_INIT(ModuleRandQuote)