X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=7d4ad042f502dc5d47498c06887b6ebc12063f39;hb=cbd32e195f5f574653550a3ed4954168ace30c55;hp=3cdf4f30df4ae7389cf98be97081120a5a63a033;hpb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 3cdf4f30d..7d4ad042f 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,7 +15,6 @@
 
 static FileReader *quotes = NULL;
 
-std::string q_file;
 std::string prefix;
 std::string suffix;
 
@@ -35,17 +34,9 @@ class CommandRandquote : public Command
 		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.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.c_str());
-			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_SUCCESS;
 	}
@@ -55,35 +46,26 @@ class ModuleRandQuote : public Module
 {
  private:
 	CommandRandquote cmd;
-	ConfigReader *conf;
  public:
 	ModuleRandQuote()
 		: cmd(this)
 	{
+	}
 
-		conf = new ConfigReader;
-		// Sort the Randomizer thingie..
-		srand(ServerInstance->Time());
-
-		q_file = conf->ReadValue("randquote","file",0);
-		prefix = conf->ReadValue("randquote","prefix",0);
-		suffix = conf->ReadValue("randquote","suffix",0);
+	void init()
+	{
+		ConfigTag* conf = ServerInstance->Config->ConfValue("randquote");
 
-		if (q_file.empty())
-		{
-			throw ModuleException("m_randquote: Quotefile not specified - Please check your config.");
-		}
+		std::string q_file = conf->getString("file","quotes");
+		prefix = conf->getString("prefix");
+		suffix = conf->getString("suffix");
 
 		quotes = new FileReader(q_file);
-		if(!quotes->Exists())
+		if (!quotes->Exists())
 		{
 			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 */
-			ServerInstance->AddCommand(&cmd);
-		}
+		ServerInstance->AddCommand(&cmd);
 		Implementation eventlist[] = { I_OnUserConnect };
 		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
@@ -91,7 +73,6 @@ class ModuleRandQuote : public Module
 
 	virtual ~ModuleRandQuote()
 	{
-		delete conf;
 		delete quotes;
 	}
 
@@ -100,7 +81,7 @@ class ModuleRandQuote : public Module
 		return Version("Provides random Quotes on Connect.",VF_VENDOR);
 	}
 
-	virtual void OnUserConnect(User* user)
+	virtual void OnUserConnect(LocalUser* user)
 	{
 		cmd.Handle(std::vector<std::string>(), user);
 	}