step over ! if it's allowed on MODE_NOFLOOD

[srvx.git] / src / proto-p10.c

diff --git a/src/proto-p10.c b/src/proto-p10.c
index 354879e12cf3c022f1378b7cf8b7175d6f3ab39c..c1271db0934dfca74cb5f6418ab4c72460016fe1 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -518,7 +518,6 @@ void
 irc_relay(char *message)
 {
     putsock("%s " P10_RELAY " %s", self->numeric, message);
-    fprintf(stderr,"%s " P10_RELAY " %s", self->numeric, message);
 }
 
 void 
@@ -2584,6 +2583,7 @@ mod_chanmode_parse(struct chanNode *channel, char **modes, unsigned int argc, un
         case 'c': do_chan_mode(MODE_NOCOLORS); break;
         case 'M': do_chan_mode(MODE_NOAMSGS); break;
         case 'N': do_chan_mode(MODE_NONOTICES); break;
+        case 'u': do_chan_mode(MODE_AUDITORIUM); break;
         case 'i': do_chan_mode(MODE_INVITEONLY); break;
         case 'm': do_chan_mode(MODE_MODERATED); break;
         case 'n': do_chan_mode(MODE_NOPRIVMSGS); break;
@@ -2644,10 +2644,11 @@ mod_chanmode_parse(struct chanNode *channel, char **modes, unsigned int argc, un
                            if (in_arg >= argc)
                     goto error;
                 char *mode = modes[in_arg++];
-                if(mode[0] == '!' && !(flags & MCP_OPERMODE)) { //noflood flag also for overriders
-                    //only allow opers
-                    goto error;
-                }
+                if(mode[0] == '!' && !(flags & MCP_OPERMODE)) //noflood flag also for overriders
+                   goto error;//only allow opers
+                else if(mode[0] == '!')
+                   mode++;
+                
                 if(mode[0] == '+' || mode[0] == '@') {
                     mode++;
                 }
@@ -2664,13 +2665,14 @@ mod_chanmode_parse(struct chanNode *channel, char **modes, unsigned int argc, un
                                                break;
                                }
                 }
-                if(count <= 0 || time <= 0 || count > 100 || time > 600) 
+                if(count <= 0 || time <= 0 || count > 100 || time > 600)
                                    goto error;
                                change->modes_set |= MODE_NOFLOOD;
                                safestrncpy(change->new_noflood, modes[in_arg - 1], sizeof(change->new_noflood));
                        } else {
                            change->modes_clear |= MODE_NOFLOOD;
                        }
+            break;
         case 'F':
             if (add) {
                 if (in_arg >= argc)
@@ -2870,6 +2872,7 @@ mod_chanmode_announce(struct userNode *who, struct chanNode *channel, struct mod
         DO_MODE_CHAR(NOCTCPS, 'C');
         DO_MODE_CHAR(NONOTICES, 'N');
         DO_MODE_CHAR(NOAMSGS, 'M');
+        DO_MODE_CHAR(AUDITORIUM, 'u');
         DO_MODE_CHAR(REGISTERED, 'z');
 #undef DO_MODE_CHAR
         if (change->modes_clear & channel->modes & MODE_KEY)
@@ -2915,6 +2918,7 @@ mod_chanmode_announce(struct userNode *who, struct chanNode *channel, struct mod
         DO_MODE_CHAR(NOCTCPS, 'C');
         DO_MODE_CHAR(NONOTICES, 'N');
         DO_MODE_CHAR(NOAMSGS, 'M');
+        DO_MODE_CHAR(AUDITORIUM, 'u');
         DO_MODE_CHAR(REGISTERED, 'z');
 #undef DO_MODE_CHAR
         if(change->modes_set & MODE_KEY)
@@ -2993,6 +2997,7 @@ mod_chanmode_format(struct mod_chanmode *change, char *outbuff)
         DO_MODE_CHAR(NOCTCPS, 'C');
         DO_MODE_CHAR(NONOTICES, 'N');
         DO_MODE_CHAR(NOAMSGS, 'M');
+        DO_MODE_CHAR(AUDITORIUM, 'u');
         DO_MODE_CHAR(REGISTERED, 'z');
 #undef DO_MODE_CHAR
     }
@@ -3011,12 +3016,13 @@ mod_chanmode_format(struct mod_chanmode *change, char *outbuff)
         DO_MODE_CHAR(NOCTCPS, 'C');
         DO_MODE_CHAR(NONOTICES, 'N');
                DO_MODE_CHAR(NOAMSGS, 'M');
+        DO_MODE_CHAR(AUDITORIUM, 'u');
         DO_MODE_CHAR(REGISTERED, 'z');
         DO_MODE_CHAR(LIMIT, 'l'), args_used += sprintf(args + args_used, " %d", change->new_limit);
         DO_MODE_CHAR(KEY, 'k'), args_used += sprintf(args + args_used, " %s", change->new_key);
-        DO_MODE_CHAR(KEY, 'a'), args_used += sprintf(args + args_used, " %d", change->new_access);
-        DO_MODE_CHAR(KEY, 'F'), args_used += sprintf(args + args_used, " %s", change->new_altchan);
-        DO_MODE_CHAR(KEY, 'f'), args_used += sprintf(args + args_used, " %s", change->new_noflood);
+        DO_MODE_CHAR(ACCESS, 'a'), args_used += sprintf(args + args_used, " %d", change->new_access);
+        DO_MODE_CHAR(ALTCHAN, 'F'), args_used += sprintf(args + args_used, " %s", change->new_altchan);
+        DO_MODE_CHAR(NOFLOOD, 'f'), args_used += sprintf(args + args_used, " %s", change->new_noflood);
         DO_MODE_CHAR(UPASS, 'U'), args_used += sprintf(args + args_used, " %s", change->new_upass);
         DO_MODE_CHAR(APASS, 'A'), args_used += sprintf(args + args_used, " %s", change->new_apass);
 #undef DO_MODE_CHAR
@@ -3075,6 +3081,7 @@ clear_chanmode(struct chanNode *channel, const char *modes)
         case 'c': cleared |= MODE_NOCOLORS; break;
         case 'C': cleared |= MODE_NOCTCPS; break;
         case 'M': cleared |= MODE_NOAMSGS; break;
+        case 'u': cleared |= MODE_AUDITORIUM; break;
         case 'N': cleared |= MODE_NONOTICES; break;
         case 'z': cleared |= MODE_REGISTERED; break;
         }