Merge branch 'master' of github.com:utcoupe/Coupe2012

server/pyircserver.py

@@ -158,15 +158,15 @@ def add_client(self, client):
 		self.l_clients.release()
 		client.rooms[self.name] = self
 
-	def remove_client(self, client):
+	def remove_client(self, client, msg='He is a pussy'):
 		self.l_clients.acquire()
 		if client.nick in self.clients:
 			del self.clients[client.nick]
 		self.l_clients.release()
 		self.send(irc_unparse(ParsedMsg(
 			prefix = client.prefix,
 			command = 'quit',
-			parameters = ('Client exited',)
+			parameters = (client.nick, msg)
 		)))
 
 	def get_clients(self):
@@ -278,10 +278,10 @@ def remove_client(self, client):
 				del self.clients[id(client)] # on le supprime des client non authentifiés
 		self.l_clients.release()
 
-	def kill(self, client):
+	def kill(self, client, msg='He is a pussy'):
 		client.stop()
 		for room in client.rooms.values():
-			room.remove_client(client)
+			room.remove_client(client, msg)
 		self.remove_client(client)
 
 	def try_add_client(self, client, nick):
@@ -335,9 +335,13 @@ def _cmd_user(self, client, msg):
 		client.send(self.make_response(RPL_LUSERCLIENT, client.nick, 'There are %s users and %s services on %s servers'%(len(self.clients), 0, 1)))
 		client.send(self.make_response(RPL_LUSERME, client.nick, 'I have %s clients and %s servers'%(len(self.clients), 1)))
 
-
+
+	@need_auth
 	def _cmd_quit(self, client, msg):
-		self.kill(client)
+		if len(msg.parameters) > 0:
+			self.kill(client, msg.parameters[0])
+		else:
+			self.kill(client)
 
 	@need_params(1)
 	@need_auth