Change max_bans in reference.conf from 25 to 100, like example.conf.

[irc/rqf/shadowircd.git] / src / chmode.c

diff --git a/src/chmode.c b/src/chmode.c
index a1353693019a3e5718633daf99a309292f9721b2..6ee15eb1c4f05c9875896ca847926932c666f1f8 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -43,6 +43,7 @@
 #include "chmode.h"
 #include "irc_dictionary.h"
 
+
 /* bitmasks for error returns, so we send once per call */
 #define SM_ERR_NOTS             0x00000001     /* No TS on channel */
 #define SM_ERR_NOOPS            0x00000002     /* No chan ops */
@@ -69,6 +70,7 @@ static int no_override_deop;
 
 char cflagsbuf[256];
 char cflagsmyinfo[256];
+char cflagsparaminfo[256];
 
 int chmode_flags[256];
 
@@ -120,14 +122,17 @@ construct_cflags_strings(void)
 
                        break;
                    default:
-                       if(chmode_flags[i] != 0)
+                       if(chmode_flags[i] != 0 && !(chmode_table[i].set_func == chm_orphaned))
                        {
                            *ptr++ = (char) i;
                        }
                }
                
                /* Should we leave orphaned check here? -- dwr */
-               if(!(chmode_table[i].set_func == chm_nosuch) && !(chmode_table[i].set_func == chm_orphaned))
+               if( !(chmode_table[i].set_func == chm_nosuch) && 
+                       !(chmode_table[i].set_func == chm_orphaned) && 
+                       !(chmode_table[i].set_func == chm_admin && !ConfigChannel.use_admin) && 
+                       !(chmode_table[i].set_func == chm_halfop && !ConfigChannel.use_halfop))
                {
                    *ptr2++ = (char) i;
                }
@@ -137,6 +142,21 @@ construct_cflags_strings(void)
        *ptr2++ = '\0';
 }
 
+void
+construct_cflag_param_string(void)
+{
+
+       *cflagsparaminfo = '\0';
+       rb_snprintf(cflagsparaminfo, sizeof cflagsparaminfo, "%sb%s%s%s%sklov%s%s",
+                       ConfigChannel.use_admin ? "a" : "",
+                       ConfigChannel.use_except ? "e" : "",
+                       ConfigChannel.use_forward ? "f" : "",
+                       ConfigChannel.use_halfop ? "h" : "",
+                       strcasecmp(ConfigChannel.disabledmodes, "j") ? "" : "j",
+                       strcasecmp(ConfigChannel.disabledmodes, "q") ? "" : "q",
+                       ConfigChannel.use_invex ? "I" : "");
+}
+
 /*
  * find_umode_slot
  *
@@ -640,6 +660,7 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
        if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
                return;
 
+
        /* setting + */
        if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type))
        {
@@ -653,6 +674,19 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
                mode_changes[mode_count].mems = ONLY_OPERS;
                mode_changes[mode_count].override = 0;
                mode_changes[mode_count++].arg = NULL;
+       
+               /* A little ugly */
+               sendto_wallops_flags(UMODE_WALLOP, &me, 
+                               "+%c set on [%s] by %s!%s@%s",
+                               c, chptr->chname, source_p->name, source_p->username, source_p->host);
+               ilog(L_MAIN, "+%c set on [%s] by %s",
+                               c, chptr->chname, get_oper_name(source_p));
+
+               if(*chptr->chname != '&')
+                       sendto_server(NULL, NULL, NOCAPS, NOCAPS, 
+                               ":%s WALLOPS :+%c set on [%s] by %s!%s@%s",
+                               me.name, c, chptr->chname, source_p->name, source_p->username,
+                               source_p->host);
        }
        else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
        {
@@ -666,6 +700,19 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
                mode_changes[mode_count].id = NULL;
                mode_changes[mode_count].override = 0;
                mode_changes[mode_count++].arg = NULL;
+               
+               /* A little ugly */
+               sendto_wallops_flags(UMODE_WALLOP, &me, 
+                               "+%c unset from [%s] by %s!%s@%s",
+                               c, chptr->chname, source_p->name, source_p->username, source_p->host);
+               ilog(L_MAIN, "+%c unset from [%s] by %s",
+                               c, chptr->chname, get_oper_name(source_p));
+
+               if(*chptr->chname != '&')
+                       sendto_server(NULL, NULL, NOCAPS, NOCAPS, 
+                               ":%s WALLOPS :+%c unset from [%s] by %s!%s@%s",
+                               me.name, c, chptr->chname, source_p->name, source_p->username,
+                               source_p->host);
        }
 }