af730d9e24c0642fe39657f890bc117ed015ccbf galt Wed Feb 15 01:12:26 2017 -0800 CSP code cleanup. Using new var-args versions of functions jsInlineF and jsOnEventByIdF to avoid using lots of fixed-size local javascript strings. diff --git src/lib/cheapcgi.c src/lib/cheapcgi.c index 53d6914..bdb132b 100644 --- src/lib/cheapcgi.c +++ src/lib/cheapcgi.c @@ -1891,34 +1891,32 @@ else { int sz=initialVal+1000; if (min) sz=atoi(min) + 1000; width = 10; while (sz/=10) width+=10; } } if (width < 65) width = 65; printf("<INPUT TYPE=TEXT class='inputBox' name='%s' id='%s' style='width: %dpx' value=%d", varName,varName,width,initialVal); -char javascript[1024]; -safef(javascript, sizeof javascript, "return validateInt(this,%s,%s);", +jsOnEventByIdF("change", varName, "return validateInt(this,%s,%s);", (min ? min : "\"null\""),(max ? max : "\"null\"")); -jsOnEventById("change", varName, javascript); if (title) printf(" title='%s'",title); printf(">\n"); } void cgiMakeIntVarWithLimits(char *varName, int initialVal, char *title, int width, int min, int max) { char minLimit[20]; char maxLimit[20]; char *minStr=NULL; char *maxStr=NULL; if (min != NO_VALUE) { safef(minLimit,sizeof(minLimit),"%d",min); @@ -1969,34 +1967,32 @@ char *min, char *max) /* Make a floating point control filled with initial value. If min and/or max are non-NULL will enforce range Requires utils.js jQuery.js and inputBox class */ { if (width==0) { if (max) width=strlen(max)*10; } if (width < 65) width = 65; printf("<INPUT TYPE=TEXT class='inputBox' name='%s' id='%s' style='width: %dpx' value=%g", varName,varName,width,initialVal); -char javascript[1024]; -safef(javascript, sizeof javascript, "return validateFloat(this,%s,%s);", +jsOnEventByIdF("change", varName, "return validateFloat(this,%s,%s);", (min ? min : "\"null\""),(max ? max : "\"null\"")); -jsOnEventById("change", varName, javascript); if (title) printf(" title='%s'",title); printf(">\n"); } void cgiMakeDoubleVarWithLimits(char *varName, double initialVal, char *title, int width, double min, double max) { char minLimit[20]; char maxLimit[20]; char *minStr=NULL; char *maxStr=NULL; if ((int)min != NO_VALUE) { safef(minLimit,sizeof(minLimit),"%g",min);