X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=35aaa01cb49d3504c5ec809134f39922048b30aa;hp=982d8335ea739acf07744728976b9296abfd997d;hb=cc1e8514f850b983898ca80e4888598b53865709;hpb=10363b398e05604d2318c67b943e7a742cb25323

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 982d8335..35aaa01c 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -9,114 +9,100 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: channel.c,v 1.18 2002/03/03 17:17:01 alex Exp $
+ * $Id: channel.c,v 1.25 2002/06/01 14:35:39 alex Exp $
  *
  * channel.c: Management der Channels
- *
- * $Log: channel.c,v $
- * Revision 1.18  2002/03/03 17:17:01  alex
- * - strncpy() und vsnprintf() kopieren nun etwas "optimierter" (1 Byte weniger) :-)
- *
- * Revision 1.17  2002/03/02 01:35:50  alex
- * - Channel- und Nicknames werden nun ordentlich validiert.
- *
- * Revision 1.16  2002/02/27 23:23:53  alex
- * - Includes fuer einige Header bereinigt.
- *
- * Revision 1.15  2002/02/27 20:32:10  alex
- * - neue Funktionen Channel_Topic() und Channel_SetTopic().
- *
- * Revision 1.14  2002/02/27 15:21:21  alex
- * - neue Funktion Channel_IsMemberOf() implementiert.
- *
- * Revision 1.13  2002/02/11 01:00:12  alex
- * - neue Funktionen Channel_ModeAdd(), Channel_ModeDel(), Channel_UserModes(),
- *   Channel_UserModeAdd(), Channel_UserModeDel().
- * - Modes in CL2CHAN-Struktur werden nun korrekt initialisiert.
- *
- * Revision 1.12  2002/02/06 16:48:48  alex
- * - neue Funktion Channel_Modes() und Channel_IsValidName().
- * - Channel-Namen werden (besser) validiert.
- *
- * Revision 1.11  2002/01/29 00:11:10  alex
- * - neue Funktionen Channel_FirstChannelOf() und Channel_NextChannelOf().
- *
- * Revision 1.10  2002/01/28 01:16:15  alex
- * - neue Funktionen Channel_Name(), Channel_First() und Channel_Next().
- *
- * Revision 1.9  2002/01/27 22:47:11  alex
- * - PART wird nicht mehr an den Server verschickt, von dem es empfangen wurde.
- *
- * Revision 1.8  2002/01/27 21:56:54  alex
- * - weitere Anpassungen an Chennals, v.a. ueber Server-Links.
- *
- * Revision 1.7  2002/01/27 17:14:33  alex
- * - diverse Aenderungen fuer Channels ueber mehrere Server.
- *
- * Revision 1.6  2002/01/26 18:41:55  alex
- * - CHANNEL- und CL2CHAN-Strukturen in Header verlegt,
- * - einige neue Funktionen (Channel_GetChannel(), Channel_FirstMember(), ...)
- *
- * Revision 1.5  2002/01/21 00:12:29  alex
- * - begonnen, Channels zu implementieren :-)
- *
- * Revision 1.4  2002/01/16 22:09:07  alex
- * - neue Funktion Channel_Count().
- *
- * Revision 1.3  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.2  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.1  2001/12/14 08:13:43  alex
- * - neues Modul begonnen :-)
  */
 
 
 #define __channel_c__
 
 
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
 
-#include <imp.h>
+#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "conn.h"
 #include "client.h"
+
+#include "exp.h"
+#include "channel.h"
+
+#include "imp.h"
 #include "irc-write.h"
+#include "resolve.h"
+#include "conf.h"
+#include "hash.h"
 #include "log.h"
 #include "messages.h"
 
-#include <exp.h>
-#include "channel.h"
+#include "exp.h"
+
+
+#define REMOVE_PART 0
+#define REMOVE_QUIT 1
+#define REMOVE_KICK 2
 
 
 LOCAL CHANNEL *My_Channels;
 LOCAL CL2CHAN *My_Cl2Chan;
 
 
-LOCAL CHANNEL *New_Chan( CHAR *Name );
-LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client );
-LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client );
-LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN ServerPART );
-LOCAL CL2CHAN *Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan );
-LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan );
-LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan );
+LOCAL CHANNEL *New_Chan PARAMS(( CHAR *Name ));
+LOCAL CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+LOCAL CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+LOCAL BOOLEAN Remove_Client PARAMS(( INT Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN InformServer ));
+LOCAL CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
+LOCAL CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
+LOCAL BOOLEAN Delete_Channel PARAMS(( CHANNEL *Chan ));
 
 
-GLOBAL VOID Channel_Init( VOID )
+GLOBAL VOID
+Channel_Init( VOID )
 {
+	CHANNEL *chan;
+	CHAR *c;
+	INT i;
+	
 	My_Channels = NULL;
 	My_Cl2Chan = NULL;
+
+	/* Vordefinierte persistente Channels erzeugen */
+	for( i = 0; i < Conf_Channel_Count; i++ )
+	{
+		/* Ist ein Name konfiguriert? */
+		if( ! Conf_Channel[i].name ) continue;
+
+		/* Gueltiger Channel-Name? */
+		if( ! Channel_IsValidName( Conf_Channel[i].name ))
+		{
+			Log( LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"!", Conf_Channel[i].name );
+			continue;
+		}
+		
+		/* Channel anlegen */
+		chan = New_Chan( Conf_Channel[i].name );
+		if( chan )
+		{
+			/* Verketten */
+			chan->next = My_Channels;
+			My_Channels = chan;
+			Channel_ModeAdd( chan, 'P' );
+			Channel_SetTopic( chan, Conf_Channel[i].topic );
+			c = Conf_Channel[i].modes;
+			while( *c ) Channel_ModeAdd( chan, *c++ );
+			Log( LOG_INFO, "Created pre-defined channel \"%s\".", Conf_Channel[i].name );
+		}
+		else Log( LOG_ERR, "Can't create pre-defined channel \"%s\"!", Conf_Channel[i].name );
+	}
 } /* Channel_Init */
 
 
-GLOBAL VOID Channel_Exit( VOID )
+GLOBAL VOID
+Channel_Exit( VOID )
 {
 	CHANNEL *c, *c_next;
 	CL2CHAN *cl2chan, *cl2chan_next;
@@ -141,7 +127,8 @@ GLOBAL VOID Channel_Exit( VOID )
 } /* Channel_Exit */
 
 
-GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name )
+GLOBAL BOOLEAN
+Channel_Join( CLIENT *Client, CHAR *Name )
 {
 	CHANNEL *chan;
 	
@@ -179,12 +166,14 @@ GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name )
 } /* Channel_Join */
 
 
-GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason )
+GLOBAL BOOLEAN
+Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason )
 {
 	CHANNEL *chan;
 
 	assert( Client != NULL );
 	assert( Name != NULL );
+	assert( Reason != NULL );
 
 	/* Channel suchen */
 	chan = Channel_Search( Name );
@@ -195,28 +184,74 @@ GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *R
 	}
 
 	/* User aus Channel entfernen */
-	if( ! Remove_Client( chan, Client, Origin, Reason, TRUE )) return FALSE;
+	if( ! Remove_Client( REMOVE_PART, chan, Client, Origin, Reason, TRUE )) return FALSE;
 	else return TRUE;
 } /* Channel_Part */
 
 
-GLOBAL VOID Channel_RemoveClient( CLIENT *Client, CHAR *Reason )
+GLOBAL VOID
+Channel_Kick( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason )
+{
+	CHANNEL *chan;
+
+	assert( Client != NULL );
+	assert( Origin != NULL );
+	assert( Name != NULL );
+	assert( Reason != NULL );
+
+	/* Channel suchen */
+	chan = Channel_Search( Name );
+	if( ! chan )
+	{
+		IRC_WriteStrClient( Origin, ERR_NOSUCHCHANNEL_MSG, Client_ID( Origin ), Name );
+		return;
+	}
+
+	/* Ist der User Mitglied in dem Channel? */
+	if( ! Channel_IsMemberOf( chan, Origin ))
+	{
+		IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Name );
+		return;
+	}
+
+	/* Ist der User Channel-Operator? */
+	if( ! strchr( Channel_UserModes( chan, Origin ), 'o' ))
+	{
+		IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Name);
+		return;
+	}
+
+	/* Ist der Ziel-User Mitglied im Channel? */
+	if( ! Channel_IsMemberOf( chan, Client ))
+	{
+		IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( Client ), Name );
+		return;
+	}
+
+	Remove_Client( REMOVE_KICK, chan, Client, Origin, Reason, TRUE );
+} /* Channel_Kick */
+
+
+GLOBAL VOID
+Channel_Quit( CLIENT *Client, CHAR *Reason )
 {
 	CHANNEL *c, *next_c;
 
 	assert( Client != NULL );
+	assert( Reason != NULL );
 
 	c = My_Channels;
 	while( c )
 	{
 		next_c = c->next;
-		Remove_Client( c, Client, Client_ThisServer( ), Reason, FALSE );
+		Remove_Client( REMOVE_QUIT, c, Client, Client_ThisServer( ), Reason, FALSE );
 		c = next_c;
 	}
-} /* Channel_RemoveClient */
+} /* Channel_Quit */
 
 
-GLOBAL INT Channel_Count( VOID )
+GLOBAL INT
+Channel_Count( VOID )
 {
 	CHANNEL *c;
 	INT count;
@@ -232,58 +267,91 @@ GLOBAL INT Channel_Count( VOID )
 } /* Channel_Count */
 
 
-GLOBAL CHAR *Channel_Name( CHANNEL *Chan )
+GLOBAL INT
+Channel_MemberCount( CHANNEL *Chan )
+{
+	CL2CHAN *cl2chan;
+	INT count;
+
+	assert( Chan != NULL );
+
+	count = 0;
+	cl2chan = My_Cl2Chan;
+	while( cl2chan )
+	{
+		if( cl2chan->channel == Chan ) count++;
+		cl2chan = cl2chan->next;
+	}
+	return count;
+} /* Channel_MemberCount */
+
+
+GLOBAL CHAR *
+Channel_Name( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Chan->name;
 } /* Channel_Name */
 
 
-GLOBAL CHAR *Channel_Modes( CHANNEL *Chan )
+GLOBAL CHAR *
+Channel_Modes( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Chan->modes;
 } /* Channel_Modes */
 
 
-GLOBAL CHANNEL *Channel_First( VOID )
+GLOBAL CHANNEL *
+Channel_First( VOID )
 {
 	return My_Channels;
 } /* Channel_First */
 
 
-GLOBAL CHANNEL *Channel_Next( CHANNEL *Chan )
+GLOBAL CHANNEL *
+Channel_Next( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Chan->next;
 } /* Channel_Next */
 
 
-GLOBAL CHANNEL *Channel_Search( CHAR *Name )
+GLOBAL CHANNEL *
+Channel_Search( CHAR *Name )
 {
 	/* Channel-Struktur suchen */
 	
 	CHANNEL *c;
+	UINT32 search_hash;
 
 	assert( Name != NULL );
+
+	search_hash = Hash( Name );
 	c = My_Channels;
 	while( c )
 	{
-		if( strcasecmp( Name, c->name ) == 0 ) return c;
+		if( search_hash == c->hash )
+		{
+			/* lt. Hash-Wert: Treffer! */
+			if( strcasecmp( Name, c->name ) == 0 ) return c;
+		}
 		c = c->next;
 	}
 	return NULL;
 } /* Channel_Search */
 
 
-GLOBAL CL2CHAN *Channel_FirstMember( CHANNEL *Chan )
+GLOBAL CL2CHAN *
+Channel_FirstMember( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Get_First_Cl2Chan( NULL, Chan );
 } /* Channel_FirstMember */
 
 
-GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
+GLOBAL CL2CHAN *
+Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
 {
 	assert( Chan != NULL );
 	assert( Cl2Chan != NULL );
@@ -291,14 +359,16 @@ GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
 } /* Channel_NextMember */
 
 
-GLOBAL CL2CHAN *Channel_FirstChannelOf( CLIENT *Client )
+GLOBAL CL2CHAN *
+Channel_FirstChannelOf( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Get_First_Cl2Chan( Client, NULL );
 } /* Channel_FirstChannelOf */
 
 
-GLOBAL CL2CHAN *Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan )
+GLOBAL CL2CHAN *
+Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan )
 {
 	assert( Client != NULL );
 	assert( Cl2Chan != NULL );
@@ -306,31 +376,35 @@ GLOBAL CL2CHAN *Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan )
 } /* Channel_NextChannelOf */
 
 
-GLOBAL CLIENT *Channel_GetClient( CL2CHAN *Cl2Chan )
+GLOBAL CLIENT *
+Channel_GetClient( CL2CHAN *Cl2Chan )
 {
 	assert( Cl2Chan != NULL );
 	return Cl2Chan->client;
 } /* Channel_GetClient */
 
 
-GLOBAL CHANNEL *Channel_GetChannel( CL2CHAN *Cl2Chan )
+GLOBAL CHANNEL *
+Channel_GetChannel( CL2CHAN *Cl2Chan )
 {
 	assert( Cl2Chan != NULL );
 	return Cl2Chan->channel;
 } /* Channel_GetChannel */
 
 
-GLOBAL BOOLEAN Channel_IsValidName( CHAR *Name )
+GLOBAL BOOLEAN
+Channel_IsValidName( CHAR *Name )
 {
-	/* PrŸfen, ob Name als Channelname gueltig */
+	/* Pruefen, ob Name als Channelname gueltig */
 
-	CHAR *ptr, badchars[] = " ,:\x07";
+	CHAR *ptr, badchars[10];
 	
 	assert( Name != NULL );
 
 	if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return FALSE;
 
 	ptr = Name;
+	strcpy( badchars, " ,:\x07" );
 	while( *ptr )
 	{
 		if( strchr( badchars, *ptr )) return FALSE;
@@ -341,7 +415,8 @@ GLOBAL BOOLEAN Channel_IsValidName( CHAR *Name )
 } /* Channel_IsValidName */
 
 
-GLOBAL BOOLEAN Channel_ModeAdd( CHANNEL *Chan, CHAR Mode )
+GLOBAL BOOLEAN
+Channel_ModeAdd( CHANNEL *Chan, CHAR Mode )
 {
 	/* Mode soll gesetzt werden. TRUE wird geliefert, wenn der
 	 * Mode neu gesetzt wurde, FALSE, wenn der Channel den Mode
@@ -362,7 +437,8 @@ GLOBAL BOOLEAN Channel_ModeAdd( CHANNEL *Chan, CHAR Mode )
 } /* Channel_ModeAdd */
 
 
-GLOBAL BOOLEAN Channel_ModeDel( CHANNEL *Chan, CHAR Mode )
+GLOBAL BOOLEAN
+Channel_ModeDel( CHANNEL *Chan, CHAR Mode )
 {
 	/* Mode soll geloescht werden. TRUE wird geliefert, wenn der
 	 * Mode entfernt wurde, FALSE, wenn der Channel den Mode
@@ -387,7 +463,8 @@ GLOBAL BOOLEAN Channel_ModeDel( CHANNEL *Chan, CHAR Mode )
 } /* Channel_ModeDel */
 
 
-GLOBAL BOOLEAN Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
 {
 	/* Channel-User-Mode soll gesetzt werden. TRUE wird geliefert,
 	 * wenn der Mode neu gesetzt wurde, FALSE, wenn der User den
@@ -413,7 +490,8 @@ GLOBAL BOOLEAN Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
 } /* Channel_UserModeAdd */
 
 
-GLOBAL BOOLEAN Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
 {
 	/* Channel-User-Mode soll geloescht werden. TRUE wird geliefert,
 	 * wenn der Mode entfernt wurde, FALSE, wenn der User den Channel-Mode
@@ -443,7 +521,8 @@ GLOBAL BOOLEAN Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, CHAR Mode )
 } /* Channel_UserModeDel */
 
 
-GLOBAL CHAR *Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
+GLOBAL CHAR *
+Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
 {
 	/* Channel-Modes eines Users liefern */
 	
@@ -459,7 +538,8 @@ GLOBAL CHAR *Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
 } /* Channel_UserModes */
 
 
-GLOBAL BOOLEAN Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client )
+GLOBAL BOOLEAN
+Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client )
 {
 	/* Pruefen, ob Client Mitglied in Channel ist */
 
@@ -471,14 +551,16 @@ GLOBAL BOOLEAN Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client )
 } /* Channel_IsMemberOf */
 
 
-GLOBAL CHAR *Channel_Topic( CHANNEL *Chan )
+GLOBAL CHAR *
+Channel_Topic( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Chan->topic;
 } /* Channel_Topic */
 
 
-GLOBAL VOID Channel_SetTopic( CHANNEL *Chan, CHAR *Topic )
+GLOBAL VOID
+Channel_SetTopic( CHANNEL *Chan, CHAR *Topic )
 {
 	assert( Chan != NULL );
 	assert( Topic != NULL );
@@ -488,10 +570,39 @@ GLOBAL VOID Channel_SetTopic( CHANNEL *Chan, CHAR *Topic )
 } /* Channel_SetTopic */
 
 
-LOCAL CHANNEL *New_Chan( CHAR *Name )
+GLOBAL BOOLEAN
+Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text )
+{
+	BOOLEAN is_member, has_voice, is_op, ok;
+
+	/* Okay, Ziel ist ein Channel */
+	is_member = has_voice = is_op = FALSE;
+	if( Channel_IsMemberOf( Chan, From ))
+	{
+		is_member = TRUE;
+		if( strchr( Channel_UserModes( Chan, From ), 'v' )) has_voice = TRUE;
+		if( strchr( Channel_UserModes( Chan, From ), 'o' )) is_op = TRUE;
+	}
+
+	/* pruefen, ob Client in Channel schreiben darf */
+	ok = TRUE;
+	if( strchr( Channel_Modes( Chan ), 'n' ) && ( ! is_member )) ok = FALSE;
+	if( strchr( Channel_Modes( Chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = FALSE;
+
+	if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan ));
+
+	/* Text senden */
+	if( Client_Conn( From ) > NONE ) Conn_UpdateIdle( Client_Conn( From ));
+	return IRC_WriteStrChannelPrefix( Client, Chan, From, TRUE, "PRIVMSG %s :%s", Channel_Name( Chan ), Text );
+} /* Channel_Write */
+
+
+
+LOCAL CHANNEL *
+New_Chan( CHAR *Name )
 {
 	/* Neue Channel-Struktur anlegen */
-	
+
 	CHANNEL *c;
 
 	assert( Name != NULL );
@@ -507,6 +618,7 @@ LOCAL CHANNEL *New_Chan( CHAR *Name )
 	c->name[CHANNEL_NAME_LEN - 1] = '\0';
 	strcpy( c->modes, "" );
 	strcpy( c->topic, "" );
+	c->hash = Hash( c->name );
 
 	Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name );
 	
@@ -514,7 +626,8 @@ LOCAL CHANNEL *New_Chan( CHAR *Name )
 } /* New_Chan */
 
 
-LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
+LOCAL CL2CHAN *
+Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 {
 	CL2CHAN *cl2chan;
 
@@ -531,7 +644,8 @@ LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 } /* Get_Cl2Chan */
 
 
-LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client )
+LOCAL CL2CHAN *
+Add_Client( CHANNEL *Chan, CLIENT *Client )
 {
 	CL2CHAN *cl2chan;
 
@@ -559,7 +673,8 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client )
 } /* Add_Client */
 
 
-LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN ServerPART )
+LOCAL BOOLEAN
+Remove_Client( INT Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN InformServer )
 {
 	CL2CHAN *cl2chan, *last_cl2chan;
 	CHANNEL *c;
@@ -587,26 +702,45 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR
 	else My_Cl2Chan = cl2chan->next;
 	free( cl2chan );
 
-	if( ServerPART ) IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
-	IRC_WriteStrChannelPrefix( Origin, c, Client, FALSE, "PART %s :%s", c->name, Reason );
-	if(( Client_Conn( Origin ) > NONE ) && ( Client_Type( Origin ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
-
-	Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );
+	switch( Type )
+	{
+		case REMOVE_QUIT:
+			assert( InformServer == FALSE );
+			IRC_WriteStrChannelPrefix( Origin, c, Origin, FALSE, "QUIT :%s", Reason );
+			Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );
+			break;
+		case REMOVE_KICK:
+			if( InformServer ) IRC_WriteStrServersPrefix( Client_NextHop( Origin ), Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
+			IRC_WriteStrChannelPrefix( Client, c, Origin, FALSE, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
+			if(( Client_Conn( Client ) > NONE ) && ( Client_Type( Client ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Client, Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
+			Log( LOG_DEBUG, "User \"%s\" has been kicked of \"%s\" by \"%s\": %s.", Client_Mask( Client ), c->name, Client_ID( Origin ), Reason );
+			break;
+		default:
+			if( InformServer ) IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
+			IRC_WriteStrChannelPrefix( Origin, c, Client, FALSE, "PART %s :%s", c->name, Reason );
+			if(( Client_Conn( Origin ) > NONE ) && ( Client_Type( Origin ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
+			Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );
+	}
 
-	/* Wenn Channel nun leer: loeschen */
-	if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
+	/* Wenn Channel nun leer und nicht pre-defined: loeschen */
+	if( ! strchr( Channel_Modes( Chan ), 'P' ))
+	{
+		if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
+	}
 		
 	return TRUE;
 } /* Remove_Client */
 
 
-LOCAL CL2CHAN *Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
+LOCAL CL2CHAN *
+Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {
 	return Get_Next_Cl2Chan( My_Cl2Chan, Client, Chan );
 } /* Get_First_Cl2Chan */
 
 
-LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
+LOCAL CL2CHAN *
+Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 {
 	CL2CHAN *cl2chan;
 
@@ -623,7 +757,8 @@ LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channe
 } /* Get_Next_Cl2Chan */
 
 
-LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan )
+LOCAL BOOLEAN
+Delete_Channel( CHANNEL *Chan )
 {
 	/* Channel-Struktur loeschen */