- Invite- und Ban-Lists (MODE +I, MODE +b) implementiert.

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

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 73703e577862d7d99e995133367d57068e23fec9..965c1470ddf113e3f6122c61c8c50dea0f2b6e83 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-mode.c,v 1.8 2002/08/26 23:39:22 alex Exp $
+ * $Id: irc-mode.c,v 1.11 2002/09/08 00:51:28 alex Exp $
  *
  * irc-mode.c: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...)
  */
@@ -30,14 +30,13 @@
 #include "log.h"
 #include "parse.h"
 #include "messages.h"
+#include "resolve.h"
+#include "conf.h"
 
 #include "exp.h"
 #include "irc-mode.h"
 
 
-LOCAL BOOLEAN Show_InviteList PARAMS(( CLIENT *Client, CHANNEL *Channel ));
-LOCAL BOOLEAN Show_BanList PARAMS(( CLIENT *Client, CHANNEL *Channel ));
-
 LOCAL BOOLEAN Add_Invite PARAMS(( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
 LOCAL BOOLEAN Add_Ban PARAMS(( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
 
@@ -50,7 +49,7 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
 {
        CHAR *mode_ptr, the_modes[CLIENT_MODE_LEN], x[2];
        CLIENT *cl, *chan_cl, *prefix;
-       BOOLEAN set, ok;
+       BOOLEAN set, ok, modeok;
        CHANNEL *chan;
        
        assert( Client != NULL );
@@ -95,8 +94,8 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
                if( Req->argc == 2 )
                {
                        /* Liste anzeigen */
-                       if( *mode_ptr == 'I' ) return Show_InviteList( prefix, chan );
-                       if( *mode_ptr == 'b' ) return Show_BanList( prefix, chan );
+                       if( *mode_ptr == 'I' ) return Lists_ShowInvites( prefix, chan );
+                       if( *mode_ptr == 'b' ) return Lists_ShowBans( prefix, chan );
                }
                else
                {
@@ -211,7 +210,15 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
                        if( chan )
                        {
                                /* Ist der User ein Channel Operator? */
-                               if( ! strchr( Channel_UserModes( chan, Client ), 'o' ))
+                               modeok = FALSE;
+                               if( strchr( Channel_UserModes( chan, Client ), 'o' )) modeok = TRUE;
+                               if( Conf_OperCanMode )
+                               {
+                                       /* auch IRC-Operatoren duerfen MODE verwenden */
+                                       if( Client_OperByMe( Client )) modeok = TRUE;
+                               }
+
+                               if( ! modeok )
                                {
                                        Log( LOG_DEBUG, "Can't change modes: \"%s\" is not operator on %s!", Client_ID( Client ), Channel_Name( chan ));
                                        ok = IRC_WriteStrClient( Client, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Client ), Channel_Name( chan ));
@@ -427,26 +434,6 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
 } /* IRC_AWAY */
 
 
-LOCAL BOOLEAN
-Show_InviteList( CLIENT *Client, CHANNEL *Channel )
-{
-       assert( Client != NULL );
-       assert( Channel != NULL );
-
-       return IRC_WriteStrClient( Client, RPL_ENDOFINVITELIST_MSG, Client_ID( Client ), Channel_Name( Channel ));
-} /* Show_InviteList */
-
-
-LOCAL BOOLEAN
-Show_BanList( CLIENT *Client, CHANNEL *Channel )
-{
-       assert( Client != NULL );
-       assert( Channel != NULL );
-       
-       return IRC_WriteStrClient( Client, RPL_ENDOFBANLIST_MSG, Client_ID( Client ), Channel_Name( Channel ));
-} /* Show_BanList */
-
-
 LOCAL BOOLEAN
 Add_Invite( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 {
@@ -472,10 +459,21 @@ Add_Invite( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 LOCAL BOOLEAN
 Add_Ban( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 {
+       CHAR *mask;
+
        assert( Client != NULL );
        assert( Channel != NULL );
        assert( Pattern != NULL );
 
+       mask = Lists_MakeMask( Pattern );
+
+       if( ! Lists_AddBanned( mask, Channel )) return CONNECTED;
+
+       IRC_WriteStrChannelPrefix( Client, Channel, Client, TRUE, "MODE %s +b %s", Channel_Name( Channel ), mask );
+       if( Client_Type( Client ) == CLIENT_USER )
+       {
+               if( ! IRC_WriteStrClientPrefix( Client, Client, "MODE %s +b %s", Channel_Name( Channel ), mask )) return DISCONNECTED;
+       }
        return CONNECTED;
 } /* Add_Ban */
 
@@ -483,10 +481,20 @@ Add_Ban( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 LOCAL BOOLEAN
 Del_Invite( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 {
+       CHAR *mask;
+
        assert( Client != NULL );
        assert( Channel != NULL );
        assert( Pattern != NULL );
 
+       mask = Lists_MakeMask( Pattern );
+       Lists_DelInvited( mask, Channel );
+
+       IRC_WriteStrChannelPrefix( Client, Channel, Client, TRUE, "MODE %s -I %s", Channel_Name( Channel ), mask );
+       if( Client_Type( Client ) == CLIENT_USER )
+       {
+               if( ! IRC_WriteStrClientPrefix( Client, Client, "MODE %s -I %s", Channel_Name( Channel ), mask )) return DISCONNECTED;
+       }
        return CONNECTED;
 } /* Del_Invite */
 
@@ -494,10 +502,20 @@ Del_Invite( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 LOCAL BOOLEAN
 Del_Ban( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 {
+       CHAR *mask;
+
        assert( Client != NULL );
        assert( Channel != NULL );
        assert( Pattern != NULL );
 
+       mask = Lists_MakeMask( Pattern );
+       Lists_DelBanned( mask, Channel );
+
+       IRC_WriteStrChannelPrefix( Client, Channel, Client, TRUE, "MODE %s -b %s", Channel_Name( Channel ), mask );
+       if( Client_Type( Client ) == CLIENT_USER )
+       {
+               if( ! IRC_WriteStrClientPrefix( Client, Client, "MODE %s -b %s", Channel_Name( Channel ), mask )) return DISCONNECTED;
+       }
        return CONNECTED;
 } /* Del_Ban */