X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=e2910e7cd96e003dc3f3f33479dde98a629a912a;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=b3bd82995722fef9cd17d14ca03a38fe31e9a053;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index b3bd82995..e2910e7cd 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -26,9 +26,8 @@ std::string suffix;
 class CommandRandquote : public Command
 {
  public:
-	CommandRandquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
+	CommandRandquote(Module* Creator) : Command(Creator,"RANDQUOTE", 0)
 	{
-		this->source = "m_randquote.so";
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -48,21 +47,21 @@ class CommandRandquote : public Command
 			return CMD_FAILURE;
 		}
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleRandQuote : public Module
 {
  private:
-	CommandRandquote* mycommand;
+	CommandRandquote cmd;
 	ConfigReader *conf;
  public:
-	ModuleRandQuote(InspIRCd* Me)
-		: Module(Me)
+	ModuleRandQuote()
+		: cmd(this)
 	{
 
-		conf = new ConfigReader(ServerInstance);
+		conf = new ConfigReader;
 		// Sort the Randomizer thingie..
 		srand(ServerInstance->Time());
 
@@ -70,14 +69,12 @@ class ModuleRandQuote : public Module
 		prefix = conf->ReadValue("randquote","prefix",0);
 		suffix = conf->ReadValue("randquote","suffix",0);
 
-		mycommand = NULL;
-
 		if (q_file.empty())
 		{
 			throw ModuleException("m_randquote: Quotefile not specified - Please check your config.");
 		}
 
-		quotes = new FileReader(ServerInstance, q_file);
+		quotes = new FileReader(q_file);
 		if(!quotes->Exists())
 		{
 			throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
@@ -85,8 +82,7 @@ class ModuleRandQuote : public Module
 		else
 		{
 			/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-			mycommand = new CommandRandquote(ServerInstance);
-			ServerInstance->AddCommand(mycommand);
+			ServerInstance->AddCommand(&cmd);
 		}
 		Implementation eventlist[] = { I_OnUserConnect };
 		ServerInstance->Modules->Attach(eventlist, this, 1);
@@ -101,13 +97,12 @@ class ModuleRandQuote : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Provides random Quotes on Connect.",VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnUserConnect(User* user)
 	{
-		if (mycommand)
-			mycommand->Handle(std::vector<std::string>(), user);
+		cmd.Handle(std::vector<std::string>(), user);
 	}
 };