* fix another off by one while retrieving the iterator counter params

* fix token notation

diff --git a/webcit/static/t/mailsummary_json.html b/webcit/static/t/mailsummary_json.html
index 3369d45706c8c40c89f7998e6204bafc22135374..9f2b72e2ee35832081bf0d6cae5ac661973ee236 100644 (file)
--- a/webcit/static/t/mailsummary_json.html
+++ b/webcit/static/t/mailsummary_json.html
@@ -1,5 +1,5 @@
 { "nummsgs": <?READLOOP:TOTALMSGS>,
 "startmsg": <?READLOOP:STARTMSG>,
 "roomname": "<?ROOMNAME>",
-"msgs": [ <?ITERATE("MAIL:SUMM:MSGS","mailsummary_json_section"," ",B"startmsg",B"maxmsgs")> ]
-}
\ No newline at end of file
+"msgs": [ <?ITERATE("MAIL:SUMM:MSGS", "mailsummary_json_section", 0, B("startmsg"), B("maxmsgs"))> ]
+}

diff --git a/webcit/subst.c b/webcit/subst.c
index f4fde0edb9787d7c2e8c1d3d1bbc5aeb40ddb043..faf685dbdb84c055e72efda141191ecff4947c03 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -1830,14 +1830,14 @@ void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
        SubTP.Filter.ControlContextType = CTX_ITERATE;
        SubTP.ControlContext = &Status;
        
+       if (HAVE_PARAM(2)) {
+               StartAt = GetTemplateTokenNumber(Target, TP, 2, 0);
+       }
        if (HAVE_PARAM(3)) {
-               StartAt = GetTemplateTokenNumber(Target, TP, 3, 0);
+               StepWidth = GetTemplateTokenNumber(Target, TP, 3, 0);
        }
        if (HAVE_PARAM(4)) {
-               StepWidth = GetTemplateTokenNumber(Target, TP, 4, 0);
-       }
-       if (HAVE_PARAM(5)) {
-               StopAt = GetTemplateTokenNumber(Target, TP, 5, -1);
+               StopAt = GetTemplateTokenNumber(Target, TP, 4, -1);
        }
        it = GetNewHashPos(List, StepWidth);
        if (StopAt < 0) {