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

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index eda4de2bc..034bea040 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,105 +2,137 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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 <stdio.h>
-#include <stdlib.h>
-#include <fstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-Server *Srv;
-FileReader *quotes;
+#include "inspircd.h"
 
-std::string q_file;
-std::string prefix;
-std::string suffix;
 
+static FileReader *quotes = NULL;
 
+std::string q_file = "";
+std::string prefix = "";
+std::string suffix = "";
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
-void handle_randquote(char** parameters, int pcntl, userrec *user)
+/** Handle /RANDQUOTE
+ */
+class cmd_randquote : public command_t
 {
-	std::string str;
-	int fsize;
-	char buf[MAXBUF];
+ public:
+	cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
+	{
+		this->source = "m_randquote.so";
+	}
 
-	fsize = quotes->FileSize();
-	str = quotes->GetLine(rand() % fsize);
+	CmdResult Handle (const char** parameters, int pcntl, userrec *user)
+	{
+		std::string str;
+		int 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 (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;
+	}
+};
 
+/** 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;
 	ConfigReader *conf;
  public:
-	ModuleRandQuote()
+	ModuleRandQuote(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		conf = new ConfigReader;
+		
+		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(q_file);
+		quotes = new FileReader(ServerInstance, q_file);
 		if(!quotes->Exists())
 		{
-			printf("m_randquote: QuoteFile not Found!! Please check your config.\n\n");
-			exit(0);
+			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);
 		}
-		/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-		Srv->AddCommand("QUOTE",handle_randquote,0,0,"m_randquote.so");
+	}
+
+	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,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 	virtual void OnUserConnect(userrec* user)
 	{
-		// Make a fake pointer to be passed to handle_randquote()
-		// Dont try this at home kiddies :D
-		char *rar = "RAR";
-		handle_randquote(&rar, 0, user);
+		if (mycommand)
+			mycommand->Handle(NULL, 0, user);
 	}
 };
 
@@ -116,9 +148,9 @@ class ModuleRandQuoteFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleRandQuote;
+		return new ModuleRandQuote(Me);
 	}
 	
 };