- IRC+-Protokoll ist nun abschaltbar.

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

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index d817bf3c3957b6f6410afc412b08e24de8b6dbd9..4d94b31a3f77297309e960fd692742a51fcea464 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.6 2002/05/27 13:09:27 alex Exp $
+ * $Id: irc-mode.c,v 1.10 2002/09/02 14:59:18 alex Exp $
  *
  * irc-mode.c: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...)
  */
@@ -29,6 +29,8 @@
 #include "log.h"
 #include "parse.h"
 #include "messages.h"
+#include "resolve.h"
+#include "conf.h"
 
 #include "exp.h"
 #include "irc-mode.h"
@@ -39,7 +41,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 );
@@ -171,7 +173,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 ));
@@ -203,10 +213,6 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
                                        /* Channel-Modes */
                                        switch( *mode_ptr )
                                        {
-                                               case 'a':
-                                                       /* Anonymous */
-                                                       x[0] = 'a';
-                                                       break;
                                                case 'i':
                                                        /* Invite-Only */
                                                        x[0] = 'i';
@@ -219,18 +225,6 @@ 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';