X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=503156eef73721c161e9c992f59e0e5865d512ec;hb=d185decae97752368d5cf62311cbc0d1a52aa22c;hp=b030b43050337fbeabed10663cea16ba059869cc;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index b030b4305..503156eef 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -31,7 +31,7 @@ class CommandRandquote : public Command
 		this->source = "m_randquote.so";
 	}
 
-	CmdResult Handle (const char* const* parameters, int pcntl, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		std::string str;
 		int fsize;
@@ -40,11 +40,11 @@ class CommandRandquote : public Command
 		{
 			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());
+			user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),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);
+			user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick.c_str());
 			return CMD_FAILURE;
 		}
 
@@ -61,7 +61,7 @@ class ModuleRandQuote : public Module
 	ModuleRandQuote(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		conf = new ConfigReader(ServerInstance);
 		// Sort the Randomizer thingie..
 		srand(time(NULL));
@@ -74,15 +74,13 @@ class ModuleRandQuote : public Module
 
 		if (q_file.empty())
 		{
-			CoreException 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())
 		{
-			CoreException 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
 		{
@@ -94,22 +92,22 @@ class ModuleRandQuote : public Module
 		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	
+
 	virtual ~ModuleRandQuote()
 	{
 		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);
 	}
 };