X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=9a0adc3d6646507b9fa99d6da968f1727d6fb856;hb=8085aa879bd989b526791797910295944a364084;hp=0a9ce3b8f13381dc716ba1e7132ce7c4f2eb5157;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 0a9ce3b8f..9a0adc3d6 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -25,20 +25,20 @@ class ModuleWaitPong : public Module
 	ModuleWaitPong(InspIRCd* Me)
 	 : Module(Me), extenstr("waitpong_pingstr")
 	{
-		OnRehash(NULL,"");
+		OnRehash(NULL);
 		Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash, I_OnUserDisconnect, I_OnCleanup };
 		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
-	
-	virtual void OnRehash(User* user, const std::string &param)
+
+	virtual void OnRehash(User* user)
 	{
 		ConfigReader Conf(ServerInstance);
-		
+
 		sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
-		
+
 		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
 			sendsnotice = true;
-		
+
 		killonbadreply = Conf.ReadFlag("waitpong", "killonbadreply", 0);
 
 		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
@@ -52,33 +52,33 @@ class ModuleWaitPong : public Module
 		for(unsigned int i = 0; i < length; i++)
 			out[i] = ((rand() % 26) + 65);
 		out[length] = '\0';
-	
+
 		return (char*)out;
 	}
-	
+
 	virtual int OnUserRegister(User* user)
 	{
 		char* pingrpl = RandString(10);
-		
+
 		user->Write("PING :%s", pingrpl);
-		
+
 		if(sendsnotice)
-			user->WriteServ("NOTICE %s :*** If you are having problems connecting due to ping timeouts, please type /quote PONG %s or /raw PONG %s now.", user->nick, pingrpl, pingrpl);
-			
+			user->WriteServ("NOTICE %s :*** If you are having problems connecting due to ping timeouts, please type /quote PONG %s or /raw PONG %s now.", user->nick.c_str(), pingrpl, pingrpl);
+
 		user->Extend(extenstr, pingrpl);
 		return 0;
 	}
-	
-	virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User* user, bool validated, const std::string &original_line)
+
+	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User* user, bool validated, const std::string &original_line)
 	{
 		if (command == "PONG")
 		{
 			char* pingrpl;
 			user->GetExt(extenstr, pingrpl);
-			
+
 			if (pingrpl)
 			{
-				if (strcmp(pingrpl, parameters[0]) == 0)
+				if (!parameters.empty() && (strcmp(pingrpl, parameters[0].c_str()) == 0))
 				{
 					delete[] pingrpl;
 					user->Shrink(extenstr);
@@ -87,7 +87,7 @@ class ModuleWaitPong : public Module
 				else
 				{
 					if(killonbadreply)
-						User::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
+						ServerInstance->Users->QuitUser(user, "Incorrect ping reply for registration");
 					return 1;
 				}
 			}
@@ -100,7 +100,7 @@ class ModuleWaitPong : public Module
 		char* pingrpl;
 		return (!user->GetExt(extenstr, pingrpl));
 	}
-	
+
 	virtual void OnUserDisconnect(User* user)
 	{
 		char* pingrpl;
@@ -112,7 +112,7 @@ class ModuleWaitPong : public Module
 			user->Shrink(extenstr);
 		}
 	}
-	
+
 	virtual void OnCleanup(int target_type, void* item)
 	{
 		if (target_type == TYPE_USER)
@@ -120,24 +120,24 @@ class ModuleWaitPong : public Module
 			User* user = (User*)item;
 			char* pingrpl;
 			user->GetExt(extenstr, pingrpl);
-			
+
 			if (pingrpl)
 			{
 				delete[] pingrpl;
 				user->Shrink(extenstr);
-			} 
+			}
 		}
 	}
-	
+
 	virtual ~ModuleWaitPong()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleWaitPong)