Replace all internal references to uline with services.

8 files changed, 19 insertions, 19 deletions

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 0bb80a0f5..2a3933a46 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -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->HideServices) && (server->IsULine())))
+		if ((server->Hidden) || ((Utils->HideServices) && (server->IsService())))
 		{
 			if (user->IsOper())
 			{
@@ -135,8 +135,8 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
 			ShowLinks(server, user, hops+1);
 		}
 	}
-	/* Don't display the line if its a uline, hide ulines is on, and the user isn't an oper */
-	if ((Utils->HideServices) && (Current->IsULine()) && (!user->IsOper()))
+	/* Don't display the line if its a service, hide services is on, and the user isn't an oper */
+	if ((Utils->HideServices) && (Current->IsService()) && (!user->IsOper()))
 		return;
 	/* Or if the server is hidden and they're not an oper */
 	else if ((Current->Hidden) && (!user->IsOper()))
@@ -572,9 +572,9 @@ void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const
 	{
 		// Hide the message if one of the following is true:
 		// - User is being quit due to a netsplit and quietbursts is on
-		// - Server is a silent uline
+		// - User is on a silent services server
 		TreeServer* server = TreeServer::Get(user);
-		bool hide = (((server->IsDead()) && (Utils->quiet_bursts)) || (server->IsSilentULine()));
+		bool hide = (((server->IsDead()) && (Utils->quiet_bursts)) || (server->IsSilentService()));
 		if (!hide)
 		{
 			ServerInstance->SNO.WriteToSnoMask('Q', "Client exiting on server %s: %s (%s) [%s]",
diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 986d35dc7..24e818397 100644
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -49,11 +49,11 @@ CmdResult CommandOpertype::HandleRemote(RemoteUser* u, CommandBase::Params& para
 	if (Utils->quiet_bursts)
 	{
 		/*
-		 * If quiet bursts are enabled, and server is bursting or silent uline (i.e. services),
+		 * If quiet bursts are enabled, and server is bursting or a silent services server
 		 * then do nothing. -- w00t
 		 */
 		TreeServer* remoteserver = TreeServer::Get(u);
-		if (remoteserver->IsBehindBursting() || remoteserver->IsSilentULine())
+		if (remoteserver->IsBehindBursting() || remoteserver->IsSilentService())
 			return CmdResult::SUCCESS;
 	}
 
diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 86c2fba39..3be35e9ef 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -46,7 +46,7 @@ static inline bool IsHidden(User* user, TreeServer* server)
 	{
 		if (server->Hidden)
 			return true;
-		if (Utils->HideServices && server->IsULine())
+		if (Utils->HideServices && server->IsService())
 			return true;
 	}
 
diff --git a/src/modules/m_spanningtree/tags.cpp b/src/modules/m_spanningtree/tags.cpp
index e4eca54c8..e02235afb 100644
--- a/src/modules/m_spanningtree/tags.cpp
+++ b/src/modules/m_spanningtree/tags.cpp
@@ -28,7 +28,7 @@ ServiceTag::ServiceTag(Module* mod)
 void ServiceTag::OnPopulateTags(ClientProtocol::Message& msg)
 {
 	User* const user = msg.GetSourceUser();
-	if (user && user->server->IsULine())
+	if (user && user->server->IsService())
 		msg.AddTag("inspircd.org/service", this, "");
 }
 
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 80e46f210..ca9773fde 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -68,7 +68,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
 	, Hidden(Hide)
 {
 	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "New server %s behind_bursting %u", GetName().c_str(), behind_bursting);
-	CheckULine();
+	CheckService();
 
 	ServerInstance->Timers.AddTimer(&pingtimer);
 
@@ -238,9 +238,9 @@ unsigned int TreeServer::QuitUsers(const std::string& reason)
 	return original_size - users.size();
 }
 
-void TreeServer::CheckULine()
+void TreeServer::CheckService()
 {
-	uline = silentuline = false;
+	service = silentservice = false;
 
 	for (auto& [_, tag] : ServerInstance->Config->ConfTags("service", ServerInstance->Config->ConfTags("uline")))
 	{
@@ -249,12 +249,12 @@ void TreeServer::CheckULine()
 		{
 			if (this->IsRoot())
 			{
-				ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Servers should not uline themselves (at " + tag->source.str() + ")");
+				ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Servers should not mark themselves as a service (at " + tag->source.str() + ")");
 				return;
 			}
 
-			uline = true;
-			silentuline = tag->getBool("silent");
+			service = true;
+			silentservice = tag->getBool("silent");
 			break;
 		}
 	}
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 1e7c30a1a..7a14b2373 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -206,9 +206,9 @@ class TreeServer : public Server
 	/** Recursive call for child servers */
 	void FinishBurstInternal();
 
-	/** (Re)check the uline state of this server
+	/** (Re)check the service state of this server
 	 */
-	void CheckULine();
+	void CheckService();
 
 	/** Get the bursting state of this server
 	 * @return True if this server is bursting, false if it isn't
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 36a62caad..1a53b8bc4 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -126,7 +126,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
 
 	bool dosend = true;
 
-	if ((Utils->quiet_bursts && remoteserver->IsBehindBursting()) || _new->server->IsSilentULine())
+	if ((Utils->quiet_bursts && remoteserver->IsBehindBursting()) || _new->server->IsSilentService())
 		dosend = false;
 
 	if (dosend)
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 5f7be9a5a..41451cc05 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -330,7 +330,7 @@ void SpanningTreeUtilities::ReadConfiguration()
 	}
 
 	for (server_hash::const_iterator i = serverlist.begin(); i != serverlist.end(); ++i)
-		i->second->CheckULine();
+		i->second->CheckService();
 
 	RefreshIPCache();
 }