X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=2ad7831ce90f0f5aba9e3a1b6d32c9b362b92f39;hb=fed58f5c25915d60d40c0f407914ff7381902f9d;hp=c1353ef09a1cae06dc764298ac589e47b0bef57d;hpb=66098d307c036997e51eaea21724615e27fdc3e9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index c1353ef09..2ad7831ce 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,74 +2,73 @@
  *       | 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 "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "inspircd.h"
-
 
 static FileReader *quotes = NULL;
 
-std::string q_file = "";
-std::string prefix = "";
-std::string suffix = "";
+std::string q_file;
+std::string prefix;
+std::string suffix;
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
+/** Handle /RANDQUOTE
+ */
 class cmd_randquote : public command_t
 {
  public:
- cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
+	cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
 	{
 		this->source = "m_randquote.so";
 	}
 
-	void Handle (const 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())
+
+		if (q_file.empty() || 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));
+			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);
-			user->WriteServ(std::string(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_LOCALONLY;
 	}
 };
 
+/** 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 const char* GetReason()
 	{
-		return (char*)err.c_str();
+		return err.c_str();
 	}
 };
 
@@ -80,10 +79,10 @@ class ModuleRandQuote : public Module
 	ConfigReader *conf;
  public:
 	ModuleRandQuote(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
-		conf = new ConfigReader;
+		conf = new ConfigReader(ServerInstance);
 		// Sort the Randomizer thingie..
 		srand(time(NULL));
 
@@ -93,13 +92,13 @@ class ModuleRandQuote : public Module
 
 		mycommand = NULL;
 
-		if (q_file == "")
+		if (q_file.empty())
 		{
 			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.");
@@ -126,7 +125,7 @@ class ModuleRandQuote : public Module
 	
 	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)
@@ -136,27 +135,4 @@ class ModuleRandQuote : public Module
 	}
 };
 
-
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-	ModuleRandQuoteFactory()
-	{
-	}
-	
-	~ModuleRandQuoteFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRandQuote(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleRandQuoteFactory;
-}
+MODULE_INIT(ModuleRandQuote)