X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=d8a2b843145e1a94d267a6522d0845a7ae553963;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=aebf7c0ad9a426247ea9c61be1587f4bfbc1964a;hpb=73b9d0c5cb02f0ea8350de28bc3687e0af70ea0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index aebf7c0ad..d8a2b8431 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,89 +1,98 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2003, 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2005 Craig McLure <craig@chatspike.net>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
+/* $ModDesc: Provides random quotes on connect. */
 
-/* $ModDesc: Provides random Quotes on Connect. */
+#include "inspircd.h"
 
-class ModuleRandQuote : public Module
-{
- private:
+static FileReader *quotes = NULL;
 
-	 Server *Srv;
-	 ConfigReader *conf;
-	 FileReader *quotes;
+std::string prefix;
+std::string suffix;
 
-	 string q_file;
-	 string prefix;
-	 string suffix;
-	 
+/** Handle /RANDQUOTE
+ */
+class CommandRandquote : public Command
+{
  public:
-	ModuleRandQuote()
+	CommandRandquote(Module* Creator) : Command(Creator,"RANDQUOTE", 0)
 	{
-		Srv = new Server;
-		conf = new ConfigReader;
-
-		q_file = conf->ReadValue("randquote","file",0);
-		prefix = conf->ReadValue("randquote","prefix",0);
-		suffix = conf->ReadValue("randquote","suffix",0);
-
-		quotes = new FileReader(q_file);
 	}
-	
-	virtual ~ModuleRandQuote()
-	{
-		delete Srv;
-		delete conf;
-		delete quotes;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
+
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		string str;
+		std::string str;
 		int fsize;
-		char buf[MAXBUF];
 
 		fsize = quotes->FileSize();
-		srand(time(NULL));
-		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);
-		return;
+		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());
+
+		return CMD_SUCCESS;
 	}
 };
 
-
-class ModuleRandQuoteFactory : public ModuleFactory
+class ModuleRandQuote : public Module
 {
+	CommandRandquote cmd;
  public:
-	ModuleRandQuoteFactory()
+	ModuleRandQuote()
+		: cmd(this)
 	{
 	}
-	
-	~ModuleRandQuoteFactory()
+
+	void init()
 	{
+		ConfigTag* conf = ServerInstance->Config->ConfValue("randquote");
+
+		std::string q_file = conf->getString("file","quotes");
+		prefix = conf->getString("prefix");
+		suffix = conf->getString("suffix");
+
+		quotes = new FileReader(q_file);
+		if (!quotes->Exists())
+		{
+			throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
+		}
+		ServerInstance->Modules->AddService(cmd);
+		Implementation eventlist[] = { I_OnUserConnect };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual ~ModuleRandQuote()
 	{
-		return new ModuleRandQuote;
+		delete quotes;
 	}
-	
-};
 
+	virtual Version GetVersion()
+	{
+		return Version("Provides random quotes on connect.",VF_VENDOR);
+	}
 
-extern "C" void * init_module( void )
-{
-	return new ModuleRandQuoteFactory;
-}
+	virtual void OnUserConnect(LocalUser* user)
+	{
+		cmd.Handle(std::vector<std::string>(), user);
+	}
+};
 
+MODULE_INIT(ModuleRandQuote)