X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=e4cb70a76502592b52d1f260b15e2a99ddaa2cdc;hb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;hp=034bea0408c2951a814aad851a4fcc70d60cdd79;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 034bea040..e4cb70a76 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -11,37 +11,32 @@
  * ---------------------------------------------------
  */
 
-#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. */
 
 /** Handle /RANDQUOTE
  */
-class cmd_randquote : public command_t
+class CommandRandquote : public Command
 {
  public:
-	cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
+	CommandRandquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
 	{
 		this->source = "m_randquote.so";
 	}
 
-	CmdResult Handle (const char** parameters, int pcntl, userrec *user)
+	CmdResult Handle (const char** parameters, int pcntl, User *user)
 	{
 		std::string str;
 		int fsize;
 
-		if (q_file == "" || quotes->Exists())
+		if (q_file.empty() || quotes->Exists())
 		{
 			fsize = quotes->FileSize();
 			str = quotes->GetLine(rand() % fsize);
@@ -52,7 +47,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;
 	}
 };
 
@@ -76,11 +72,11 @@ class RandquoteException : public ModuleException
 class ModuleRandQuote : public Module
 {
  private:
-	cmd_randquote* mycommand;
+	CommandRandquote* mycommand;
 	ConfigReader *conf;
  public:
 	ModuleRandQuote(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		conf = new ConfigReader(ServerInstance);
@@ -93,7 +89,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);
@@ -108,7 +104,7 @@ class ModuleRandQuote : public Module
 		else
 		{
 			/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-			mycommand = new cmd_randquote(ServerInstance);
+			mycommand = new CommandRandquote(ServerInstance);
 			ServerInstance->AddCommand(mycommand);
 		}
 	}
@@ -129,34 +125,11 @@ class ModuleRandQuote : public Module
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnUserConnect(userrec* user)
+	virtual void OnUserConnect(User* user)
 	{
 		if (mycommand)
 			mycommand->Handle(NULL, 0, user);
 	}
 };
 
-
-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)