Use consistent type format for caps-limit/color-limit

doc/UPDATES

@@ -43,8 +43,8 @@
   * Bot will now lockdown channel (+im) if a drone flood is detected (#37)
     * Add chansets 'flood-mchan', 'flood-mbytes', 'flood-mctcp' to control reactions to mass floods (#37)
   * Remove unneeded chanset 'nomassjoin'
-  * Add chanset 'capslimit' to handle % of message that can be in caps before kick (#8)
-  * Add chanset 'colorlimit' to handle how many color codes are allowed in a message before kick (#8)
+  * Add chanset 'caps-limit' to handle % of message that can be in caps before kick (#8)
+  * Add chanset 'color-limit' to handle how many color codes are allowed in a message before kick (#8)
   * Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
 
 1.3.4 - http://wraith.botpack.net/milestone/1.3.4

doc/help.txt

@@ -369,10 +369,10 @@ See also: link%{+a}, newhub%{-}
                           enforce +p as well. The point is to notice the chan
                           and bots when an /invite is done. This is useful in 
                           seeing when a shell is hijacked ;)
-        $bcapslimit$b         If this is set, any +f bots will kick a client for using
+        $bcaps-limit$b        If this is set, any +f bots will kick a client for using
                           too many caps. This is a percentage (0-100) of how much of
                           their message can be caps before being kicked.
-        $bcolorlimit$b        If this is set, any +f bot will kick the client for
+        $bcolor-limit$b       If this is set, any +f bot will kick the client for
                           excess color codes. The setting is how many color/bold
                           character codes the message may contain before being kicked.
         $bban-time$b          Set here how long temporary bans will last (in

src/mod/channels.mod/chanmisc.c

@@ -426,13 +426,13 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
       i++;
       if (i >= items) {
         if (result)
-          strlcpy(result, "channel capslimit needs argument", RESULT_LEN);
+          strlcpy(result, "channel caps-limit needs argument", RESULT_LEN);
         return ERROR;
       }
       int capslimit = atoi(item[i]);
       if (capslimit > 100 || capslimit < 0 || item[i][0] == '-') {
         if (result)
-          strlcpy(result, "channel capslimit out of range (0-100)", RESULT_LEN);
+          strlcpy(result, "channel caps-limit out of range (0-100)", RESULT_LEN);
         return ERROR;
       }
       chan->capslimit = capslimit;
@@ -440,7 +440,7 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
       i++;
       if (i >= items) {
         if (result)
-          strlcpy(result, "channel colorlimit needs argument", RESULT_LEN);
+          strlcpy(result, "channel color-limit needs argument", RESULT_LEN);
         return ERROR;
       }
       chan->colorlimit = atoi(item[i]);

src/mod/channels.mod/userchan.c

@@ -840,7 +840,7 @@ void write_chans_compat(bd::Stream& stream, int idx)
 bad-cookie %d manop %d mdop %d mop %d limit %d \
 flood-chan %d:%d flood-ctcp %d:%d flood-join %d:%d \
 flood-kick %d:%d flood-deop %d:%d flood-nick %d:%d \
-capslimit %d colorlimit %d closed-ban %d closed-invite %d closed-private %d ban-time %d \
+caps-limit %d color-limit %d closed-ban %d closed-invite %d closed-private %d ban-time %d \
 exempt-time %d invite-time %d voice-non-ident %d auto-delay %d \
 %cenforcebans %cdynamicbans %cuserbans %cbitch \
 %cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \