X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusermanager.h;h=6ec80c9db27ec3df018a822855ac1a57d6af7a47;hb=8e735c8f3ab15db211259d5d8436884ab33fea44;hp=552fb4136386072ef8e0d2828760b4422bc25aad;hpb=58385dd458e927994957b6d603f7f9da3fc52e14;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/usermanager.h b/include/usermanager.h
index 552fb4136..6ec80c9db 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -19,7 +19,7 @@
 /** A list of ip addresses cross referenced against clone counts */
 typedef std::map<irc::string, unsigned int> clonemap;
 
-class CoreExport UserManager : public classbase
+class CoreExport UserManager : public Extensible
 {
  private:
 	InspIRCd *ServerInstance;
@@ -28,11 +28,18 @@ class CoreExport UserManager : public classbase
 	 */
 	clonemap local_clones;
  public:
-	UserManager(InspIRCd *Instance)
+	UserManager(InspIRCd *Instance) : ServerInstance(Instance)
 	{
-		ServerInstance = Instance;
 	}
-
+	
+	~UserManager()
+	{
+		for (user_hash::iterator i = clientlist->begin();i != clientlist->end();i++)
+		{
+			delete i->second;
+		}
+		clientlist->clear();
+	}
 
 	/** Client list, a hash_map containing all clients, local and remote
 	 */
@@ -71,7 +78,15 @@ class CoreExport UserManager : public classbase
 	 * @param ip The IP address of the user
 	 * @return This function has no return value, but a call to AddClient may remove the user.
 	 */
-	void AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip);
+	void AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip);
+
+	/** Disconnect a user gracefully
+ 	 * @param user The user to remove
+ 	 * @param r The quit reason to show to normal users
+ 	 * @param oreason The quit reason to show to opers
+ 	 * @return Although this function has no return type, on exit the user provided will no longer exist.
+	 */
+	void QuitUser(User *user, const std::string &quitreason, const char* operreason = "");
 
 	/** Add a user to the local clone map
 	 * @param user The user to add