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

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 8ee07f242..034bea040 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,30 +2,23 @@
  *       | 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.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 
-Server *Srv;
-FileReader *quotes = NULL;
+#include "inspircd.h"
+
+
+static FileReader *quotes = NULL;
 
 std::string q_file = "";
 std::string prefix = "";
@@ -33,47 +26,52 @@ std::string suffix = "";
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
+/** Handle /RANDQUOTE
+ */
 class cmd_randquote : public command_t
 {
  public:
-	cmd_randquote () : command_t("RANDQUOTE", 0, 0)
+	cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
 	{
 		this->source = "m_randquote.so";
 	}
 
-	void Handle (char** parameters, int pcntl, userrec *user)
+	CmdResult 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);
+			user->WriteServ("NOTICE %s :%s%s%s",user->nick,prefix.c_str(),str.c_str(),suffix.c_str());
 		}
 		else
 		{
-			sprintf(buf, "NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
-			Srv->SendServ(user->fd, buf);
+			user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
+			return CMD_FAILURE;
 		}
-		return;
+		return CMD_SUCCESS;
 	}
 };
 
+/** Thrown by m_randquote
+ */
 class RandquoteException : public ModuleException
 {
  private:
-	std::string err;
+	const std::string err;
  public:
-	RandquoteException(std::string message) : err(message) { }
+	RandquoteException(const std::string &message) : err(message) { }
+
+	~RandquoteException() throw () { }
 
-	virtual char* GetReason()
+	virtual const char* GetReason()
 	{
-		return (char*)err.c_str();
+		return err.c_str();
 	}
-}
+};
 
 class ModuleRandQuote : public Module
 {
@@ -81,11 +79,11 @@ class ModuleRandQuote : public Module
 	cmd_randquote* mycommand;
 	ConfigReader *conf;
  public:
-	ModuleRandQuote(Server* Me)
+	ModuleRandQuote(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		conf = new ConfigReader;
+		
+		conf = new ConfigReader(ServerInstance);
 		// Sort the Randomizer thingie..
 		srand(time(NULL));
 
@@ -99,9 +97,9 @@ class ModuleRandQuote : public Module
 		{
 			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())
 		{
 			RandquoteException e("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
@@ -110,8 +108,8 @@ class ModuleRandQuote : public Module
 		else
 		{
 			/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-			mycommand = new cmd_randquote();
-			Srv->AddCommand(mycommand);
+			mycommand = new cmd_randquote(ServerInstance);
+			ServerInstance->AddCommand(mycommand);
 		}
 	}
 
@@ -122,13 +120,13 @@ class ModuleRandQuote : public Module
 	
 	virtual ~ModuleRandQuote()
 	{
-		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)
@@ -150,7 +148,7 @@ class ModuleRandQuoteFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleRandQuote(Me);
 	}