- nicht unterstuetzte Channel-Modes entfernt.

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

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 966f0cc2c822cb19b66f5a259016ffea6124e866..c47345ae457e693b824b43131408c0036d63d7e9 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -9,34 +9,33 @@
  * 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.1 2002/02/27 23:26:21 alex Exp $
+ * $Id: irc-mode.c,v 1.7 2002/06/02 15:14:22 alex Exp $
  *
  * irc-mode.c: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...)
- *
- * $Log: irc-mode.c,v $
- * Revision 1.1  2002/02/27 23:26:21  alex
- * - Modul aus irc.c bzw. irc.h ausgegliedert.
- *
  */
 
 
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
 
-#include <imp.h>
+#include "imp.h"
 #include <assert.h>
 #include <string.h>
 
+#include "conn.h"
+#include "client.h"
 #include "channel.h"
+#include "defines.h"
 #include "irc-write.h"
 #include "log.h"
+#include "parse.h"
 #include "messages.h"
 
-#include <exp.h>
+#include "exp.h"
 #include "irc-mode.h"
 
 
-GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_MODE( CLIENT *Client, REQUEST *Req )
 {
        CHAR *mode_ptr, the_modes[CLIENT_MODE_LEN], x[2];
        CLIENT *cl, *chan_cl, *prefix;
@@ -113,7 +112,7 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
        /* Prefix fuer Antworten etc. ermitteln */
        if( Client_Type( Client ) == CLIENT_SERVER )
        {
-               prefix = Client_GetFromID( Req->prefix );
+               prefix = Client_Search( Req->prefix );
                if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
        }
        else prefix = Client;
@@ -132,14 +131,6 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                        /* Befehl kommt von einem Server, daher
                         * trauen wir ihm "unbesehen" ... */
                        x[0] = *mode_ptr;
-
-                       if(( cl ) && ( x[0] == 'a' ))
-                       {
-                               /* away */
-                               if( set ) Client_SetAway( cl, "Away" );
-                               else Client_SetAway( cl, NULL );
-                       }
-                       
                }
                else
                {
@@ -153,11 +144,6 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                                                /* invisible */
                                                x[0] = 'i';
                                                break;
-                                       case 'r':
-                                               /* restricted (kann nur gesetzt werden) */
-                                               if( set ) x[0] = 'r';
-                                               else ok = IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client ));
-                                               break;
                                        case 'o':
                                                /* operator (kann nur geloescht werden) */
                                                if( ! set )
@@ -167,6 +153,15 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                                                }
                                                else ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client ));
                                                break;
+                                       case 'r':
+                                               /* restricted (kann nur gesetzt werden) */
+                                               if( set ) x[0] = 'r';
+                                               else ok = IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client ));
+                                               break;
+                                       case 's':
+                                               /* server messages */
+                                               x[0] = 's';
+                                               break;
                                        default:
                                                Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ));
                                                ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr );
@@ -208,9 +203,9 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                                        /* Channel-Modes */
                                        switch( *mode_ptr )
                                        {
-                                               case 'a':
-                                                       /* Anonymous */
-                                                       x[0] = 'a';
+                                               case 'i':
+                                                       /* Invite-Only */
+                                                       x[0] = 'i';
                                                        break;
                                                case 'm':
                                                        /* Moderated */
@@ -220,22 +215,14 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                                                        /* kein Schreiben in den Channel von aussen */
                                                        x[0] = 'n';
                                                        break;
-                                               case 'p':
-                                                       /* Private */
-                                                       x[0] = 'p';
-                                                       break;
-                                               case 'q':
-                                                       /* Quiet */
-                                                       x[0] = 'q';
-                                                       break;
-                                               case 's':
-                                                       /* Secret */
-                                                       x[0] = 's';
-                                                       break;
                                                case 't':
                                                        /* Topic Lock */
                                                        x[0] = 't';
                                                        break;
+                                               case 'P':
+                                                       /* Persistent */
+                                                       x[0] = 'P';
+                                                       break;
                                                default:
                                                        Log( LOG_DEBUG, "Unknown channel-mode \"%c%c\" from \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Channel_Name( chan ));
                                                        ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr );
@@ -257,12 +244,21 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                        {
                                /* Mode setzen. Wenn der Client ihn noch nicht hatte: merken */
                                if( Client_ModeAdd( cl, x[0] )) strcat( the_modes, x );
+                               
                        }
                        else
                        {
                                /* Modes geloescht. Wenn der Client ihn hatte: merken */
                                if( Client_ModeDel( cl, x[0] )) strcat( the_modes, x );
                        }
+
+                       /* "nachbearbeiten" */
+                       if( x[0] == 'a' )
+                       {
+                               /* away */
+                               if( set ) Client_SetAway( cl, DEFAULT_AWAY_MSG );
+                               else Client_SetAway( cl, NULL );
+                       }
                }
                if( chan )
                {
@@ -363,7 +359,8 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
 } /* IRC_MODE */
 
 
-GLOBAL BOOLEAN IRC_AWAY( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_AWAY( CLIENT *Client, REQUEST *Req )
 {
        assert( Client != NULL );
        assert( Req != NULL );