X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistmode.cpp;h=f3b2d5fc57937e93c339c3a077b6fb2aec7219cf;hb=ba8a15adcde58a7db5e00790a55803be9d6d2fda;hp=6b5fb13c59569e165940e04770b35ce5c788369e;hpb=4fbd6681fedbff9b4cb04cc774f785cbe8b5c35b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listmode.cpp b/src/listmode.cpp
index 6b5fb13c5..f3b2d5fc5 100644
--- a/src/listmode.cpp
+++ b/src/listmode.cpp
@@ -1,7 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2018 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -19,11 +22,13 @@
 #include "inspircd.h"
 #include "listmode.h"
 
-ListModeBase::ListModeBase(Module* Creator, const std::string& Name, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag)
-	: ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_LIST),
-	listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy),
-	configtag(ctag)
-	, extItem("listbase_mode_" + name + "_list", ExtensionItem::EXT_CHANNEL, Creator)
+ListModeBase::ListModeBase(Module* Creator, const std::string& Name, char modechar, const std::string& eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy)
+	: ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_LIST)
+	, listnumeric(lnum)
+	, endoflistnumeric(eolnum)
+	, endofliststring(eolstr)
+	, tidy(autotidy)
+	, extItem(name + "_mode_list", ExtensionItem::EXT_CHANNEL, Creator)
 {
 	list = true;
 }
@@ -60,28 +65,35 @@ void ListModeBase::RemoveMode(Channel* channel, Modes::ChangeList& changelist)
 
 void ListModeBase::DoRehash()
 {
-	ConfigTagList tags = ServerInstance->Config->ConfTags(configtag);
-
+	ConfigTagList tags = ServerInstance->Config->ConfTags("maxlist");
 	limitlist newlimits;
-
+	bool seen_default = false;
 	for (ConfigIter i = tags.first; i != tags.second; i++)
 	{
-		// For each <banlist> tag
 		ConfigTag* c = i->second;
-		ListLimit limit(c->getString("chan"), c->getUInt("limit", 0));
+
+		const std::string mname = c->getString("mode");
+		if (!mname.empty() && !stdalgo::string::equalsci(mname, name) && !(mname.length() == 1 && GetModeChar() == mname[0]))
+			continue;
+
+		ListLimit limit(c->getString("chan", "*", 1), c->getUInt("limit", DEFAULT_LIST_SIZE));
 
 		if (limit.mask.empty())
-			throw ModuleException(InspIRCd::Format("<%s:chan> is empty at %s", configtag.c_str(), c->getTagLocation().c_str()));
+			throw ModuleException(InspIRCd::Format("<maxlist:chan> is empty, at %s", c->getTagLocation().c_str()));
 
-		if (limit.limit <= 0)
-			throw ModuleException(InspIRCd::Format("<%s:limit> must be greater than 0, at %s", configtag.c_str(), c->getTagLocation().c_str()));
+		if (limit.mask == "*" || limit.mask == "#*")
+			seen_default = true;
 
 		newlimits.push_back(limit);
 	}
 
-	// Add the default entry. This is inserted last so if the user specifies a
-	// wildcard record in the config it will take precedence over this entry.
-	newlimits.push_back(ListLimit("*", DEFAULT_LIST_SIZE));
+	// If no default limit has been specified then insert one.
+	if (!seen_default)
+	{
+		ServerInstance->Logs->Log("MODE", LOG_DEBUG, "No default <maxlist> entry was found for the %s mode; defaulting to %u",
+			name.c_str(), DEFAULT_LIST_SIZE);
+		newlimits.push_back(ListLimit("*", DEFAULT_LIST_SIZE));
+	}
 
 	// Most of the time our settings are unchanged, so we can avoid iterating the chanlist
 	if (chanlimits == newlimits)
@@ -108,7 +120,7 @@ unsigned int ListModeBase::FindLimit(const std::string& channame)
 			return it->limit;
 		}
 	}
-	return DEFAULT_LIST_SIZE;
+	return 0;
 }
 
 unsigned int ListModeBase::GetLimitInternal(const std::string& channame, ChanData* cd)
@@ -129,13 +141,16 @@ unsigned int ListModeBase::GetLimit(Channel* channel)
 
 unsigned int ListModeBase::GetLowerLimit()
 {
+	if (chanlimits.empty())
+		return DEFAULT_LIST_SIZE;
+
 	unsigned int limit = UINT_MAX;
 	for (limitlist::iterator iter = chanlimits.begin(); iter != chanlimits.end(); ++iter)
 	{
 		if (iter->limit < limit)
 			limit = iter->limit;
 	}
-	return limit == UINT_MAX ? DEFAULT_LIST_SIZE : limit;
+	return limit;
 }
 
 ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
@@ -148,9 +163,6 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std
 		if (tidy)
 			ModeParser::CleanMask(parameter);
 
-		if (parameter.length() > 250)
-			return MODEACTION_DENY;
-
 		// If there was no list
 		if (!cd)
 		{