Fix typo.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / override_map.cpp

diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 9a7f007e39f17fb8dae83ec2b903ff366ae58325..8e3db116966b466b35fe8d761a0d101bfc1f8b23 100644 (file)
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -48,7 +48,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,20 +163,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");
        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;