X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_map.cpp;h=83d969b3ff4bb191cfbda0e2d677f285f83ee455;hb=bd2236348ab57ddb358c770002b75291e2f931bd;hp=e3f103cc82f7b5d8a5bf41b0fcc7b150093e7e79;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;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 e3f103cc8..83d969b3f 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | 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"
@@ -48,7 +56,16 @@ void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, int
 	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;
+
+	if (IS_OPER(user))
+	{
+		w += snprintf(myname + depth, 99 - depth, "%s (%s)", Current->GetName().c_str(), Current->GetID().c_str());
+	}
+	else
+	{
+		w += snprintf(myname + depth, 99 - depth, "%s", Current->GetName().c_str());
+	}
 	memset(myname + w, ' ', 100 - w);
 	if (w > maxnamew)
 		maxnamew = w;
@@ -154,38 +171,22 @@ bool ModuleSpanningTree::HandleMap(const std::vector<std::string>& parameters, U
 		}
 	}
 
-	float avg_users = totusers * 1.0 / totservers;
+	float avg_users = totusers * 1.0 / line;
 
-	// dump the whole lot to the user.
-	if (IS_LOCAL(user))
+	ServerInstance->Logs->Log("map",DEBUG,"local");
+	for (int t = 0; t < line; t++)
 	{
-		ServerInstance->Logs->Log("map",DEBUG,"local");
-		for (int t = 0; t < line; t++)
-		{
-			// terminate the string at maxnamew characters
-			names[100 * t + maxnamew] = '\0';
-			user->WriteNumeric(RPL_MAP, "%s :%s %s",user->nick.c_str(),names + 100 * t, stats + 50 * t);
-		}
-		user->WriteNumeric(RPL_MAPUSERS, "%s :%d server%s and %d user%s, average %.2f users per server",user->nick.c_str(),totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users);
-		user->WriteNumeric(RPL_ENDMAP, "%s :End of /MAP",user->nick.c_str());
+		// terminate the string at maxnamew characters
+		names[100 * t + maxnamew] = '\0';
+		user->SendText(":%s %03d %s :%s %s", ServerInstance->Config->ServerName.c_str(),
+			RPL_MAP, user->nick.c_str(), names + 100 * t, stats + 50 * t);
 	}
-	else
-	{
-		ServerInstance->Logs->Log("map", DEBUG, "remote dump lines=%d", line);
+	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());
 
-		// XXX: annoying that we have to use hardcoded numerics here..
-		for (int t = 0; t < line; t++)
-		{
-			// terminate the string at maxnamew characters
-			char* name = names + 100 * t;
-			char* stat = stats + 50 * t;
-			name[maxnamew] = '\0';
-			ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 006 " + user->nick + " :" + name + " " + stat);
-		}
-
-		ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 270 " + user->nick + " :" + ConvToStr(totservers) + " server"+(totservers > 1 ? "s" : "") + " and " + ConvToStr(totusers) + " user"+(totusers > 1 ? "s" : "") + ", average " + ConvToStr(avg_users) + " users per server");
-		ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 007 " + user->nick + " :End of /MAP");
-	}
 	delete[] names;
 	delete[] stats;