Merge branch 'xop' of https://github.com/kart0ffelsack/ngircd into bug92-xop

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

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index a0a94688526d8326f03d051678cd08db824d307d..f9182d984ca9c2c6f1f743b419a198d89b31ada7 100644 (file)
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -7,13 +7,15 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * IRC commands for server links
  */
 
-
 #include "portab.h"
 
+/**
+ * @file
+ * IRC commands for server links
+ */
+
 #include "imp.h"
 #include <assert.h>
 #include <stdio.h>
@@ -22,12 +24,10 @@
 #include <strings.h>
 
 #include "defines.h"
-#include "resolve.h"
 #include "conn.h"
 #include "conn-func.h"
 #include "conn-zip.h"
 #include "conf.h"
-#include "client.h"
 #include "channel.h"
 #include "irc-write.h"
 #include "lists.h"
@@ -80,7 +80,8 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                        Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true);
                        return DISCONNECTED;
                }
-               if( strcmp( Client_Password( Client ), Conf_Server[i].pwd_in ) != 0 )
+               if( strcmp( Conn_Password( Client_Conn( Client ) ),
+                           Conf_Server[i].pwd_in ) != 0 )
                {
                        /* wrong password */
                        Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
@@ -202,7 +203,7 @@ GLOBAL bool
 IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 {
        char nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8];
-       bool is_op, is_voiced;
+       bool is_owner, is_chanadmin, is_op, is_halfop, is_voiced;
        CHANNEL *chan;
        CLIENT *c;
        
@@ -221,9 +222,13 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
                is_op = is_voiced = false;
                
                /* cut off prefixes */
-               while(( *ptr == '@' ) || ( *ptr == '+' ))
-               {
+               while(( *ptr == '~') || ( *ptr == '&' ) || ( *ptr == '@' ) ||
+                       ( *ptr == '%') || ( *ptr == '+' ))
+               {       
+                       if( *ptr == '~' ) is_owner = true;
+                       if( *ptr == '&' ) is_chanadmin = true;
                        if( *ptr == '@' ) is_op = true;
+                       if( *ptr == 'h' ) is_halfop = true;
                        if( *ptr == '+' ) is_voiced = true;
                        ptr++;
                }
@@ -235,7 +240,10 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
                        chan = Channel_Search( channame );
                        assert( chan != NULL );
                        
+                       if( is_owner ) Channel_UserModeAdd( chan, c, 'q' );
+                       if( is_chanadmin ) Channel_UserModeAdd( chan, c, 'a' );
                        if( is_op ) Channel_UserModeAdd( chan, c, 'o' );
+                       if( is_halfop ) Channel_UserModeAdd( chan, c, 'h' );
                        if( is_voiced ) Channel_UserModeAdd( chan, c, 'v' );
 
                        /* announce to channel... */
@@ -250,7 +258,10 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
                        }
 
                        if( nick_out[0] != '\0' ) strlcat( nick_out, ",", sizeof( nick_out ));
+                       if( is_owner ) strlcat( nick_out, "~", sizeof( nick_out ));
+                       if( is_chanadmin ) strlcat( nick_out, "&", sizeof( nick_out ));
                        if( is_op ) strlcat( nick_out, "@", sizeof( nick_out ));
+                       if( is_halfop ) strlcat( nick_out, "%", sizeof( nick_out ));
                        if( is_voiced ) strlcat( nick_out, "+", sizeof( nick_out ));
                        strlcat( nick_out, ptr, sizeof( nick_out ));
                }
@@ -277,6 +288,7 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req)
        char msg[COMMAND_LEN], logmsg[COMMAND_LEN];
        CLIENT *from, *target;
        CONN_ID con;
+       int loglevel;
 
        assert(Client != NULL);
        assert(Req != NULL);
@@ -301,7 +313,11 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req)
                return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
                                          Client_ID(Client), Req->prefix);
 
-       Log(LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...",
+       if (Client_Type(Client) == CLIENT_USER)
+               loglevel = LOG_NOTICE | LOG_snotice;
+       else
+               loglevel = LOG_DEBUG;
+       Log(loglevel, "Got SQUIT from %s for \"%s\": \"%s\" ...",
            Client_ID(from), Req->argv[0], Req->argv[1]);
 
        target = Client_Search(Req->argv[0]);