X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-op.c;h=e90d07458932ea42bec7f1343581e9cc08c436f5;hp=d4a71f00f1bba1186780531441c76dbef4b3a62e;hb=64d330b7266d9ef6d135968063e971b4dfc06367;hpb=27a70171f1886381596efdf5d8d87b17d83f3561 diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index d4a71f00..e90d0745 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -1,22 +1,21 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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. * - * $Id: irc-op.c,v 1.4 2002/06/09 13:17:29 alex Exp $ - * - * irc-op.c: Befehle zur Channel-Verwaltung + * Channel operator commands */ #include "portab.h" +static char UNUSED id[] = "$Id: irc-op.c,v 1.13 2004/04/09 21:41:52 alex Exp $"; + #include "imp.h" #include #include @@ -44,9 +43,6 @@ IRC_KICK( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Valider Client? */ - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ if(( Req->argc < 2) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -63,22 +59,6 @@ IRC_KICK( CLIENT *Client, REQUEST *Req ) } /* IRC_KICK */ -GLOBAL BOOLEAN -IRC_BAN( CLIENT *Client, REQUEST *Req ) -{ - assert( Client != NULL ); - assert( Req != NULL ); - - /* Valider Client? */ - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - - /* Keine Parameter? */ - if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - return CONNECTED; -} /* IRC_BAN */ - - GLOBAL BOOLEAN IRC_INVITE( CLIENT *Client, REQUEST *Req ) { @@ -89,48 +69,54 @@ IRC_INVITE( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Valider Client? */ - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - - /* Falsche Anzahl Parameter? */ + /* Wrong number of parameters? */ if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); else from = Client; if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - /* User suchen */ + /* Search user */ target = Client_Search( Req->argv[0] ); - if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); + if(( ! target ) || ( Client_Type( target ) != CLIENT_USER )) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); chan = Channel_Search( Req->argv[1] ); if( chan ) { - /* Der Channel existiert bereits; ist der User Mitglied? */ + /* Channel exists. Is the user a valid member of the channel? */ if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( Client ), Req->argv[1] ); - /* Ist der Channel "invite-only"? */ + /* Is the channel "invite-only"? */ if( strchr( Channel_Modes( chan ), 'i' )) { - /* Ja. Der User muss Channel-Operator sein! */ + /* Yes. The user must be channel operator! */ if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan )); remember = TRUE; } - /* Ist der Ziel-User bereits Mitglied? */ + /* Is the target user already member of the channel? */ if( Channel_IsMemberOf( chan, target )) return IRC_WriteStrClient( from, ERR_USERONCHANNEL_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] ); + /* If the target user is banned on that channel: remember invite */ + if( Lists_CheckBanned( target, chan )) remember = TRUE; + + if( remember ) + { + /* We must memember this invite */ + if( ! Lists_AddInvited( Client_Mask( target ), chan, TRUE )) return CONNECTED; + } } Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] ); + + /* Inform target client */ IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] ); - if( remember ) Lists_AddInvited( Client_Mask( target ), chan, TRUE ); if( Client_Conn( target ) > NONE ) { - /* lokaler Zeil-Client, Status-Code melden */ - if( ! IRC_WriteStrClientPrefix( from, from, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED; + /* The target user is local, so we have to send the status code */ + if( ! IRC_WriteStrClientPrefix( from, target, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED; } return CONNECTED;