X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=62d3022cffa38b6bb7ba484cb2270e9973856694;hb=c775be0c827ccab77559f6ef79a54a73a3abde15;hp=94cd3dbac775b244738df8308862e150b00b0b97;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 94cd3dbac..62d3022cf 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -21,6 +21,8 @@
  */
 
 
+/* $ModDesc: Provides random quotes on connect. */
+
 #include "inspircd.h"
 
 static FileReader *quotes = NULL;
@@ -28,8 +30,6 @@ static FileReader *quotes = NULL;
 std::string prefix;
 std::string suffix;
 
-/* $ModDesc: Provides random Quotes on Connect. */
-
 /** Handle /RANDQUOTE
  */
 class CommandRandquote : public Command
@@ -46,7 +46,7 @@ class CommandRandquote : public Command
 
 		fsize = quotes->FileSize();
 		str = quotes->GetLine(ServerInstance->GenRandomInt(fsize));
-		user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),prefix.c_str(),str.c_str(),suffix.c_str());
+		user->WriteNotice(prefix + str + suffix);
 
 		return CMD_SUCCESS;
 	}
@@ -54,7 +54,6 @@ class CommandRandquote : public Command
 
 class ModuleRandQuote : public Module
 {
- private:
 	CommandRandquote cmd;
  public:
 	ModuleRandQuote()
@@ -62,7 +61,7 @@ class ModuleRandQuote : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ConfigTag* conf = ServerInstance->Config->ConfValue("randquote");
 
@@ -75,23 +74,22 @@ class ModuleRandQuote : public Module
 		{
 			throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
 		}
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(cmd);
 		Implementation eventlist[] = { I_OnUserConnect };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
-	virtual ~ModuleRandQuote()
+	~ModuleRandQuote()
 	{
 		delete quotes;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides random Quotes on Connect.",VF_VENDOR);
+		return Version("Provides random quotes on connect.",VF_VENDOR);
 	}
 
-	virtual void OnUserConnect(LocalUser* user)
+	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
 	{
 		cmd.Handle(std::vector<std::string>(), user);
 	}