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

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 5be40bc6c..e2910e7cd 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,89 +1,109 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
 
-#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;
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
-class ModuleRandQuote : public Module
+/** Handle /RANDQUOTE
+ */
+class CommandRandquote : public Command
 {
- private:
+ public:
+	CommandRandquote(Module* Creator) : Command(Creator,"RANDQUOTE", 0)
+	{
+	}
+
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	{
+		std::string str;
+		int fsize;
 
-	 Server *Srv;
-	 ConfigReader *conf;
-	 FileReader *quotes;
+		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;
+		}
 
-	 std::string q_file;
-	 std::string prefix;
-	 std::string suffix;
-	 
+		return CMD_SUCCESS;
+	}
+};
+
+class ModuleRandQuote : public Module
+{
+ private:
+	CommandRandquote cmd;
+	ConfigReader *conf;
  public:
 	ModuleRandQuote()
+		: cmd(this)
 	{
-		Srv = new Server;
+
 		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);
 
+		if (q_file.empty())
+		{
+			throw ModuleException("m_randquote: Quotefile not specified - Please check your config.");
+		}
+
 		quotes = new FileReader(q_file);
+		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);
+		}
+		Implementation eventlist[] = { I_OnUserConnect };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
-	
+
+
 	virtual ~ModuleRandQuote()
 	{
-		delete Srv;
 		delete conf;
 		delete quotes;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version("Provides random Quotes on Connect.",VF_VENDOR,API_VERSION);
 	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
-		std::string str;
-		int fsize;
-		char buf[MAXBUF];
-
-		fsize = quotes->FileSize();
-		srand(time(NULL));
-		str = quotes->GetLine(rand() % fsize);
-			
-		sprintf(buf,"NOTICE %s :%s%s%s",user->nick,prefix.c_str(),str.c_str(),suffix.c_str());
-		Srv->SendServ(user->fd, buf);
-		return;
-	}
-};
-
 
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-	ModuleRandQuoteFactory()
+	virtual void OnUserConnect(User* user)
 	{
+		cmd.Handle(std::vector<std::string>(), user);
 	}
-	
-	~ModuleRandQuoteFactory()
-	{
-	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleRandQuote;
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleRandQuoteFactory;
-}
-
+MODULE_INIT(ModuleRandQuote)