X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=12049b376fef5aa73d0e7e2c2fb951cf3bdedb85;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=22c3fe32f17acc9d443978ceb8fd6a1f764454dc;hpb=faecbbfe2d09b83e167c712dcd5ac52282228e09;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 22c3fe32f..12049b376 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -24,8 +24,8 @@ using namespace std;
 #include "modules.h"
 #include "helperfuncs.h"
 
-Server *Srv = NULL;
-FileReader *quotes = NULL;
+static Server *Srv;
+static FileReader *quotes = NULL;
 
 std::string q_file = "";
 std::string prefix = "";
@@ -33,33 +33,58 @@ std::string suffix = "";
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
-void handle_randquote(char** parameters, int pcntl, userrec *user)
+class cmd_randquote : public command_t
 {
-	std::string str;
-	int fsize;
-	char buf[MAXBUF];
-	if (quotes)
+ public:
+	cmd_randquote () : command_t("RANDQUOTE", 0, 0)
 	{
-		fsize = quotes->FileSize();
-		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);
+		this->source = "m_randquote.so";
 	}
-	return;
-}
 
+	void Handle (const char** parameters, int pcntl, userrec *user)
+	{
+		std::string str;
+		int fsize;
+		char buf[MAXBUF];
+		if (q_file == "" || quotes->Exists())
+		{
+			fsize = quotes->FileSize();
+			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);
+		}
+		else
+		{
+			sprintf(buf, "NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
+			Srv->SendServ(user->fd, buf);
+		}
+		return;
+	}
+};
 
+class RandquoteException : public ModuleException
+{
+ private:
+	std::string err;
+ public:
+	RandquoteException(std::string message) : err(message) { }
 
+	virtual const char* GetReason()
+	{
+		return (char*)err.c_str();
+	}
+};
 
 class ModuleRandQuote : public Module
 {
  private:
-
+	cmd_randquote* mycommand;
 	ConfigReader *conf;
  public:
-	ModuleRandQuote()
+	ModuleRandQuote(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
+		Srv = Me;
 		conf = new ConfigReader;
 		// Sort the Randomizer thingie..
 		srand(time(NULL));
@@ -68,27 +93,37 @@ class ModuleRandQuote : public Module
 		prefix = conf->ReadValue("randquote","prefix",0);
 		suffix = conf->ReadValue("randquote","suffix",0);
 
+		mycommand = NULL;
+
 		if (q_file == "")
 		{
-			log(DEFAULT,"m_randquote: Quotefile not specified - Please check your config.");
-			return;
-                }
+			RandquoteException e("m_randquote: Quotefile not specified - Please check your config.");
+			throw(e);
+		}
 
 		quotes = new FileReader(q_file);
 		if(!quotes->Exists())
 		{
-			log(DEFAULT,"m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
-			return;
+			RandquoteException e("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
+			throw(e);
 		}
-		/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-		else Srv->AddCommand("QUOTE",handle_randquote,0,0,"m_randquote.so");
+		else
+		{
+			/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
+			mycommand = new cmd_randquote();
+			Srv->AddCommand(mycommand);
+		}
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnUserConnect] = 1;
 	}
 	
 	virtual ~ModuleRandQuote()
 	{
-		delete Srv;
-		delete conf;
-		delete quotes;
+		DELETE(conf);
+		DELETE(quotes);
 	}
 	
 	virtual Version GetVersion()
@@ -98,11 +133,8 @@ class ModuleRandQuote : public Module
 	
 	virtual void OnUserConnect(userrec* user)
 	{
-		// Make a fake pointer to be passed to handle_randquote()
-		// Dont try this at home kiddies :D
-		/* Or do things a slightly nicer way, and pass NULL */
-		//char *rar = "RAR";
-		handle_randquote(NULL, 0, user);
+		if (mycommand)
+			mycommand->Handle(NULL, 0, user);
 	}
 };
 
@@ -118,9 +150,9 @@ class ModuleRandQuoteFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleRandQuote;
+		return new ModuleRandQuote(Me);
 	}
 	
 };