X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=0155492fc4829a3c5bb7dcafa2cfc943a55108fa;hb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;hp=4adfc001170f44ecb831a007eff038b10084557c;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 4adfc0011..0155492fc 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -11,10 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd.h" 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "wildcard.h"
 
 /** Holds a users m_safelist state
@@ -51,7 +48,7 @@ class ModuleSafeList : public Module
 	{
 	}
 
-	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);
@@ -74,7 +71,7 @@ class ModuleSafeList : public Module
 	 * 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** 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)
@@ -91,11 +88,11 @@ class ModuleSafeList : public Module
 	 * HandleList()
 	 *   Handle (override) the LIST command.
 	 */
-	int HandleList(const char** parameters, int pcnt, userrec* user)
+	int HandleList(const char** parameters, int pcnt, User* user)
 	{
 		int minusers = 0, maxusers = 0;
 
-		if (global_listing >= LimitList)
+		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);
@@ -142,7 +139,7 @@ class ModuleSafeList : public Module
 				return 1;
 			}
 
-			DELETE(last_list_time);
+			delete last_list_time;
 			user->Shrink("safelist_last");
 		}
 
@@ -164,13 +161,13 @@ class ModuleSafeList : public Module
 		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;
+			Channel* chan = NULL;
 			long amount_sent = 0;
 			do
 			{
@@ -220,11 +217,11 @@ class ModuleSafeList : public Module
 				}
 				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");
-				DELETE(ld);
+				delete ld;
 				global_listing--;
 			}
 		}
@@ -234,20 +231,20 @@ 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)
 			{
 				u->Shrink("safelist_cache");
-				DELETE(ld);
+				delete ld;
 				global_listing--;
 			}
 			time_t* last_list_time;
 			u->GetExt("safelist_last", last_list_time);
 			if (last_list_time)
 			{
-				DELETE(last_list_time);
+				delete last_list_time;
 				u->Shrink("safelist_last");
 			}
 		}
@@ -258,7 +255,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);
 	}