Rename <security:hideulines> to <security:hideservices>.

This commit is contained in:
Sadie Powell 2021-01-30 13:24:05 +00:00
parent 589c4b80f4
commit 61f3f350f2
5 changed files with 7 additions and 7 deletions

View File

@ -729,9 +729,9 @@
# higher ranked users. This is the recommended setting.
announceinvites="dynamic"
# hideulines: If this value is set to yes, U-lined servers will
# hideservices: If this value is set to yes, services servers will
# be hidden from non-opers in /LINKS and /MAP.
hideulines="no"
hideservices="no"
# flatlinks: If this value is set to yes, /MAP and /LINKS will
# be flattened when shown to non-opers.

View File

@ -123,7 +123,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
{
TreeServer* server = *i;
if ((server->Hidden) || ((Utils->HideULines) && (server->IsULine())))
if ((server->Hidden) || ((Utils->HideServices) && (server->IsULine())))
{
if (user->IsOper())
{
@ -136,7 +136,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
}
}
/* Don't display the line if its a uline, hide ulines is on, and the user isn't an oper */
if ((Utils->HideULines) && (Current->IsULine()) && (!user->IsOper()))
if ((Utils->HideServices) && (Current->IsULine()) && (!user->IsOper()))
return;
/* Or if the server is hidden and they're not an oper */
else if ((Current->Hidden) && (!user->IsOper()))

View File

@ -46,7 +46,7 @@ static inline bool IsHidden(User* user, TreeServer* server)
{
if (server->Hidden)
return true;
if (Utils->HideULines && server->IsULine())
if (Utils->HideServices && server->IsULine())
return true;
}

View File

@ -240,7 +240,7 @@ void SpanningTreeUtilities::ReadConfiguration()
auto security = ServerInstance->Config->ConfValue("security");
auto options = ServerInstance->Config->ConfValue("options");
FlatLinks = security->getBool("flatlinks");
HideULines = security->getBool("hideulines");
HideServices = security->getBool("hideservices", security->getBool("hideulines"));
HideSplits = security->getBool("hidesplits");
AnnounceTSChange = options->getBool("announcets");
AllowOptCommon = options->getBool("allowmismatch");

View File

@ -67,7 +67,7 @@ class SpanningTreeUtilities : public classbase
/** Hide U-Lined servers in /MAP and /LINKS
*/
bool HideULines;
bool HideServices;
/** Announce TS changes to channels on merge
*/
bool AnnounceTSChange;