Fix a regression from fcb51634669e6ed588e42f2072c6f910e267126f ("fix uid collision...

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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 5be7c2614836b86834b26f8b738f6d8b02ed401c..473fd6adc65a7a2a133c4740238dbbb2a7e1f533 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -84,9 +84,10 @@ class ModuleShowwhois : public Module
                                return;
 
                        std::string wmsg = "*** ";
-                       wmsg += source->nick + "(" + source->ident + "@";
+                       wmsg += source->nick + " (" + source->ident + "@";
 
-                       if (dest->HasPrivPermission("users/auspex"))
+                       /* XXX HasPrivPermission doesn't work correctly for remote users */
+                       if (IS_LOCAL(dest) && dest->HasPrivPermission("users/auspex"))
                        {
                                wmsg += source->host;
                        }
@@ -103,7 +104,7 @@ class ModuleShowwhois : public Module
                        }
                        else
                        {
-                               std::string msg = std::string(":") + dest->server + " NOTICE " + dest->nick + " :" + wmsg;
+                               std::string msg = std::string("::") + dest->server + " NOTICE " + dest->nick + " :" + wmsg;
                                ServerInstance->PI->PushToClient(dest, msg);
                        }
                }