- SQUIT, QUIT: Loglevel bei unbekannten Clients wieder auf WARNING erhoeht.

[ngircd-alex.git] / src / ngircd / irc.c

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 8a177c82db28ce7ceba9af5c136b03a8de7db601..cc6b2b82610eaacfd8d9cc32142ecad21f0ba13a 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,11 +9,18 @@
  * 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.85 2002/03/03 19:44:30 alex Exp $
+ * $Id: irc.c,v 1.87 2002/03/10 18:16:51 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * Revision 1.87  2002/03/10 18:16:51  alex
+ * - bei WHO, WHOIS und NAMES wird nun nur noch der Status "Operator" oder
+ *   "voiced" geliefert -- nicht mehr beides.
+ *
+ * Revision 1.86  2002/03/04 01:43:20  alex
+ * - der WHO-Befehl (ohne Argumente) gat teilweise Channel-Names vergessen.
+ *
  * Revision 1.85  2002/03/03 19:44:30  alex
  * - WHO implementiert (bisher ohne Unterstuetzung von Masks)
  *
@@ -380,8 +387,8 @@ GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                
                /* Channel-Name anhaengen */
                if( str[strlen( str ) - 1] != ':' ) strcat( str, " " );
-               if( strchr( Channel_UserModes( chan, c ), 'v' )) strcat( str, "+" );
                if( strchr( Channel_UserModes( chan, c ), 'o' )) strcat( str, "@" );
+               else if( strchr( Channel_UserModes( chan, c ), 'v' )) strcat( str, "+" );
                strcat( str, Channel_Name( chan ));
 
                if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 ))
@@ -426,9 +433,9 @@ GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN IRC_WHO( CLIENT *Client, REQUEST *Req )
 {
        BOOLEAN ok, only_ops;
+       CHAR flags[8], *ptr;
        CL2CHAN *cl2chan;
        CHANNEL *chan;
-       CHAR flags[8];
        CLIENT *c;
        
        assert( Client != NULL );
@@ -484,7 +491,9 @@ GLOBAL BOOLEAN IRC_WHO( CLIENT *Client, REQUEST *Req )
 
                                /* ausgeben */
                                cl2chan = Channel_FirstChannelOf( c );
-                               if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), chan ? Channel_Name( Channel_GetChannel( cl2chan )) : "*", Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+                               if( cl2chan ) ptr = Channel_Name( Channel_GetChannel( cl2chan ));
+                               else ptr = "*";
+                               if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), ptr, Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
                        }
                }
 
@@ -763,8 +772,8 @@ GLOBAL BOOLEAN IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
                {
                        /* Nick anhaengen */
                        if( str[strlen( str ) - 1] != ':' ) strcat( str, " " );
-                       if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strcat( str, "+" );
                        if( strchr( Channel_UserModes( Chan, cl ), 'o' )) strcat( str, "@" );
+                       else if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strcat( str, "+" );
                        strcat( str, Client_ID( cl ));
        
                        if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
@@ -815,8 +824,8 @@ GLOBAL BOOLEAN IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps )
                        /* Flags zusammenbasteln */
                        strcpy( flags, "H" );
                        if( strchr( Client_Modes( c ), 'o' )) strcat( flags, "*" );
-                       if( strchr( Channel_UserModes( Chan, c ), 'v' )) strcat( flags, "+" );
                        if( strchr( Channel_UserModes( Chan, c ), 'o' )) strcat( flags, "@" );
+                       else if( strchr( Channel_UserModes( Chan, c ), 'v' )) strcat( flags, "+" );
                        
                        /* ausgeben */
                        if(( ! OnlyOps ) || ( strchr( Client_Modes( c ), 'o' )))