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

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 7354420a9..2ad7831ce 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,32 +2,25 @@
  *       | 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 "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. */
 
@@ -46,7 +39,7 @@ class cmd_randquote : public command_t
 		std::string str;
 		int fsize;
 
-		if (q_file == "" || quotes->Exists())
+		if (q_file.empty() || quotes->Exists())
 		{
 			fsize = quotes->FileSize();
 			str = quotes->GetLine(rand() % fsize);
@@ -57,7 +50,8 @@ class cmd_randquote : public command_t
 			user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
 			return CMD_FAILURE;
 		}
-		return CMD_SUCCESS;
+
+		return CMD_LOCALONLY;
 	}
 };
 
@@ -70,6 +64,8 @@ class RandquoteException : public ModuleException
  public:
 	RandquoteException(const std::string &message) : err(message) { }
 
+	~RandquoteException() throw () { }
+
 	virtual const char* GetReason()
 	{
 		return err.c_str();
@@ -83,7 +79,7 @@ class ModuleRandQuote : public Module
 	ConfigReader *conf;
  public:
 	ModuleRandQuote(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		conf = new ConfigReader(ServerInstance);
@@ -96,7 +92,7 @@ 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);
@@ -139,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)