X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_map.cpp;h=72128a1c390ae1ed01788f83fdd1a86d2f36a93d;hb=b390ded3f3924cbd16a5dab53a981be279360124;hp=9a7f007e39f17fb8dae83ec2b903ff366ae58325;hpb=0377d937c5d1bf20fa0c29d4a41c7fd89502ab38;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 9a7f007e3..72128a1c3 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -1,26 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *	  the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $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)
 {
@@ -30,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)
@@ -40,31 +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 + snprintf(myname + depth, 99 - depth, "%s (%s)", Current->GetName().c_str(), Current->GetID().c_str());
+	int w = depth;
+
+	std::string servername = Current->GetName();
+	if (user->IsOper())
+	{
+		w += snprintf(myname + depth, 99 - depth, "%s (%s)", servername.c_str(), Current->GetID().c_str());
+	}
+	else
+	{
+		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);
@@ -154,20 +169,20 @@ bool ModuleSpanningTree::HandleMap(const std::vector<std::string>& parameters, U
 		}
 	}
 
-	float avg_users = totusers * 1.0 / totservers;
+	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
 		names[100 * t + maxnamew] = '\0';
-		ServerInstance->DumpText(user, ":%s %d %s :%s %s", ServerInstance->Config->ServerName,
+		user->SendText(":%s %03d %s :%s %s", ServerInstance->Config->ServerName.c_str(),
 			RPL_MAP, user->nick.c_str(), names + 100 * t, stats + 50 * t);
 	}
-	ServerInstance->DumpText(user, ":%s %d %s :%d server%s and %d user%s, average %.2f users per server",
-		ServerInstance->Config->ServerName, RPL_MAPUSERS, user->nick.c_str(),
-		totservers, (totservers > 1 ? "s" : ""), totusers, (totusers > 1 ? "s" : ""), avg_users);
-	ServerInstance->DumpText(user, ":%s %d %s :End of /MAP", ServerInstance->Config->ServerName,
+	user->SendText(":%s %03d %s :%d server%s and %d user%s, average %.2f users per server",
+		ServerInstance->Config->ServerName.c_str(), RPL_MAPUSERS, user->nick.c_str(),
+		line, (line > 1 ? "s" : ""), totusers, (totusers > 1 ? "s" : ""), avg_users);
+	user->SendText(":%s %03d %s :End of /MAP", ServerInstance->Config->ServerName.c_str(),
 		RPL_ENDMAP, user->nick.c_str());
 
 	delete[] names;