X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_map.cpp;h=123a837184ea911f2c9f2e90d78df385ca27349b;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=83d969b3ff4bb191cfbda0e2d677f285f83ee455;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 83d969b3f..123a83718 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -19,16 +19,13 @@
  */
 
 
-/* $ModDesc: Provides a spanning tree server link protocol */
-
 #include "inspircd.h"
 
 #include "main.h"
 #include "utils.h"
 #include "treeserver.h"
-#include "treesocket.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h */
 
 const std::string ModuleSpanningTree::MapOperInfo(TreeServer* Current)
 {
@@ -38,7 +35,7 @@ const std::string ModuleSpanningTree::MapOperInfo(TreeServer* Current)
 
 void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, int &line, char* names, int &maxnamew, char* stats)
 {
-	ServerInstance->Logs->Log("map",DEBUG,"ShowMap depth %d on line %d", depth, line);
+	ServerInstance->Logs->Log("map",LOG_DEBUG,"ShowMap depth %d on line %d", depth, line);
 	float percent;
 
 	if (ServerInstance->Users->clientlist->size() == 0)
@@ -48,40 +45,41 @@ void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, int
 	}
 	else
 	{
-		percent = Current->GetUserCount() * 100.0 / ServerInstance->Users->clientlist->size();
+		percent = Current->UserCount * 100.0 / ServerInstance->Users->clientlist->size();
 	}
 
-	const std::string operdata = IS_OPER(user) ? MapOperInfo(Current) : "";
+	const std::string operdata = user->IsOper() ? MapOperInfo(Current) : "";
 
 	char* myname = names + 100 * line;
 	char* mystat = stats + 50 * line;
 	memset(myname, ' ', depth);
 	int w = depth;
 
-	if (IS_OPER(user))
+	std::string servername = Current->GetName();
+	if (user->IsOper())
 	{
-		w += snprintf(myname + depth, 99 - depth, "%s (%s)", Current->GetName().c_str(), Current->GetID().c_str());
+		w += snprintf(myname + depth, 99 - depth, "%s (%s)", servername.c_str(), Current->GetID().c_str());
 	}
 	else
 	{
-		w += snprintf(myname + depth, 99 - depth, "%s", Current->GetName().c_str());
+		w += snprintf(myname + depth, 99 - depth, "%s", servername.c_str());
 	}
 	memset(myname + w, ' ', 100 - w);
 	if (w > maxnamew)
 		maxnamew = w;
-	snprintf(mystat, 49, "%5d [%5.2f%%]%s", Current->GetUserCount(), percent, operdata.c_str());
+	snprintf(mystat, 49, "%5d [%5.2f%%]%s", Current->UserCount, percent, operdata.c_str());
 
 	line++;
 
-	if (IS_OPER(user) || !Utils->FlatLinks)
+	if (user->IsOper() || !Utils->FlatLinks)
 		depth = depth + 2;
 	for (unsigned int q = 0; q < Current->ChildCount(); q++)
 	{
 		TreeServer* child = Current->GetChild(q);
-		if (!IS_OPER(user)) {
+		if (!user->IsOper()) {
 			if (child->Hidden)
 				continue;
-			if ((Utils->HideULines) && (ServerInstance->ULine(child->GetName().c_str())))
+			if ((Utils->HideULines) && (ServerInstance->ULine(child->GetName())))
 				continue;
 		}
 		ShowMap(child, user, depth, line, names, maxnamew, stats);
@@ -173,7 +171,7 @@ bool ModuleSpanningTree::HandleMap(const std::vector<std::string>& parameters, U
 
 	float avg_users = totusers * 1.0 / line;
 
-	ServerInstance->Logs->Log("map",DEBUG,"local");
+	ServerInstance->Logs->Log("map",LOG_DEBUG,"local");
 	for (int t = 0; t < line; t++)
 	{
 		// terminate the string at maxnamew characters