Remove a redundant method here, call the mode manager directly

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

diff --git a/include/users.h b/include/users.h
index 67ea63a310885f79108fe5c022f51cb4dfc78f8b..d9330d42720437020225db9b0648fd5b417b0793 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -481,10 +481,6 @@ class CoreExport User : public connection
         */
        void DecrementModes();
 
-       /** Oper-only quit message for this user if non-null
-        */
-       char* operquit;
-
        /** Max channels for this user
         */
        unsigned int MaxChans;
@@ -616,6 +612,18 @@ class CoreExport User : public connection
         */
        std::string sendq;
 
+       /** Message user will quit with. Not to be set externally.
+        */
+       std::string quitmsg;
+
+       /** Quit message shown to opers - not to be set externally.
+        */
+       std::string operquitmsg;
+
+       /** Whether or not to send an snotice about this user's quitting
+        */
+       bool quietquit;
+
        /** Flood counters - lines received
         */
        unsigned int lines_in;
@@ -624,13 +632,12 @@ class CoreExport User : public connection
         */
        time_t reset_due;
 
-       /** If this is set to true, then all read operations for the user
+       /** If this is set to true, then all socket operations for the user
         * are dropped into the bit-bucket.
-        * This is used by the global CullList, but please note that setting this value
-        * alone will NOT cause the user to quit. This means it can be used seperately,
-        * for example by shun modules etc.
+        * This value is set by QuitUser, and is not needed seperately from that call.
+        * Please note that setting this value alone will NOT cause the user to quit.
         */
-       bool muted;
+       bool quitting;
 
        /** IPV4 or IPV6 ip address. Use SetSockAddr to set this and GetProtocolFamily/
         * GetIPString/GetPort to obtain its values.
@@ -916,18 +923,6 @@ class CoreExport User : public connection
         */
        bool ForceNickChange(const char* newnick);
 
-       /** Add a client to the system.
-        * This will create a new User, insert it into the user_hash,
-        * initialize it as not yet registered, and add it to the socket engine.
-        * @param Instance a pointer to the server instance
-        * @param socket The socket id (file descriptor) this user is on
-        * @param port The port number this user connected on
-        * @param iscached This variable is reserved for future use
-        * @param ip The IP address of the user
-        * @return This function has no return value, but a call to AddClient may remove the user.
-        */
-       static void AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip);
-
        /** Oper down.
         * This will clear the +o usermode and unset the user's oper type
         */