X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=82bd87a56bacb798bd7c9d788c39929d6df03798;hb=0898f10f75bcd8ecde21c73da90955f95dc30e50;hp=3e739cc742ffa669b30956460095e9ef15aa9a14;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 3e739cc74..82bd87a56 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.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
@@ -61,19 +61,15 @@ class ModuleSafeList : public Module
  
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
 	}
  
-	void Implements(char* List)
-	{
-		List[I_OnBufferFlushed] = List[I_OnPreCommand] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnRehash] = 1;
-	}
 
 	/*
 	 * OnPreCommand()
 	 *   Intercept the LIST command.
 	 */ 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
@@ -90,15 +86,15 @@ class ModuleSafeList : public Module
 	 * HandleList()
 	 *   Handle (override) the LIST command.
 	 */
-	int HandleList(const char** parameters, int pcnt, User* user)
+	int HandleList(const char* const* parameters, int pcnt, User* user)
 	{
 		int minusers = 0, maxusers = 0;
 
 		if (global_listing >= LimitList && !IS_OPER(user))
 		{
 			user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick);
-			user->WriteServ("321 %s Channel :Users Name",user->nick);
-			user->WriteServ("323 %s :End of channel list.",user->nick);
+			user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+			user->WriteNumeric(323, "%s :End of channel list.",user->nick);
 			return 1;
 		}
 
@@ -118,13 +114,13 @@ class ModuleSafeList : public Module
 			if (*parameters[0] == '<')
 			{
 				maxusers = atoi(parameters[0]+1);
-				ServerInstance->Log(DEBUG,"Max users: %d", maxusers);
+				ServerInstance->Logs->Log("m_safelist",DEBUG,"Max users: %d", maxusers);
 				pcnt = 0;
 			}
 			else if (*parameters[0] == '>')
 			{
 				minusers = atoi(parameters[0]+1);
-				ServerInstance->Log(DEBUG,"Min users: %d", minusers);
+				ServerInstance->Logs->Log("m_safelist",DEBUG,"Min users: %d", minusers);
 				pcnt = 0;
 			}
 		}
@@ -136,8 +132,8 @@ class ModuleSafeList : public Module
 			if (ServerInstance->Time() < (*last_list_time)+ThrottleSecs)
 			{
 				user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick);
-				user->WriteServ("321 %s Channel :Users Name",user->nick);
-				user->WriteServ("323 %s :End of channel list.",user->nick);
+				user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+				user->WriteNumeric(323, "%s :End of channel list.",user->nick);
 				return 1;
 			}
 
@@ -156,7 +152,7 @@ class ModuleSafeList : public Module
 		*llt = ServerInstance->Time();
 		user->Extend("safelist_last", llt);
 
-		user->WriteServ("321 %s Channel :Users Name",user->nick);
+		user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
 
 		global_listing++;
 
@@ -213,7 +209,7 @@ class ModuleSafeList : public Module
 						if (!ld->list_ended)
 						{
 							ld->list_ended = true;
-							user->WriteServ("323 %s :End of channel list.",user->nick);
+							user->WriteNumeric(323, "%s :End of channel list.",user->nick);
 						}
 					}
 				}