Fix double dot in half-cloaked resolved hosts

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

diff --git a/include/users.h b/include/users.h
index 31c1c641d8328b8855e95838664093ebc8162418..ac3b2b459d916f5f3ca5271e77c6c304600fc6a9 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -382,7 +382,7 @@ class CoreExport User : public StreamSocket
 
        /** The server the user is connected to.
         */
-       const char* server;
+       std::string server;
 
        /** The user's away message.
         * If this string is empty, the user is not marked as away.
@@ -444,10 +444,6 @@ class CoreExport User : public StreamSocket
         * @return The port number of this user.
         */
        int GetServerPort();
-       /**
-        * @return The server IP address
-        */
-       std::string GetServerIP();
 
        /** Get client IP string from sockaddr, using static internal buffer
         * @return The IP string
@@ -719,7 +715,7 @@ class CoreExport User : public StreamSocket
        /** Write to all users that can see this user (including this user in the list), appending CR/LF
         * @param text A std::string to send to the users
         */
-       void WriteCommon(const std::string &text);
+       void WriteCommonRaw(const std::string &line, bool include_self = true);
 
        /** Write to all users that can see this user (including this user in the list), appending CR/LF
         * @param text The format string for text to send to the users
@@ -733,11 +729,6 @@ class CoreExport User : public StreamSocket
         */
        void WriteCommonExcept(const char* text, ...) CUSTOM_PRINTF(2, 3);
 
-       /** Write to all users that can see this user (not including this user in the list), appending CR/LF
-        * @param text A std::string to send to the users
-        */
-       void WriteCommonExcept(const std::string &text);
-
        /** Write a quit message to all common users, as in User::WriteCommonExcept but with a specific
         * quit message for opers only.
         * @param normal_text Normal user quit message