X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=38c11ff959a110dcf80aee6cf8501d3b6dba0b0d;hb=bc344671460c1675fbc31504fd1ffc03ff58a135;hp=e4cb70a76502592b52d1f260b15e2a99ddaa2cdc;hpb=b669f920eaa9fb795d0a103d724943898a0df4b2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index e4cb70a76..38c11ff95 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -31,7 +31,7 @@ class CommandRandquote : public Command
 		this->source = "m_randquote.so";
 	}
 
-	CmdResult Handle (const char** parameters, int pcntl, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		std::string str;
 		int fsize;
@@ -52,23 +52,6 @@ class CommandRandquote : public Command
 	}
 };
 
-/** Thrown by m_randquote
- */
-class RandquoteException : public ModuleException
-{
- private:
-	const std::string err;
- public:
-	RandquoteException(const std::string &message) : err(message) { }
-
-	~RandquoteException() throw () { }
-
-	virtual const char* GetReason()
-	{
-		return err.c_str();
-	}
-};
-
 class ModuleRandQuote : public Module
 {
  private:
@@ -91,15 +74,13 @@ class ModuleRandQuote : public Module
 
 		if (q_file.empty())
 		{
-			RandquoteException e("m_randquote: Quotefile not specified - Please check your config.");
-			throw(e);
+			throw ModuleException("m_randquote: Quotefile not specified - Please check your config.");
 		}
 
 		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);
+			throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
 		}
 		else
 		{
@@ -107,28 +88,26 @@ class ModuleRandQuote : public Module
 			mycommand = new CommandRandquote(ServerInstance);
 			ServerInstance->AddCommand(mycommand);
 		}
+		Implementation eventlist[] = { I_OnUserConnect };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserConnect] = 1;
-	}
 	
 	virtual ~ModuleRandQuote()
 	{
-		DELETE(conf);
-		DELETE(quotes);
+		delete conf;
+		delete quotes;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 	virtual void OnUserConnect(User* user)
 	{
 		if (mycommand)
-			mycommand->Handle(NULL, 0, user);
+			mycommand->Handle(std::vector<std::string>(), user);
 	}
 };