X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=668eea0e5cc0e8a2d1ae8fa83b247b3150c23b9a;hb=3f782d5cad84165d695203977c75d2a3877f4644;hp=67f4bcb95e2b6bfb942b7d16f39ec0cb12dfc1a0;hpb=ab01aaeeee9aed655df2eec2522072233fe3aa57;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 67f4bcb95..668eea0e5 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,130 +1,101 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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/>.
  */
 
-using namespace std;
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/* $ModDesc: Provides random quotes on connect. */
 
-Server *Srv = NULL;
-FileReader *quotes = NULL;
+#include "inspircd.h"
 
-std::string q_file = "";
-std::string prefix = "";
-std::string suffix = "";
+static FileReader *quotes = NULL;
 
-/* $ModDesc: Provides random Quotes on Connect. */
+std::string prefix;
+std::string suffix;
 
-void handle_randquote(char** parameters, int pcntl, userrec *user)
+/** Handle /RANDQUOTE
+ */
+class CommandRandquote : public Command
 {
-	std::string str;
-	int fsize;
-	char buf[MAXBUF];
-	if (quotes)
+ public:
+	CommandRandquote(Module* Creator) : Command(Creator,"RANDQUOTE", 0)
 	{
-		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());
-		Srv->SendServ(user->fd, buf);
 	}
-	return;
-}
-
 
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	{
+		int fsize = quotes->FileSize();
+		if (fsize)
+		{
+			std::string str = quotes->GetLine(ServerInstance->GenRandomInt(fsize));
+			if (!str.empty())
+				user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),prefix.c_str(),str.c_str(),suffix.c_str());
+		}
 
+		return CMD_SUCCESS;
+	}
+};
 
 class ModuleRandQuote : public Module
 {
  private:
-
-	ConfigReader *conf;
+	CommandRandquote cmd;
  public:
 	ModuleRandQuote()
+		: cmd(this)
 	{
-		Srv = new Server;
-		conf = new ConfigReader;
-		// Sort the Randomizer thingie..
-		srand(time(NULL));
+	}
 
-		q_file = conf->ReadValue("randquote","file",0);
-		prefix = conf->ReadValue("randquote","prefix",0);
-		suffix = conf->ReadValue("randquote","suffix",0);
+	void init()
+	{
+		ConfigTag* conf = ServerInstance->Config->ConfValue("randquote");
 
-		if (q_file == "") {
-			log(DEFAULT,"m_randquote: Quotefile not specified - Please check your config.");
-			return;
-                }
+		std::string q_file = conf->getString("file","quotes");
+		prefix = conf->getString("prefix");
+		suffix = conf->getString("suffix");
 
 		quotes = new FileReader(q_file);
-		if(!quotes->Exists())
+		if (!quotes->Exists())
 		{
-			log(DEFAULT,"m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
-			return;
+			throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
 		}
-		/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-		else Srv->AddCommand("QUOTE",handle_randquote,0,0,"m_randquote.so");
+		ServerInstance->Modules->AddService(cmd);
+		Implementation eventlist[] = { I_OnUserConnect };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
-	
+
+
 	virtual ~ModuleRandQuote()
 	{
-		delete Srv;
-		delete conf;
 		delete quotes;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
-		// Make a fake pointer to be passed to handle_randquote()
-		// Dont try this at home kiddies :D
-		char *rar = "RAR";
-		handle_randquote(&rar, 0, user);
+		return Version("Provides random quotes on connect.",VF_VENDOR);
 	}
-};
-
 
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-	ModuleRandQuoteFactory()
-	{
-	}
-	
-	~ModuleRandQuoteFactory()
+	virtual void OnUserConnect(LocalUser* user)
 	{
+		cmd.Handle(std::vector<std::string>(), user);
 	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleRandQuote;
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleRandQuoteFactory;
-}
+MODULE_INIT(ModuleRandQuote)