X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=85e4e34b2abf32ef39a7c7d6c4bcbf624189d750;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=be49841327f6d6b4ad8855b9f994bc0e33f0d2fa;hpb=7da209d2157cd8a32f015c93e5b835607163a53b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index be4984132..85e4e34b2 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,69 +1,140 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *           	  <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fstream>
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
+static Server *Srv;
+static FileReader *quotes = NULL;
+
+std::string q_file = "";
+std::string prefix = "";
+std::string suffix = "";
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
-class ModuleRandQuote : public Module
+class cmd_randquote : public command_t
+{
+ public:
+	cmd_randquote () : command_t("RANDQUOTE", 0, 0)
+	{
+		this->source = "m_randquote.so";
+	}
+
+	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());
+			user->WriteServ(std::string(buf));
+		}
+		else
+		{
+			sprintf(buf, "NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
+			user->WriteServ(std::string(buf));
+		}
+		return;
+	}
+};
+
+class RandquoteException : public ModuleException
 {
  private:
+	std::string err;
+ public:
+	RandquoteException(std::string message) : err(message) { }
 
-	 Server *Srv;
-	 ConfigReader *conf;
-	 FileReader *quotes;
+	virtual const char* GetReason()
+	{
+		return (char*)err.c_str();
+	}
+};
 
-	 std::string q_file;
-	 std::string prefix;
-	 std::string suffix;
-	 
+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;
-
-		if (conf->ReadValue("randquote","file",0) == '') {
-			log(DEBUG,"m_randquote: startup: File Not Specified!, bailing!");
-			return (ERROR);
-		}
+		// 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);
 
+		mycommand = NULL;
+
+		if (q_file == "")
+		{
+			RandquoteException e("m_randquote: Quotefile not specified - Please check your config.");
+			throw(e);
+		}
+
 		quotes = new FileReader(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();
+			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()
 	{
-		return Version(1,0,0,0);
+		return Version(1,0,0,1,VF_VENDOR);
 	}
 	
 	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);
 	}
 };
 
@@ -79,9 +150,9 @@ class ModuleRandQuoteFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleRandQuote;
+		return new ModuleRandQuote(Me);
 	}
 	
 };
@@ -91,4 +162,3 @@ extern "C" void * init_module( void )
 {
 	return new ModuleRandQuoteFactory;
 }
-