X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=08de8876d7bcda03e590b5cfc963ba3d66a0cbe2;hb=1383dba43e463f292aea094d01f62f355946049d;hp=71d54ce632a4a2db47e8f395f379e4d20731eb6f;hpb=270f1f8d19779a20231a4228286da5e5bf8b2be9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 71d54ce63..08de8876d 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -24,7 +24,7 @@ using namespace std;
 #include "modules.h"
 #include "helperfuncs.h"
 
-Server *Srv = NULL;
+Server *Srv;
 FileReader *quotes = NULL;
 
 std::string q_file = "";
@@ -33,38 +33,46 @@ std::string suffix = "";
 
 /* $ModDesc: Provides random Quotes on Connect. */
 
-void handle_randquote(char** parameters, int pcntl, userrec *user)
+class cmd_randquote : public command_t
 {
-	std::string str;
-	int fsize;
-	char buf[MAXBUF];
-	if (q_file == "" || quotes->Exists())
+ public:
+	cmd_randquote () : command_t("RANDQUOTE", 0, 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);
+		this->source = "m_randquote.so";
 	}
-	else
+
+	void Handle (char** parameters, int pcntl, userrec *user)
 	{
-		sprintf(buf, "NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
-		Srv->SendServ(user->fd, buf);
+		std::string str;
+		int fsize;
+		char buf[MAXBUF];
+		if (q_file == "" || quotes->Exists())
+		{
+			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);
+		}
+		else
+		{
+			sprintf(buf, "NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick);
+			Srv->SendServ(user->fd, buf);
+		}
+		return;
 	}
-	return;
-}
-
-
+};
 
 
 class ModuleRandQuote : public Module
 {
  private:
-
+	cmd_randquote* mycommand;
 	ConfigReader *conf;
  public:
-	ModuleRandQuote()
+	ModuleRandQuote(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
+		Srv = Me;
 		conf = new ConfigReader;
 		// Sort the Randomizer thingie..
 		srand(time(NULL));
@@ -73,6 +81,8 @@ class ModuleRandQuote : public Module
 		prefix = conf->ReadValue("randquote","prefix",0);
 		suffix = conf->ReadValue("randquote","suffix",0);
 
+		mycommand = NULL;
+
 		if (q_file == "")
 		{
 			log(DEFAULT,"m_randquote: Quotefile not specified - Please check your config.");
@@ -85,13 +95,21 @@ class ModuleRandQuote : public Module
 			log(DEFAULT,"m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
 			return;
 		}
-		/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-		else Srv->AddCommand("QUOTE",handle_randquote,0,0,"m_randquote.so");
+		else
+		{
+			/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
+			mycommand = new cmd_randquote();
+			Srv->AddCommand(mycommand);
+		}
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnUserConnect] = 1;
 	}
 	
 	virtual ~ModuleRandQuote()
 	{
-		delete Srv;
 		delete conf;
 		delete quotes;
 	}
@@ -103,11 +121,8 @@ class ModuleRandQuote : public Module
 	
 	virtual void OnUserConnect(userrec* user)
 	{
-		// Make a fake pointer to be passed to handle_randquote()
-		// Dont try this at home kiddies :D
-		/* Or do things a slightly nicer way, and pass NULL */
-		//char *rar = "RAR";
-		handle_randquote(NULL, 0, user);
+		if (mycommand)
+			mycommand->Handle(NULL, 0, user);
 	}
 };
 
@@ -123,9 +138,9 @@ class ModuleRandQuoteFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleRandQuote;
+		return new ModuleRandQuote(Me);
 	}
 	
 };