X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=02572e7de437e6e0e4bbb2d524c8b87db03c6d52;hb=0898f10f75bcd8ecde21c73da90955f95dc30e50;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..02572e7de 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,94 +1,116 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 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 CommandRandquote : public Command
 {
- private:
-
-	 Server *Srv;
-	 ConfigReader *conf;
-	 FileReader *quotes;
-
-	 std::string q_file;
-	 std::string prefix;
-	 std::string suffix;
-	 
  public:
-	ModuleRandQuote()
+	CommandRandquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
+	{
+		this->source = "m_randquote.so";
+	}
+
+	CmdResult Handle (const char* const* parameters, int pcntl, User *user)
 	{
-		Srv = new Server;
-		conf = new ConfigReader;
+		std::string str;
+		int fsize;
 
-		if (conf->ReadValue("randquote","file",0) == '') {
-			log(DEBUG,"m_randquote: startup: File Not Specified!, bailing!");
-			return (ERROR);
+		if (q_file.empty() || 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_LOCALONLY;
+	}
+};
+
+class ModuleRandQuote : public Module
+{
+ private:
+	CommandRandquote* mycommand;
+	ConfigReader *conf;
+ public:
+	ModuleRandQuote(InspIRCd* Me)
+		: 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);
 
-		quotes = new FileReader(q_file);
+		mycommand = NULL;
+
+		if (q_file.empty())
+		{
+			CoreException e("m_randquote: Quotefile not specified - Please check your config.");
+			throw(e);
+		}
+
+		quotes = new FileReader(ServerInstance, q_file);
+		if(!quotes->Exists())
+		{
+			CoreException 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 CommandRandquote(ServerInstance);
+			ServerInstance->AddCommand(mycommand);
+		}
+		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);
-	}
-	
-	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()
-	{
-	}
-	
-	~ModuleRandQuoteFactory()
-	{
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual Module * CreateModule()
+	virtual void OnUserConnect(User* user)
 	{
-		return new ModuleRandQuote;
+		if (mycommand)
+			mycommand->Handle(NULL, 0, user);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleRandQuoteFactory;
-}
-
+MODULE_INIT(ModuleRandQuote)