kill_link() and Server::QuitUser() -> userrec::QuitUser() (static member) - this cant be a normal member as it causes the userrec to be deleted, and "delete this" is bad, mmm'k

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4789 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 5 insertions, 14 deletions

diff --git a/include/modules.h b/include/modules.h
index 93d911959..3b056223c 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1507,18 +1507,6 @@ class Server : public Extensible
 	 */
 	virtual void ChangeUserNick(userrec* user, const std::string &nickname);
 	
-	/** Forces a user to quit with the specified reason.
-	 * To the user, it will appear as if they typed /QUIT themselves, except for the fact that this function
-	 * may bypass the quit prefix specified in the config file.
-	 *
-	 * WARNING!
-	 *
-	 * Once you call this function, userrec* user will immediately become INVALID. You MUST NOT write to, or
-	 * read from this pointer after calling the QuitUser method UNDER ANY CIRCUMSTANCES! The best course of
-	 * action after calling this method is to immediately bail from your handler.
-	 */
-	virtual void QuitUser(userrec* user, const std::string &reason);
-	
 	/**  Matches text against a glob pattern.
 	 * Uses the ircd's internal matching function to match string against a globbing pattern, e.g. *!*@*.com
 	 * Returns true if the literal successfully matches the pattern, false if otherwise.
diff --git a/include/users.h b/include/users.h
index 0b9599548..64cdc9e0d 100644
--- a/include/users.h
+++ b/include/users.h
@@ -435,6 +435,10 @@ class userrec : public connection
 	 */
 	void CloseSocket();
 
+	/** Disconnect a user gracefully
+	 */
+	static void QuitUser(userrec *user, const std::string &r);
+
 	/** Default destructor
 	 */
 	virtual ~userrec();
@@ -461,8 +465,7 @@ typedef std::map<irc::string,whowas_set*> whowas_users;
 
 void AddOper(userrec* user);
 void DeleteOper(userrec* user);
-void kill_link(userrec *user,const char* r);
-void kill_link_silent(userrec *user,const char* r);
+//void kill_link(userrec *user,const char* r);
 void AddWhoWas(userrec* u);
 void MaintainWhoWas(time_t TIME);
 void AddClient(int socket, int port, bool iscached, insp_inaddr ip4);