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

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 40b8d1b0f..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
@@ -42,13 +42,15 @@ class ModuleSafeList : public Module
 	ModuleSafeList(InspIRCd* Me) : Module(Me)
 	{
 		OnRehash(NULL, "");
+		Implementation eventlist[] = { I_OnBufferFlushed, I_OnPreCommand, I_OnCleanup, I_OnUserQuit, I_On005Numeric, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
  
 	virtual ~ModuleSafeList()
 	{
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader MyConf(ServerInstance);
 		ThrottleSecs = MyConf.ReadInteger("safelist", "throttle", "60", 0, true);
@@ -59,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, userrec *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)
@@ -88,15 +86,15 @@ class ModuleSafeList : public Module
 	 * HandleList()
 	 *   Handle (override) the LIST command.
 	 */
-	int HandleList(const char** parameters, int pcnt, userrec* 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;
 		}
 
@@ -116,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;
 			}
 		}
@@ -134,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;
 			}
 
@@ -154,21 +152,21 @@ 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++;
 
 		return 1;
 	}
 
-	virtual void OnBufferFlushed(userrec* user)
+	virtual void OnBufferFlushed(User* user)
 	{
 		char buffer[MAXBUF];
 		ListData* ld;
 		if (user->GetExt("safelist_cache", ld))
 		{
-			chanrec* chan = NULL;
-			long amount_sent = 0;
+			Channel* chan = NULL;
+			unsigned long amount_sent = 0;
 			do
 			{
 				chan = ServerInstance->GetChannelIndex(ld->list_position);
@@ -211,13 +209,13 @@ 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);
 						}
 					}
 				}
 				ld->list_position++;
 			}
-			while ((chan != NULL) && (amount_sent < (user->sendqmax / 4)));
+			while ((chan != NULL) && (amount_sent < (user->MyClass->GetSendqMax() / 4)));
 			if (ld->list_ended)
 			{
 				user->Shrink("safelist_cache");
@@ -231,7 +229,7 @@ class ModuleSafeList : public Module
 	{
 		if(target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)item;
+			User* u = (User*)item;
 			ListData* ld;
 			u->GetExt("safelist_cache", ld);
 			if (ld)
@@ -255,7 +253,7 @@ class ModuleSafeList : public Module
 		output.append(" SAFELIST");
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
 	{
 		this->OnCleanup(TYPE_USER,user);
 	}