X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=0808d4c32c18f4ae317741387f4bd1970409d1a8;hb=f3f121b8f8d738c49a0f6c60511c07daca6937b6;hp=e339640550eab407c1ab9c9daf154f60bb35bec7;hpb=6610d6e4bab422e7c3eaa6905e32268cdbd8d764;p=ngircd-alex.git

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index e3396405..0808d4c3 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,11 +9,17 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc.c,v 1.54 2002/02/11 23:33:35 alex Exp $
+ * $Id: irc.c,v 1.56 2002/02/13 17:52:27 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * Revision 1.56  2002/02/13 17:52:27  alex
+ * - es werden nun Channel- und User-Modes von Usern angenommen.
+ *
+ * Revision 1.55  2002/02/12 14:40:37  alex
+ * - via NJOIN gemeldete Benutzer wurden nicht in Channels bekannt gemacht.
+ *
  * Revision 1.54  2002/02/11 23:33:35  alex
  * - weitere Anpassungen an Channel-Modes und Channel-User-Modes.
  *
@@ -541,7 +547,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
 					if( Client_Conn( c ) > NONE )
 					{
 						/* Dem gefundenen Server gleich den neuen
-						* Server bekannt machen */
+						 * Server bekannt machen */
 						if( ! IRC_WriteStrClient( c, "SERVER %s %d %d :%s", Client_ID( Client ), Client_Hops( Client ) + 1, Client_MyToken( Client ), Client_Info( Client ))) return DISCONNECTED;
 					}
 					
@@ -655,8 +661,8 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
 
 GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 {
+	CHAR *channame, *ptr, modes[8];
 	BOOLEAN is_op, is_voiced;
-	CHAR *channame, *ptr;
 	CHANNEL *chan;
 	CLIENT *c;
 	
@@ -691,6 +697,17 @@ GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 			
 			if( is_op ) Channel_UserModeAdd( chan, c, 'o' );
 			if( is_voiced ) Channel_UserModeAdd( chan, c, 'v' );
+
+			/* im Channel bekannt machen */
+			IRC_WriteStrChannelPrefix( Client, chan, c, FALSE, "JOIN :%s", channame );
+
+			/* Channel-User-Modes setzen */
+			strcpy( modes, Channel_UserModes( chan, c ));
+			if( modes[0] )
+			{
+				/* Modes im Channel bekannt machen */
+				IRC_WriteStrChannelPrefix( Client, chan, Client, FALSE, "MODE %s +%s %s", channame, modes, Client_ID( c ));
+			}
 		}
 		else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );
 		
@@ -738,10 +755,10 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
 			target = Client;
 		}
 
+#ifndef STRICT_RFC
 		/* Wenn der Client zu seinem eigenen Nick wechseln will, so machen
 		 * wir nichts. So macht es das Original und mind. Snak hat probleme,
 		 * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */
-#ifndef STRICT_RFC
 		if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) return CONNECTED;
 #endif
 		
@@ -1239,6 +1256,14 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
 					/* Channel-User-Modes */
 					switch( *mode_ptr )
 					{
+						case 'o':
+							/* Channel Operator */
+							x[0] = 'o';
+							break;
+						case 'v':
+							/* Voice */
+							x[0] = 'v';
+							break;
 						default:
 							Log( LOG_DEBUG, "Unknown channel-user-mode \"%c%c\" from \"%s\" on \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Client_ID( chan_cl ), Channel_Name( chan ));
 							ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client ));
@@ -1250,6 +1275,34 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
 					/* Channel-Modes */
 					switch( *mode_ptr )
 					{
+						case 'a':
+							/* Anonymous */
+							x[0] = 'a';
+							break;
+						case 'm':
+							/* Moderated */
+							x[0] = 'm';
+							break;
+						case 'n':
+							/* kein Schreiben in den Channel von aussen */
+							x[0] = 'n';
+							break;
+						case 'p':
+							/* Private */
+							x[0] = 'p';
+							break;
+						case 'q':
+							/* Quite */
+							x[0] = 'q';
+							break;
+						case 's':
+							/* Secret */
+							x[0] = 's';
+							break;
+						case 't':
+							/* Topic Lock */
+							x[0] = 't';
+							break;
 						default:
 							Log( LOG_DEBUG, "Unknown channel-mode \"%c%c\" from \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Channel_Name( chan ));
 							ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client ));