- Hmpf. "Verfruehtes" CVS-Update einiger Source-Files zurueckgenommen ...

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

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 73703e577862d7d99e995133367d57068e23fec9..84e40b457ec3afcf995f2cc92feeeaab12452113 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.9 2002/08/26 23:47:58 alex Exp $
  *
  * irc-mode.c: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...)
  */
@@ -26,7 +26,6 @@
 #include "channel.h"
 #include "defines.h"
 #include "irc-write.h"
-#include "lists.h"
 #include "log.h"
 #include "parse.h"
 #include "messages.h"
@@ -35,16 +34,6 @@
 #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 ));
-
-LOCAL BOOLEAN Del_Invite PARAMS(( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
-LOCAL BOOLEAN Del_Ban PARAMS(( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
-
-
 GLOBAL BOOLEAN
 IRC_MODE( CLIENT *Client, REQUEST *Req )
 {
@@ -78,43 +67,6 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
        if(( cl ) && ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
        if(( chan ) && ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-       /* Prefix fuer Antworten etc. ermitteln */
-       if( Client_Type( Client ) == CLIENT_SERVER )
-       {
-               prefix = Client_Search( Req->prefix );
-               if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
-       }
-       else prefix = Client;
-       
-       if(( chan ) && (( Req->argc == 2 ) || ( Req->argc == 3 )))
-       {
-               /* pruefen, ob "Listen-Operation": Invite, Ban */
-               if(( Req->argv[1][0] == '-'  ) || ( Req->argv[1][0] == '+' )) mode_ptr = &Req->argv[1][1];
-               else mode_ptr = &Req->argv[1][0];
-
-               if( Req->argc == 2 )
-               {
-                       /* Liste anzeigen */
-                       if( *mode_ptr == 'I' ) return Show_InviteList( prefix, chan );
-                       if( *mode_ptr == 'b' ) return Show_BanList( prefix, chan );
-               }
-               else
-               {
-                       if( Req->argv[1][0] == '+' )
-                       {
-                               /* Listen-Eintrag hinzufuegen */
-                               if( *mode_ptr == 'I' ) return Add_Invite( prefix, chan, Req->argv[2] );
-                               if( *mode_ptr == 'b' ) return Add_Ban( prefix, chan, Req->argv[2] );
-                       }
-                       else if( Req->argv[1][0] == '-' )
-                       {
-                               /* Listen-Eintrag loeschen */
-                               if( *mode_ptr == 'I' ) return Del_Invite( prefix, chan, Req->argv[2] );
-                               if( *mode_ptr == 'b' ) return Del_Ban( prefix, chan, Req->argv[2] );
-                       }
-               }
-       }
-
        /* Client ermitteln, wenn bei Channel-Modes mit 3 Parametern */
        if(( chan ) && (Req->argc == 3 ))
        {
@@ -156,6 +108,14 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
                else set = TRUE;
                if(( *mode_ptr == '-' ) || ( *mode_ptr == '+' )) mode_ptr++;
        }
+       
+       /* Prefix fuer Antworten etc. ermitteln */
+       if( Client_Type( Client ) == CLIENT_SERVER )
+       {
+               prefix = Client_Search( Req->prefix );
+               if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+       }
+       else prefix = Client;
 
        /* Reply-String mit Aenderungen vorbereiten */
        if( set ) strcpy( the_modes, "+" );
@@ -427,79 +387,4 @@ 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 )
-{
-       CHAR *mask;
-
-       assert( Client != NULL );
-       assert( Channel != NULL );
-       assert( Pattern != NULL );
-
-       mask = Lists_MakeMask( Pattern );
-
-       if( ! Lists_AddInvited( mask, Channel, FALSE )) return CONNECTED;
-
-       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;
-} /* Add_Invite */
-
-
-LOCAL BOOLEAN
-Add_Ban( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
-{
-       assert( Client != NULL );
-       assert( Channel != NULL );
-       assert( Pattern != NULL );
-
-       return CONNECTED;
-} /* Add_Ban */
-
-
-LOCAL BOOLEAN
-Del_Invite( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
-{
-       assert( Client != NULL );
-       assert( Channel != NULL );
-       assert( Pattern != NULL );
-
-       return CONNECTED;
-} /* Del_Invite */
-
-
-LOCAL BOOLEAN
-Del_Ban( CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
-{
-       assert( Client != NULL );
-       assert( Channel != NULL );
-       assert( Pattern != NULL );
-
-       return CONNECTED;
-} /* Del_Ban */
-
-
 /* -eof- */