X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=034bea0408c2951a814aad851a4fcc70d60cdd79;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=5db1c66acd59ce7ce28050f9e34ad3ca61de410f;hpb=df5761fd2f370bf2bc7d2174a45e26fde0e66e56;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 5db1c66ac..034bea040 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,71 +1,138 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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 cmd_randquote : public command_t
 {
- private:
+ public:
+	cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
+	{
+		this->source = "m_randquote.so";
+	}
 
-	 Server *Srv;
-	 ConfigReader *conf;
-	 FileReader *quotes;
+	CmdResult Handle (const char** parameters, int pcntl, userrec *user)
+	{
+		std::string str;
+		int fsize;
+
+		if (q_file == "" || 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;
+		}
+		return CMD_SUCCESS;
+	}
+};
 
-	 std::string q_file;
-	 std::string prefix;
-	 std::string suffix;
-	 
+/** Thrown by m_randquote
+ */
+class RandquoteException : public ModuleException
+{
+ private:
+	const std::string err;
  public:
-	ModuleRandQuote()
+	RandquoteException(const std::string &message) : err(message) { }
+
+	~RandquoteException() throw () { }
+
+	virtual const char* GetReason()
 	{
-		Srv = new Server;
-		conf = new ConfigReader;
+		return err.c_str();
+	}
+};
 
+class ModuleRandQuote : public Module
+{
+ private:
+	cmd_randquote* mycommand;
+	ConfigReader *conf;
+ public:
+	ModuleRandQuote(InspIRCd* Me)
+		: Module::Module(Me)
+	{
+		
+		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);
 
-		if (q_file == "") {
-			printf("m_randquote: Quotefile not specified.. Please check your config.\n\n");
-			exit(0);
-                }
-
+		mycommand = NULL;
+
+		if (q_file == "")
+		{
+			RandquoteException e("m_randquote: Quotefile not specified - Please check your config.");
+			throw(e);
+		}
+
+		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
+		{
+			/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
+			mycommand = new cmd_randquote(ServerInstance);
+			ServerInstance->AddCommand(mycommand);
+		}
+	}
 
-		quotes = new FileReader(q_file);
+	void Implements(char* List)
+	{
+		List[I_OnUserConnect] = 1;
 	}
 	
 	virtual ~ModuleRandQuote()
 	{
-		delete Srv;
-		delete conf;
-		delete quotes;
+		DELETE(conf);
+		DELETE(quotes);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version(1,1,0,1,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;
+		if (mycommand)
+			mycommand->Handle(NULL, 0, user);
 	}
 };
 
@@ -81,9 +148,9 @@ class ModuleRandQuoteFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleRandQuote;
+		return new ModuleRandQuote(Me);
 	}
 	
 };
@@ -93,4 +160,3 @@ extern "C" void * init_module( void )
 {
 	return new ModuleRandQuoteFactory;
 }
-