X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=8b9ffd6e9a966ac08970dff0848b5b7f831c6129;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=bcf98b5f35e143db2edf54385a8e4e0e9932a3de;hpb=855f0d98e90a077f46b456e98ebb8a9b290488f6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index bcf98b5f3..8b9ffd6e9 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,165 +1,63 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- 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.
- * 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 "users.h"
-#include "channels.h"
-#include "modules.h"
+/* $ModDesc: Provides random quotes on connect. */
 
 #include "inspircd.h"
 
-
-static FileReader *quotes = NULL;
-
-std::string q_file = "";
-std::string prefix = "";
-std::string suffix = "";
-
-/* $ModDesc: Provides random Quotes on Connect. */
-
-/** Handle /RANDQUOTE
- */
-class cmd_randquote : public command_t
-{
- public:
- cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
-	{
-		this->source = "m_randquote.so";
-	}
-
-	CmdResult Handle (const char** parameters, int pcntl, userrec *user)
-	{
-		std::string str;
-		int fsize;
-
-		if (q_file == "" || quotes->Exists())
-		{
-			fsize = quotes->FileSize();
-			str = quotes->GetLine(rand() % fsize);
-			user->WriteServ("NOTICE %s :%s%s%s",user->nick,prefix.c_str(),str.c_str(),suffix.c_str());
-		}
-		else
-		{
-			user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
-			return CMD_FAILURE;
-		}
-		return CMD_SUCCESS;
-	}
-};
-
-/** Thrown by m_randquote
- */
-class RandquoteException : public ModuleException
-{
- private:
-	std::string err;
- public:
-	RandquoteException(std::string message) : err(message) { }
-
-	virtual const char* GetReason()
-	{
-		return (char*)err.c_str();
-	}
-};
-
 class ModuleRandQuote : public Module
 {
  private:
-	cmd_randquote* mycommand;
-	ConfigReader *conf;
+	std::string prefix;
+	std::string suffix;
+	std::vector<std::string> quotes;
+
  public:
-	ModuleRandQuote(InspIRCd* Me)
-		: Module::Module(Me)
+	void init() CXX11_OVERRIDE
 	{
-		
-		conf = new ConfigReader(ServerInstance);
-		// 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);
-
-		mycommand = NULL;
+		ConfigTag* conf = ServerInstance->Config->ConfValue("randquote");
+		prefix = conf->getString("prefix");
+		suffix = conf->getString("suffix");
+		FileReader reader(conf->getString("file", "quotes"));
+		quotes = reader.GetVector();
 
-		if (q_file == "")
-		{
-			RandquoteException e("m_randquote: Quotefile not specified - Please check your config.");
-			throw(e);
-		}
-
-		quotes = new FileReader(ServerInstance, q_file);
-		if(!quotes->Exists())
-		{
-			RandquoteException e("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
-			throw(e);
-		}
-		else
-		{
-			/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-			mycommand = new cmd_randquote(ServerInstance);
-			ServerInstance->AddCommand(mycommand);
-		}
+		Implementation eventlist[] = { I_OnUserConnect };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserConnect] = 1;
-	}
-	
-	virtual ~ModuleRandQuote()
-	{
-		DELETE(conf);
-		DELETE(quotes);
-	}
-	
-	virtual Version GetVersion()
+	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
 	{
-		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
-		if (mycommand)
-			mycommand->Handle(NULL, 0, user);
+		if (!quotes.empty())
+		{
+			unsigned long random = ServerInstance->GenRandomInt(quotes.size());
+			user->WriteNotice(prefix + quotes[random] + suffix);
+		}
 	}
-};
-
 
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-	ModuleRandQuoteFactory()
-	{
-	}
-	
-	~ModuleRandQuoteFactory()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides random quotes on connect.", VF_VENDOR);
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRandQuote(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleRandQuoteFactory;
-}
+MODULE_INIT(ModuleRandQuote)