Don't globally route SETNAME, the FNAME is sufficient. Fixes bug #875

[user/henk/code/inspircd.git] / include / users.h

diff --git a/include/users.h b/include/users.h
index e723bb434ae6127057c208a7919172813efd661d..7887d545de18bfc870a4e582265b49b1f5159370 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -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.
@@ -386,19 +386,11 @@ class CoreExport VisData
 /** Holds all information about a user
  * This class stores all information about a user connected to the irc server. Everything about a
  * connection is stored here primarily, from the user's socket ID (file descriptor) through to the
- * user's nickname and hostname. Use the FindNick method of the InspIRCd class to locate a specific user
- * by nickname, or the FindDescriptor method of the InspIRCd class to find a specific user by their
- * file descriptor value.
+ * user's nickname and hostname.
  */
 class CoreExport User : public EventHandler
 {
  private:
-       /** Pointer to creator.
-        * This is required to make use of core functions
-        * from within the User class.
-        */
-       InspIRCd* ServerInstance;
-
        /** A list of channels the user has a pending invite to.
         * Upon INVITE channels are added, and upon JOIN, the
         * channels are removed from this list.
@@ -441,6 +433,12 @@ class CoreExport User : public EventHandler
        std::bitset<64> AllowedChanModes;
 
  public:
+       /** Pointer to creator.
+        * This is required to make use of core functions
+        * from within the User class.
+        */
+       InspIRCd* ServerInstance;
+
        /** Contains a pointer to the connect class a user is on from - this will be NULL for remote connections.
         * The pointer is guarenteed to *always* be valid. :)
         */
@@ -681,7 +679,7 @@ class CoreExport User : public EventHandler
         * on the server, in nick!ident&at;host form.
         * @return The full masked host of the user
         */
-       virtual const std::string& GetFullHost();
+       virtual const std::string GetFullHost();
 
        /** Returns the full real host of the user
         * This member function returns the hostname of the user as seen by other users
@@ -689,7 +687,7 @@ class CoreExport User : public EventHandler
         * e.g. through a module, then this method will ignore it and return the true hostname.
         * @return The full real host of the user
         */
-       virtual const std::string& GetFullRealHost();
+       virtual const std::string GetFullRealHost();
 
        /** This clears any cached results that are used for GetFullRealHost() etc.
         * The results of these calls are cached as generating them can be generally expensive.