0e83ca88ce8… — Fossil SCM

M src/alerts.c

+14 -14

		--- src/alerts.c
		+++ src/alerts.c
		@@ -174,11 +174,11 @@
174	174	static int alert_webpages_disabled(void){
175	175	if( alert_tables_exist() ) return 0;
176	176	style_set_current_feature("alerts");
177	177	style_header("Email Alerts Are Disabled");
178	178	@ <p>Email alerts are disabled on this server</p>
179		- style_finish_page("alerts");
	179	+ style_finish_page();
180	180	return 1;
181	181	}
182	182
183	183	/*
184	184	** Insert a "Subscriber List" submenu link if the current user
		@@ -310,11 +310,11 @@
310	310	@ <hr>
311	311
312	312	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
313	313	@ </div></form>
314	314	db_end_transaction(0);
315		- style_finish_page("alerts");
	315	+ style_finish_page();
316	316	}
317	317
318	318	#if 0
319	319	/*
320	320	** Encode pMsg as MIME base64 and append it to pOut
		@@ -1438,11 +1438,11 @@
1438	1438	@ <p>An email has been sent to "%h(zEAddr)". That email contains a
1439	1439	@ hyperlink that you must click to activate your
1440	1440	@ subscription.</p>
1441	1441	}
1442	1442	alert_sender_free(pSender);
1443		- style_finish_page("alerts");
	1443	+ style_finish_page();
1444	1444	}
1445	1445	return;
1446	1446	}
1447	1447	style_header("Signup For Email Alerts");
1448	1448	if( P("submit")==0 ){
		@@ -1555,11 +1555,11 @@
1555	1555	@ Enter the 8 characters above in the "Security Code" box<br/>
1556	1556	@ </td></tr></table></div>
1557	1557	}
1558	1558	@ </form>
1559	1559	fossil_free(zErr);
1560		- style_finish_page("alerts");
	1560	+ style_finish_page();
1561	1561	}
1562	1562
1563	1563	/*
1564	1564	** Either shutdown or completely delete a subscription entry given
1565	1565	** by the hex value zName. Then paint a webpage that explains that
		@@ -1594,11 +1594,11 @@
1594	1594	@ <a href="%R/setup_uedit?id=%d(uid)">edit or delete
1595	1595	@ the corresponding user "%h(zLogin)"</a></p>
1596	1596	}
1597	1597	}
1598	1598	db_finalize(&q);
1599		- style_finish_page("alerts");
	1599	+ style_finish_page();
1600	1600	return;
1601	1601	}
1602	1602
1603	1603	/*
1604	1604	** WEBPAGE: alerts
		@@ -1919,11 +1919,11 @@
1919	1919	@ </tr>
1920	1920	@ </table>
1921	1921	@ </form>
1922	1922	fossil_free(zErr);
1923	1923	db_finalize(&q);
1924		- style_finish_page("alerts");
	1924	+ style_finish_page();
1925	1925	db_commit_transaction();
1926	1926	return;
1927	1927	}
1928	1928
1929	1929	/* This is the message that gets sent to describe how to change
		@@ -2028,11 +2028,11 @@
2028	2028	}else{
2029	2029	@ <p>An email has been sent to "%h(zEAddr)" that explains how to
2030	2030	@ unsubscribe and/or modify your subscription settings</p>
2031	2031	}
2032	2032	alert_sender_free(pSender);
2033		- style_finish_page("alerts");
	2033	+ style_finish_page();
2034	2034	return;
2035	2035	}
2036	2036
2037	2037	/* Non-logged-in users have to enter an email address to which is
2038	2038	** sent a message containing the unsubscribe link.
		@@ -2078,11 +2078,11 @@
2078	2078	@ </pre>
2079	2079	@ Enter the 8 characters above in the "Security Code" box<br/>
2080	2080	@ </td></tr></table></div>
2081	2081	@ </form>
2082	2082	fossil_free(zErr);
2083		- style_finish_page("alerts");
	2083	+ style_finish_page();
2084	2084	}
2085	2085
2086	2086	/*
2087	2087	** WEBPAGE: subscribers
2088	2088	**
		@@ -2190,11 +2190,11 @@
2190	2190	@ </tr>
2191	2191	}
2192	2192	@ </tbody></table>
2193	2193	db_finalize(&q);
2194	2194	style_table_sorter();
2195		- style_finish_page("alerts");
	2195	+ style_finish_page();
2196	2196	}
2197	2197
2198	2198	#if LOCAL_INTERFACE
2199	2199	/*
2200	2200	** A single event that might appear in an alert is recorded as an
		@@ -2811,11 +2811,11 @@
2811	2811	login_check_credentials();
2812	2812	style_set_current_feature("alerts");
2813	2813	if( zAdminEmail==0 \|\| zAdminEmail[0]==0 ){
2814	2814	style_header("Outbound Email Disabled");
2815	2815	@ <p>Outbound email is disabled on this repository
2816		- style_finish_page("alerts");
	2816	+ style_finish_page();
2817	2817	return;
2818	2818	}
2819	2819	if( P("submit")!=0
2820	2820	&& P("subject")!=0
2821	2821	&& P("msg")!=0
		@@ -2843,11 +2843,11 @@
2843	2843	}else{
2844	2844	@ <p>Your message has been sent to the repository administrator.
2845	2845	@ Thank you for your input.</p>
2846	2846	}
2847	2847	alert_sender_free(pSender);
2848		- style_finish_page("alerts");
	2848	+ style_finish_page();
2849	2849	return;
2850	2850	}
2851	2851	if( captcha_needed() ){
2852	2852	uSeed = captcha_seed();
2853	2853	zDecoded = captcha_decode(uSeed);
		@@ -2891,11 +2891,11 @@
2891	2891	@ </pre>
2892	2892	@ Enter the 8 characters above in the "Security Code" box<br/>
2893	2893	@ </td></tr></table></div>
2894	2894	}
2895	2895	@ </form>
2896		- style_finish_page("alerts");
	2896	+ style_finish_page();
2897	2897	}
2898	2898
2899	2899	/*
2900	2900	** Send an annoucement message described by query parameter.
2901	2901	** Permission to do this has already been verified.
		@@ -3000,11 +3000,11 @@
3000	3000	@ </pre></blockquote>
3001	3001	}else{
3002	3002	@ <p>The announcement has been sent.
3003	3003	@ <a href="%h(PD("REQUEST_URI","/"))">Send another</a></p>
3004	3004	}
3005		- style_finish_page("alerts");
	3005	+ style_finish_page();
3006	3006	return;
3007	3007	} else if( !alert_enabled() ){
3008	3008	style_header("Cannot Send Announcement");
3009	3009	@ <p>Either you have no subscribers yet, or email alerts are not yet
3010	3010	@ <a href="https://fossil-scm.org/fossil/doc/trunk/www/alerts.md">set up</a>
		@@ -3054,7 +3054,7 @@
3054	3054	@ <td><input type="submit" name="submit" value="Send Message">
3055	3055	}
3056	3056	@ </tr>
3057	3057	@ </table>
3058	3058	@ </form>
3059		- style_finish_page("alerts");
	3059	+ style_finish_page();
3060	3060	}
3061	3061

	--- src/alerts.c
	+++ src/alerts.c
	@@ -174,11 +174,11 @@
174	static int alert_webpages_disabled(void){
175	if( alert_tables_exist() ) return 0;
176	style_set_current_feature("alerts");
177	style_header("Email Alerts Are Disabled");
178	@ <p>Email alerts are disabled on this server</p>
179	style_finish_page("alerts");
180	return 1;
181	}
182
183	/*
184	** Insert a "Subscriber List" submenu link if the current user
	@@ -310,11 +310,11 @@
310	@ <hr>
311
312	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
313	@ </div></form>
314	db_end_transaction(0);
315	style_finish_page("alerts");
316	}
317
318	#if 0
319	/*
320	** Encode pMsg as MIME base64 and append it to pOut
	@@ -1438,11 +1438,11 @@
1438	@ <p>An email has been sent to "%h(zEAddr)". That email contains a
1439	@ hyperlink that you must click to activate your
1440	@ subscription.</p>
1441	}
1442	alert_sender_free(pSender);
1443	style_finish_page("alerts");
1444	}
1445	return;
1446	}
1447	style_header("Signup For Email Alerts");
1448	if( P("submit")==0 ){
	@@ -1555,11 +1555,11 @@
1555	@ Enter the 8 characters above in the "Security Code" box<br/>
1556	@ </td></tr></table></div>
1557	}
1558	@ </form>
1559	fossil_free(zErr);
1560	style_finish_page("alerts");
1561	}
1562
1563	/*
1564	** Either shutdown or completely delete a subscription entry given
1565	** by the hex value zName. Then paint a webpage that explains that
	@@ -1594,11 +1594,11 @@
1594	@ <a href="%R/setup_uedit?id=%d(uid)">edit or delete
1595	@ the corresponding user "%h(zLogin)"</a></p>
1596	}
1597	}
1598	db_finalize(&q);
1599	style_finish_page("alerts");
1600	return;
1601	}
1602
1603	/*
1604	** WEBPAGE: alerts
	@@ -1919,11 +1919,11 @@
1919	@ </tr>
1920	@ </table>
1921	@ </form>
1922	fossil_free(zErr);
1923	db_finalize(&q);
1924	style_finish_page("alerts");
1925	db_commit_transaction();
1926	return;
1927	}
1928
1929	/* This is the message that gets sent to describe how to change
	@@ -2028,11 +2028,11 @@
2028	}else{
2029	@ <p>An email has been sent to "%h(zEAddr)" that explains how to
2030	@ unsubscribe and/or modify your subscription settings</p>
2031	}
2032	alert_sender_free(pSender);
2033	style_finish_page("alerts");
2034	return;
2035	}
2036
2037	/* Non-logged-in users have to enter an email address to which is
2038	** sent a message containing the unsubscribe link.
	@@ -2078,11 +2078,11 @@
2078	@ </pre>
2079	@ Enter the 8 characters above in the "Security Code" box<br/>
2080	@ </td></tr></table></div>
2081	@ </form>
2082	fossil_free(zErr);
2083	style_finish_page("alerts");
2084	}
2085
2086	/*
2087	** WEBPAGE: subscribers
2088	**
	@@ -2190,11 +2190,11 @@
2190	@ </tr>
2191	}
2192	@ </tbody></table>
2193	db_finalize(&q);
2194	style_table_sorter();
2195	style_finish_page("alerts");
2196	}
2197
2198	#if LOCAL_INTERFACE
2199	/*
2200	** A single event that might appear in an alert is recorded as an
	@@ -2811,11 +2811,11 @@
2811	login_check_credentials();
2812	style_set_current_feature("alerts");
2813	if( zAdminEmail==0 \|\| zAdminEmail[0]==0 ){
2814	style_header("Outbound Email Disabled");
2815	@ <p>Outbound email is disabled on this repository
2816	style_finish_page("alerts");
2817	return;
2818	}
2819	if( P("submit")!=0
2820	&& P("subject")!=0
2821	&& P("msg")!=0
	@@ -2843,11 +2843,11 @@
2843	}else{
2844	@ <p>Your message has been sent to the repository administrator.
2845	@ Thank you for your input.</p>
2846	}
2847	alert_sender_free(pSender);
2848	style_finish_page("alerts");
2849	return;
2850	}
2851	if( captcha_needed() ){
2852	uSeed = captcha_seed();
2853	zDecoded = captcha_decode(uSeed);
	@@ -2891,11 +2891,11 @@
2891	@ </pre>
2892	@ Enter the 8 characters above in the "Security Code" box<br/>
2893	@ </td></tr></table></div>
2894	}
2895	@ </form>
2896	style_finish_page("alerts");
2897	}
2898
2899	/*
2900	** Send an annoucement message described by query parameter.
2901	** Permission to do this has already been verified.
	@@ -3000,11 +3000,11 @@
3000	@ </pre></blockquote>
3001	}else{
3002	@ <p>The announcement has been sent.
3003	@ <a href="%h(PD("REQUEST_URI","/"))">Send another</a></p>
3004	}
3005	style_finish_page("alerts");
3006	return;
3007	} else if( !alert_enabled() ){
3008	style_header("Cannot Send Announcement");
3009	@ <p>Either you have no subscribers yet, or email alerts are not yet
3010	@ <a href="https://fossil-scm.org/fossil/doc/trunk/www/alerts.md">set up</a>
	@@ -3054,7 +3054,7 @@
3054	@ <td><input type="submit" name="submit" value="Send Message">
3055	}
3056	@ </tr>
3057	@ </table>
3058	@ </form>
3059	style_finish_page("alerts");
3060	}
3061

	--- src/alerts.c
	+++ src/alerts.c
	@@ -174,11 +174,11 @@
174	static int alert_webpages_disabled(void){
175	if( alert_tables_exist() ) return 0;
176	style_set_current_feature("alerts");
177	style_header("Email Alerts Are Disabled");
178	@ <p>Email alerts are disabled on this server</p>
179	style_finish_page();
180	return 1;
181	}
182
183	/*
184	** Insert a "Subscriber List" submenu link if the current user
	@@ -310,11 +310,11 @@
310	@ <hr>
311
312	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
313	@ </div></form>
314	db_end_transaction(0);
315	style_finish_page();
316	}
317
318	#if 0
319	/*
320	** Encode pMsg as MIME base64 and append it to pOut
	@@ -1438,11 +1438,11 @@
1438	@ <p>An email has been sent to "%h(zEAddr)". That email contains a
1439	@ hyperlink that you must click to activate your
1440	@ subscription.</p>
1441	}
1442	alert_sender_free(pSender);
1443	style_finish_page();
1444	}
1445	return;
1446	}
1447	style_header("Signup For Email Alerts");
1448	if( P("submit")==0 ){
	@@ -1555,11 +1555,11 @@
1555	@ Enter the 8 characters above in the "Security Code" box<br/>
1556	@ </td></tr></table></div>
1557	}
1558	@ </form>
1559	fossil_free(zErr);
1560	style_finish_page();
1561	}
1562
1563	/*
1564	** Either shutdown or completely delete a subscription entry given
1565	** by the hex value zName. Then paint a webpage that explains that
	@@ -1594,11 +1594,11 @@
1594	@ <a href="%R/setup_uedit?id=%d(uid)">edit or delete
1595	@ the corresponding user "%h(zLogin)"</a></p>
1596	}
1597	}
1598	db_finalize(&q);
1599	style_finish_page();
1600	return;
1601	}
1602
1603	/*
1604	** WEBPAGE: alerts
	@@ -1919,11 +1919,11 @@
1919	@ </tr>
1920	@ </table>
1921	@ </form>
1922	fossil_free(zErr);
1923	db_finalize(&q);
1924	style_finish_page();
1925	db_commit_transaction();
1926	return;
1927	}
1928
1929	/* This is the message that gets sent to describe how to change
	@@ -2028,11 +2028,11 @@
2028	}else{
2029	@ <p>An email has been sent to "%h(zEAddr)" that explains how to
2030	@ unsubscribe and/or modify your subscription settings</p>
2031	}
2032	alert_sender_free(pSender);
2033	style_finish_page();
2034	return;
2035	}
2036
2037	/* Non-logged-in users have to enter an email address to which is
2038	** sent a message containing the unsubscribe link.
	@@ -2078,11 +2078,11 @@
2078	@ </pre>
2079	@ Enter the 8 characters above in the "Security Code" box<br/>
2080	@ </td></tr></table></div>
2081	@ </form>
2082	fossil_free(zErr);
2083	style_finish_page();
2084	}
2085
2086	/*
2087	** WEBPAGE: subscribers
2088	**
	@@ -2190,11 +2190,11 @@
2190	@ </tr>
2191	}
2192	@ </tbody></table>
2193	db_finalize(&q);
2194	style_table_sorter();
2195	style_finish_page();
2196	}
2197
2198	#if LOCAL_INTERFACE
2199	/*
2200	** A single event that might appear in an alert is recorded as an
	@@ -2811,11 +2811,11 @@
2811	login_check_credentials();
2812	style_set_current_feature("alerts");
2813	if( zAdminEmail==0 \|\| zAdminEmail[0]==0 ){
2814	style_header("Outbound Email Disabled");
2815	@ <p>Outbound email is disabled on this repository
2816	style_finish_page();
2817	return;
2818	}
2819	if( P("submit")!=0
2820	&& P("subject")!=0
2821	&& P("msg")!=0
	@@ -2843,11 +2843,11 @@
2843	}else{
2844	@ <p>Your message has been sent to the repository administrator.
2845	@ Thank you for your input.</p>
2846	}
2847	alert_sender_free(pSender);
2848	style_finish_page();
2849	return;
2850	}
2851	if( captcha_needed() ){
2852	uSeed = captcha_seed();
2853	zDecoded = captcha_decode(uSeed);
	@@ -2891,11 +2891,11 @@
2891	@ </pre>
2892	@ Enter the 8 characters above in the "Security Code" box<br/>
2893	@ </td></tr></table></div>
2894	}
2895	@ </form>
2896	style_finish_page();
2897	}
2898
2899	/*
2900	** Send an annoucement message described by query parameter.
2901	** Permission to do this has already been verified.
	@@ -3000,11 +3000,11 @@
3000	@ </pre></blockquote>
3001	}else{
3002	@ <p>The announcement has been sent.
3003	@ <a href="%h(PD("REQUEST_URI","/"))">Send another</a></p>
3004	}
3005	style_finish_page();
3006	return;
3007	} else if( !alert_enabled() ){
3008	style_header("Cannot Send Announcement");
3009	@ <p>Either you have no subscribers yet, or email alerts are not yet
3010	@ <a href="https://fossil-scm.org/fossil/doc/trunk/www/alerts.md">set up</a>
	@@ -3054,7 +3054,7 @@
3054	@ <td><input type="submit" name="submit" value="Send Message">
3055	}
3056	@ </tr>
3057	@ </table>
3058	@ </form>
3059	style_finish_page();
3060	}
3061

M src/attach.c

+5 -5

		--- src/attach.c
		+++ src/attach.c
		@@ -146,11 +146,11 @@
146	146	hyperlink_to_date(zDate, ".");
147	147	free(zUrlTail);
148	148	}
149	149	db_finalize(&q);
150	150	@ </ol>
151		- style_finish_page("attach");
	151	+ style_finish_page();
152	152	return;
153	153	}
154	154
155	155	/*
156	156	** WEBPAGE: attachdownload
		@@ -207,16 +207,16 @@
207	207	);
208	208	}
209	209	if( zUUID==0 \|\| zUUID[0]==0 ){
210	210	style_header("No Such Attachment");
211	211	@ No such attachment....
212		- style_finish_page("attach");
	212	+ style_finish_page();
213	213	return;
214	214	}else if( zUUID[0]=='x' ){
215	215	style_header("Missing");
216	216	@ Attachment has been deleted
217		- style_finish_page("attach");
	217	+ style_finish_page();
218	218	return;
219	219	}else{
220	220	g.perm.Read = 1;
221	221	cgi_replace_parameter("name",zUUID);
222	222	if( fossil_strcmp(g.zPath,"attachview")==0 ){
		@@ -413,11 +413,11 @@
413	413	@ <input type="submit" name="ok" value="Add Attachment" />
414	414	@ <input type="submit" name="cancel" value="Cancel" />
415	415	@ </div>
416	416	captcha_generate(0);
417	417	@ </form>
418		- style_finish_page("attach");
	418	+ style_finish_page();
419	419	fossil_free(zTargetType);
420	420	}
421	421
422	422	/*
423	423	** WEBPAGE: ainfo
		@@ -626,11 +626,11 @@
626	626	@ <i>(file is %d(sz) bytes of binary data)</i>
627	627	}
628	628	@ </blockquote>
629	629	manifest_destroy(pAttach);
630	630	blob_reset(&attach);
631		- style_finish_page("attach");
	631	+ style_finish_page();
632	632	}
633	633
634	634	/*
635	635	** Output HTML to show a list of attachments.
636	636	*/
637	637

	--- src/attach.c
	+++ src/attach.c
	@@ -146,11 +146,11 @@
146	hyperlink_to_date(zDate, ".");
147	free(zUrlTail);
148	}
149	db_finalize(&q);
150	@ </ol>
151	style_finish_page("attach");
152	return;
153	}
154
155	/*
156	** WEBPAGE: attachdownload
	@@ -207,16 +207,16 @@
207	);
208	}
209	if( zUUID==0 \|\| zUUID[0]==0 ){
210	style_header("No Such Attachment");
211	@ No such attachment....
212	style_finish_page("attach");
213	return;
214	}else if( zUUID[0]=='x' ){
215	style_header("Missing");
216	@ Attachment has been deleted
217	style_finish_page("attach");
218	return;
219	}else{
220	g.perm.Read = 1;
221	cgi_replace_parameter("name",zUUID);
222	if( fossil_strcmp(g.zPath,"attachview")==0 ){
	@@ -413,11 +413,11 @@
413	@ <input type="submit" name="ok" value="Add Attachment" />
414	@ <input type="submit" name="cancel" value="Cancel" />
415	@ </div>
416	captcha_generate(0);
417	@ </form>
418	style_finish_page("attach");
419	fossil_free(zTargetType);
420	}
421
422	/*
423	** WEBPAGE: ainfo
	@@ -626,11 +626,11 @@
626	@ <i>(file is %d(sz) bytes of binary data)</i>
627	}
628	@ </blockquote>
629	manifest_destroy(pAttach);
630	blob_reset(&attach);
631	style_finish_page("attach");
632	}
633
634	/*
635	** Output HTML to show a list of attachments.
636	*/
637

	--- src/attach.c
	+++ src/attach.c
	@@ -146,11 +146,11 @@
146	hyperlink_to_date(zDate, ".");
147	free(zUrlTail);
148	}
149	db_finalize(&q);
150	@ </ol>
151	style_finish_page();
152	return;
153	}
154
155	/*
156	** WEBPAGE: attachdownload
	@@ -207,16 +207,16 @@
207	);
208	}
209	if( zUUID==0 \|\| zUUID[0]==0 ){
210	style_header("No Such Attachment");
211	@ No such attachment....
212	style_finish_page();
213	return;
214	}else if( zUUID[0]=='x' ){
215	style_header("Missing");
216	@ Attachment has been deleted
217	style_finish_page();
218	return;
219	}else{
220	g.perm.Read = 1;
221	cgi_replace_parameter("name",zUUID);
222	if( fossil_strcmp(g.zPath,"attachview")==0 ){
	@@ -413,11 +413,11 @@
413	@ <input type="submit" name="ok" value="Add Attachment" />
414	@ <input type="submit" name="cancel" value="Cancel" />
415	@ </div>
416	captcha_generate(0);
417	@ </form>
418	style_finish_page();
419	fossil_free(zTargetType);
420	}
421
422	/*
423	** WEBPAGE: ainfo
	@@ -626,11 +626,11 @@
626	@ <i>(file is %d(sz) bytes of binary data)</i>
627	}
628	@ </blockquote>
629	manifest_destroy(pAttach);
630	blob_reset(&attach);
631	style_finish_page();
632	}
633
634	/*
635	** Output HTML to show a list of attachments.
636	*/
637

M src/backlink.c

+2 -2

		--- src/backlink.c
		+++ src/backlink.c
		@@ -92,11 +92,11 @@
92	92	blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
93	93	db_prepare(&q, "%s", blob_sql_text(&sql));
94	94	www_print_timeline(&q, TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_NOSCROLL,
95	95	0, 0, 0, 0, 0, 0);
96	96	db_finalize(&q);
97		- style_finish_page("test");
	97	+ style_finish_page();
98	98	}
99	99
100	100	/*
101	101	** WEBPAGE: test-backlinks
102	102	**
		@@ -154,11 +154,11 @@
154	154	@ <td>%h(zMtime)</tr>
155	155	}
156	156	@ </tbody>
157	157	@ </table>
158	158	db_finalize(&q);
159		- style_finish_page("test");
	159	+ style_finish_page();
160	160	}
161	161
162	162	/*
163	163	** Remove all prior backlinks for the wiki page given. Then
164	164	** add new backlinks for the latest version of the wiki page.
165	165

	--- src/backlink.c
	+++ src/backlink.c
	@@ -92,11 +92,11 @@
92	blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
93	db_prepare(&q, "%s", blob_sql_text(&sql));
94	www_print_timeline(&q, TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_NOSCROLL,
95	0, 0, 0, 0, 0, 0);
96	db_finalize(&q);
97	style_finish_page("test");
98	}
99
100	/*
101	** WEBPAGE: test-backlinks
102	**
	@@ -154,11 +154,11 @@
154	@ <td>%h(zMtime)</tr>
155	}
156	@ </tbody>
157	@ </table>
158	db_finalize(&q);
159	style_finish_page("test");
160	}
161
162	/*
163	** Remove all prior backlinks for the wiki page given. Then
164	** add new backlinks for the latest version of the wiki page.
165

	--- src/backlink.c
	+++ src/backlink.c
	@@ -92,11 +92,11 @@
92	blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
93	db_prepare(&q, "%s", blob_sql_text(&sql));
94	www_print_timeline(&q, TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_NOSCROLL,
95	0, 0, 0, 0, 0, 0);
96	db_finalize(&q);
97	style_finish_page();
98	}
99
100	/*
101	** WEBPAGE: test-backlinks
102	**
	@@ -154,11 +154,11 @@
154	@ <td>%h(zMtime)</tr>
155	}
156	@ </tbody>
157	@ </table>
158	db_finalize(&q);
159	style_finish_page();
160	}
161
162	/*
163	** Remove all prior backlinks for the wiki page given. Then
164	** add new backlinks for the latest version of the wiki page.
165

M src/branch.c

+3 -3

		--- src/branch.c
		+++ src/branch.c
		@@ -515,11 +515,11 @@
515	515	@ </tr>
516	516	}
517	517	@ </tbody></table></div>
518	518	db_finalize(&q);
519	519	style_table_sorter();
520		- style_finish_page("branch");
	520	+ style_finish_page();
521	521	}
522	522
523	523	/*
524	524	** WEBPAGE: brlist
525	525	** Show a list of branches. With no query parameters, a sortable table
		@@ -624,11 +624,11 @@
624	624	}
625	625	if( cnt ){
626	626	@ </ul>
627	627	}
628	628	db_finalize(&q);
629		- style_finish_page("branch");
	629	+ style_finish_page();
630	630	}
631	631
632	632	/*
633	633	** This routine is called while for each check-in that is rendered by
634	634	** the timeline of a "brlist" page. Add some additional hyperlinks
		@@ -701,7 +701,7 @@
701	701	if( PB("ng")==0 ) tmFlags \|= TIMELINE_GRAPH;
702	702	if( PB("brbg")!=0 ) tmFlags \|= TIMELINE_BRCOLOR;
703	703	if( PB("ubg")!=0 ) tmFlags \|= TIMELINE_UCOLOR;
704	704	www_print_timeline(&q, tmFlags, 0, 0, 0, 0, 0, brtimeline_extra);
705	705	db_finalize(&q);
706		- style_finish_page("branch");
	706	+ style_finish_page();
707	707	}
708	708

	--- src/branch.c
	+++ src/branch.c
	@@ -515,11 +515,11 @@
515	@ </tr>
516	}
517	@ </tbody></table></div>
518	db_finalize(&q);
519	style_table_sorter();
520	style_finish_page("branch");
521	}
522
523	/*
524	** WEBPAGE: brlist
525	** Show a list of branches. With no query parameters, a sortable table
	@@ -624,11 +624,11 @@
624	}
625	if( cnt ){
626	@ </ul>
627	}
628	db_finalize(&q);
629	style_finish_page("branch");
630	}
631
632	/*
633	** This routine is called while for each check-in that is rendered by
634	** the timeline of a "brlist" page. Add some additional hyperlinks
	@@ -701,7 +701,7 @@
701	if( PB("ng")==0 ) tmFlags \|= TIMELINE_GRAPH;
702	if( PB("brbg")!=0 ) tmFlags \|= TIMELINE_BRCOLOR;
703	if( PB("ubg")!=0 ) tmFlags \|= TIMELINE_UCOLOR;
704	www_print_timeline(&q, tmFlags, 0, 0, 0, 0, 0, brtimeline_extra);
705	db_finalize(&q);
706	style_finish_page("branch");
707	}
708

	--- src/branch.c
	+++ src/branch.c
	@@ -515,11 +515,11 @@
515	@ </tr>
516	}
517	@ </tbody></table></div>
518	db_finalize(&q);
519	style_table_sorter();
520	style_finish_page();
521	}
522
523	/*
524	** WEBPAGE: brlist
525	** Show a list of branches. With no query parameters, a sortable table
	@@ -624,11 +624,11 @@
624	}
625	if( cnt ){
626	@ </ul>
627	}
628	db_finalize(&q);
629	style_finish_page();
630	}
631
632	/*
633	** This routine is called while for each check-in that is rendered by
634	** the timeline of a "brlist" page. Add some additional hyperlinks
	@@ -701,7 +701,7 @@
701	if( PB("ng")==0 ) tmFlags \|= TIMELINE_GRAPH;
702	if( PB("brbg")!=0 ) tmFlags \|= TIMELINE_BRCOLOR;
703	if( PB("ubg")!=0 ) tmFlags \|= TIMELINE_UCOLOR;
704	www_print_timeline(&q, tmFlags, 0, 0, 0, 0, 0, brtimeline_extra);
705	db_finalize(&q);
706	style_finish_page();
707	}
708

M src/browse.c

+4 -4

		--- src/browse.c
		+++ src/browse.c
		@@ -336,11 +336,11 @@
336	336
337	337	/* If the "noreadme" query parameter is present, do not try to
338	338	** show the content of the README file.
339	339	*/
340	340	if( P("noreadme")!=0 ){
341		- style_finish_page("dir");
	341	+ style_finish_page();
342	342	return;
343	343	}
344	344
345	345	/* If the directory contains a readme file, then display its content below
346	346	** the list of files
		@@ -397,11 +397,11 @@
397	397	document_emit_js();
398	398	}
399	399	}
400	400	}
401	401	db_finalize(&q);
402		- style_finish_page("dir");
	402	+ style_finish_page();
403	403	}
404	404
405	405	/*
406	406	** Objects used by the "tree" webpage.
407	407	*/
		@@ -913,11 +913,11 @@
913	913	}
914	914	}
915	915	@ </ul>
916	916	@ </ul></div>
917	917	builtin_request_js("tree.js");
918		- style_finish_page("tree");
	918	+ style_finish_page();
919	919
920	920	/* We could free memory used by sTree here if we needed to. But
921	921	** the process is about to exit, so doing so would not really accomplish
922	922	** anything useful. */
923	923	}
		@@ -1167,7 +1167,7 @@
1167	1167	fossil_free(zAge);
1168	1168	}
1169	1169	@ </table></div>
1170	1170	db_finalize(&q1);
1171	1171	db_finalize(&q2);
1172		- style_finish_page("fileage");
	1172	+ style_finish_page();
1173	1173	}
1174	1174

	--- src/browse.c
	+++ src/browse.c
	@@ -336,11 +336,11 @@
336
337	/* If the "noreadme" query parameter is present, do not try to
338	** show the content of the README file.
339	*/
340	if( P("noreadme")!=0 ){
341	style_finish_page("dir");
342	return;
343	}
344
345	/* If the directory contains a readme file, then display its content below
346	** the list of files
	@@ -397,11 +397,11 @@
397	document_emit_js();
398	}
399	}
400	}
401	db_finalize(&q);
402	style_finish_page("dir");
403	}
404
405	/*
406	** Objects used by the "tree" webpage.
407	*/
	@@ -913,11 +913,11 @@
913	}
914	}
915	@ </ul>
916	@ </ul></div>
917	builtin_request_js("tree.js");
918	style_finish_page("tree");
919
920	/* We could free memory used by sTree here if we needed to. But
921	** the process is about to exit, so doing so would not really accomplish
922	** anything useful. */
923	}
	@@ -1167,7 +1167,7 @@
1167	fossil_free(zAge);
1168	}
1169	@ </table></div>
1170	db_finalize(&q1);
1171	db_finalize(&q2);
1172	style_finish_page("fileage");
1173	}
1174

	--- src/browse.c
	+++ src/browse.c
	@@ -336,11 +336,11 @@
336
337	/* If the "noreadme" query parameter is present, do not try to
338	** show the content of the README file.
339	*/
340	if( P("noreadme")!=0 ){
341	style_finish_page();
342	return;
343	}
344
345	/* If the directory contains a readme file, then display its content below
346	** the list of files
	@@ -397,11 +397,11 @@
397	document_emit_js();
398	}
399	}
400	}
401	db_finalize(&q);
402	style_finish_page();
403	}
404
405	/*
406	** Objects used by the "tree" webpage.
407	*/
	@@ -913,11 +913,11 @@
913	}
914	}
915	@ </ul>
916	@ </ul></div>
917	builtin_request_js("tree.js");
918	style_finish_page();
919
920	/* We could free memory used by sTree here if we needed to. But
921	** the process is about to exit, so doing so would not really accomplish
922	** anything useful. */
923	}
	@@ -1167,7 +1167,7 @@
1167	fossil_free(zAge);
1168	}
1169	@ </table></div>
1170	db_finalize(&q1);
1171	db_finalize(&q2);
1172	style_finish_page();
1173	}
1174

M src/builtin.c

+1 -1

		--- src/builtin.c
		+++ src/builtin.c
		@@ -104,11 +104,11 @@
104	104	char *zUrl = href("%R/builtin?name=%T&id=%.8s&mimetype=text/plain",
105	105	z,fossil_exe_id());
106	106	@ <li>%z(zUrl)%h(z)</a>
107	107	}
108	108	@ </ol>
109		- style_finish_page("test");
	109	+ style_finish_page();
110	110	}
111	111
112	112	/*
113	113	** COMMAND: test-builtin-get
114	114	**
115	115

	--- src/builtin.c
	+++ src/builtin.c
	@@ -104,11 +104,11 @@
104	char *zUrl = href("%R/builtin?name=%T&id=%.8s&mimetype=text/plain",
105	z,fossil_exe_id());
106	@ <li>%z(zUrl)%h(z)</a>
107	}
108	@ </ol>
109	style_finish_page("test");
110	}
111
112	/*
113	** COMMAND: test-builtin-get
114	**
115

	--- src/builtin.c
	+++ src/builtin.c
	@@ -104,11 +104,11 @@
104	char *zUrl = href("%R/builtin?name=%T&id=%.8s&mimetype=text/plain",
105	z,fossil_exe_id());
106	@ <li>%z(zUrl)%h(z)</a>
107	}
108	@ </ol>
109	style_finish_page();
110	}
111
112	/*
113	** COMMAND: test-builtin-get
114	**
115

M src/cache.c

+2 -2

		--- src/cache.c
		+++ src/cache.c
		@@ -385,11 +385,11 @@
385	385	@ <p>cache-file name: %h(zDbName)</p>
386	386	@ <p>cache-file size: %s(zBuf)</p>
387	387	fossil_free(zDbName);
388	388	sqlite3_close(db);
389	389	}
390		- style_finish_page("cache");
	390	+ style_finish_page();
391	391	}
392	392
393	393	/*
394	394	** WEBPAGE: cacheget
395	395	**
		@@ -409,11 +409,11 @@
409	409	blob_zero(&content);
410	410	if( cache_read(&content, zKey)==0 ){
411	411	style_set_current_feature("cache");
412	412	style_header("Cache Download Error");
413	413	@ The cache does not contain any entry with this key: "%h(zKey)"
414		- style_finish_page("cache");
	414	+ style_finish_page();
415	415	return;
416	416	}
417	417	cgi_set_content(&content);
418	418	cgi_set_content_type("application/x-compressed");
419	419	}
420	420

	--- src/cache.c
	+++ src/cache.c
	@@ -385,11 +385,11 @@
385	@ <p>cache-file name: %h(zDbName)</p>
386	@ <p>cache-file size: %s(zBuf)</p>
387	fossil_free(zDbName);
388	sqlite3_close(db);
389	}
390	style_finish_page("cache");
391	}
392
393	/*
394	** WEBPAGE: cacheget
395	**
	@@ -409,11 +409,11 @@
409	blob_zero(&content);
410	if( cache_read(&content, zKey)==0 ){
411	style_set_current_feature("cache");
412	style_header("Cache Download Error");
413	@ The cache does not contain any entry with this key: "%h(zKey)"
414	style_finish_page("cache");
415	return;
416	}
417	cgi_set_content(&content);
418	cgi_set_content_type("application/x-compressed");
419	}
420

	--- src/cache.c
	+++ src/cache.c
	@@ -385,11 +385,11 @@
385	@ <p>cache-file name: %h(zDbName)</p>
386	@ <p>cache-file size: %s(zBuf)</p>
387	fossil_free(zDbName);
388	sqlite3_close(db);
389	}
390	style_finish_page();
391	}
392
393	/*
394	** WEBPAGE: cacheget
395	**
	@@ -409,11 +409,11 @@
409	blob_zero(&content);
410	if( cache_read(&content, zKey)==0 ){
411	style_set_current_feature("cache");
412	style_header("Cache Download Error");
413	@ The cache does not contain any entry with this key: "%h(zKey)"
414	style_finish_page();
415	return;
416	}
417	cgi_set_content(&content);
418	cgi_set_content_type("application/x-compressed");
419	}
420

M src/captcha.c

+2 -2

		--- src/captcha.c
		+++ src/captcha.c
		@@ -591,11 +591,11 @@
591	591	style_set_current_feature("test");
592	592	style_header("Captcha Test");
593	593	@ <pre>
594	594	@ %s(captcha_render(zPw))
595	595	@ </pre>
596		- style_finish_page("test");
	596	+ style_finish_page();
597	597	}
598	598
599	599	/*
600	600	** Check to see if the current request is coming from an agent that might
601	601	** be a spider. If the agent is not a spider, then return 0 without doing
		@@ -629,11 +629,11 @@
629	629	@ <form method='POST' action='%s(g.zPath)'>
630	630	cgi_query_parameters_to_hidden();
631	631	@ <p>Please demonstrate that you are human, not a spider or robot</p>
632	632	captcha_generate(1);
633	633	@ </form>
634		- style_finish_page("captcha");
	634	+ style_finish_page();
635	635	return 1;
636	636	}
637	637
638	638	/*
639	639	** Generate a WAV file that reads aloud the hex digits given by
640	640

	--- src/captcha.c
	+++ src/captcha.c
	@@ -591,11 +591,11 @@
591	style_set_current_feature("test");
592	style_header("Captcha Test");
593	@ <pre>
594	@ %s(captcha_render(zPw))
595	@ </pre>
596	style_finish_page("test");
597	}
598
599	/*
600	** Check to see if the current request is coming from an agent that might
601	** be a spider. If the agent is not a spider, then return 0 without doing
	@@ -629,11 +629,11 @@
629	@ <form method='POST' action='%s(g.zPath)'>
630	cgi_query_parameters_to_hidden();
631	@ <p>Please demonstrate that you are human, not a spider or robot</p>
632	captcha_generate(1);
633	@ </form>
634	style_finish_page("captcha");
635	return 1;
636	}
637
638	/*
639	** Generate a WAV file that reads aloud the hex digits given by
640

	--- src/captcha.c
	+++ src/captcha.c
	@@ -591,11 +591,11 @@
591	style_set_current_feature("test");
592	style_header("Captcha Test");
593	@ <pre>
594	@ %s(captcha_render(zPw))
595	@ </pre>
596	style_finish_page();
597	}
598
599	/*
600	** Check to see if the current request is coming from an agent that might
601	** be a spider. If the agent is not a spider, then return 0 without doing
	@@ -629,11 +629,11 @@
629	@ <form method='POST' action='%s(g.zPath)'>
630	cgi_query_parameters_to_hidden();
631	@ <p>Please demonstrate that you are human, not a spider or robot</p>
632	captcha_generate(1);
633	@ </form>
634	style_finish_page();
635	return 1;
636	}
637
638	/*
639	** Generate a WAV file that reads aloud the hex digits given by
640

M src/clone.c

+1 -1

		--- src/clone.c
		+++ src/clone.c
		@@ -422,7 +422,7 @@
422	422	@ <p>Clone the repository using this command:
423	423	@ <blockquote><pre>
424	424	@ fossil clone %s(g.zBaseURL) %h(zNm).fossil
425	425	@ </pre></blockquote>
426	426	}
427		- style_finish_page("download");
	427	+ style_finish_page();
428	428	}
429	429

	--- src/clone.c
	+++ src/clone.c
	@@ -422,7 +422,7 @@
422	@ <p>Clone the repository using this command:
423	@ <blockquote><pre>
424	@ fossil clone %s(g.zBaseURL) %h(zNm).fossil
425	@ </pre></blockquote>
426	}
427	style_finish_page("download");
428	}
429

	--- src/clone.c
	+++ src/clone.c
	@@ -422,7 +422,7 @@
422	@ <p>Clone the repository using this command:
423	@ <blockquote><pre>
424	@ fossil clone %s(g.zBaseURL) %h(zNm).fossil
425	@ </pre></blockquote>
426	}
427	style_finish_page();
428	}
429

M src/cookies.c

+1 -1

		--- src/cookies.c
		+++ src/cookies.c
		@@ -225,7 +225,7 @@
225	225	@ <li>Raw cookie value: "%h(PD("fossil_display_settings",""))"
226	226	for(i=0; i<cookies.nParam; i++){
227	227	@ <li>%h(cookies.aParam[i].zPName): "%h(cookies.aParam[i].zPValue)"
228	228	}
229	229	@ </ul>
230		- style_finish_page("cookies");
	230	+ style_finish_page();
231	231	}
232	232

	--- src/cookies.c
	+++ src/cookies.c
	@@ -225,7 +225,7 @@
225	@ <li>Raw cookie value: "%h(PD("fossil_display_settings",""))"
226	for(i=0; i<cookies.nParam; i++){
227	@ <li>%h(cookies.aParam[i].zPName): "%h(cookies.aParam[i].zPValue)"
228	}
229	@ </ul>
230	style_finish_page("cookies");
231	}
232

	--- src/cookies.c
	+++ src/cookies.c
	@@ -225,7 +225,7 @@
225	@ <li>Raw cookie value: "%h(PD("fossil_display_settings",""))"
226	for(i=0; i<cookies.nParam; i++){
227	@ <li>%h(cookies.aParam[i].zPName): "%h(cookies.aParam[i].zPValue)"
228	}
229	@ </ul>
230	style_finish_page();
231	}
232

M src/descendants.c

+1 -1

		--- src/descendants.c
		+++ src/descendants.c
		@@ -614,11 +614,11 @@
614	614	if( fBrBg ) tmFlags \|= TIMELINE_BRCOLOR;
615	615	if( fUBg ) tmFlags \|= TIMELINE_UCOLOR;
616	616	www_print_timeline(&q, tmFlags, 0, 0, 0, 0, 0, 0);
617	617	db_finalize(&q);
618	618	@ <br />
619		- style_finish_page("leaves");
	619	+ style_finish_page();
620	620	}
621	621
622	622	#if INTERFACE
623	623	/* Flag parameters to compute_uses_file() */
624	624	#define USESFILE_DELETE 0x01 /* Include the check-ins where file deleted */
625	625

	--- src/descendants.c
	+++ src/descendants.c
	@@ -614,11 +614,11 @@
614	if( fBrBg ) tmFlags \|= TIMELINE_BRCOLOR;
615	if( fUBg ) tmFlags \|= TIMELINE_UCOLOR;
616	www_print_timeline(&q, tmFlags, 0, 0, 0, 0, 0, 0);
617	db_finalize(&q);
618	@ <br />
619	style_finish_page("leaves");
620	}
621
622	#if INTERFACE
623	/* Flag parameters to compute_uses_file() */
624	#define USESFILE_DELETE 0x01 /* Include the check-ins where file deleted */
625

	--- src/descendants.c
	+++ src/descendants.c
	@@ -614,11 +614,11 @@
614	if( fBrBg ) tmFlags \|= TIMELINE_BRCOLOR;
615	if( fUBg ) tmFlags \|= TIMELINE_UCOLOR;
616	www_print_timeline(&q, tmFlags, 0, 0, 0, 0, 0, 0);
617	db_finalize(&q);
618	@ <br />
619	style_finish_page();
620	}
621
622	#if INTERFACE
623	/* Flag parameters to compute_uses_file() */
624	#define USESFILE_DELETE 0x01 /* Include the check-ins where file deleted */
625

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -2557,11 +2557,11 @@
2557	2557	}
2558	2558	@ %s(zPrefix) %h(z)
2559	2559
2560	2560	}
2561	2561	@ </pre>
2562		- style_finish_page("annotate");
	2562	+ style_finish_page();
2563	2563	}
2564	2564
2565	2565	/*
2566	2566	** COMMAND: annotate
2567	2567	** COMMAND: blame
2568	2568

	--- src/diff.c
	+++ src/diff.c
	@@ -2557,11 +2557,11 @@
2557	}
2558	@ %s(zPrefix) %h(z)
2559
2560	}
2561	@ </pre>
2562	style_finish_page("annotate");
2563	}
2564
2565	/*
2566	** COMMAND: annotate
2567	** COMMAND: blame
2568

	--- src/diff.c
	+++ src/diff.c
	@@ -2557,11 +2557,11 @@
2557	}
2558	@ %s(zPrefix) %h(z)
2559
2560	}
2561	@ </pre>
2562	style_finish_page();
2563	}
2564
2565	/*
2566	** COMMAND: annotate
2567	** COMMAND: blame
2568

M src/dispatch.c

+2 -2

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -851,11 +851,11 @@
851	851	}
852	852	}
853	853	@ </ul></div>
854	854
855	855	}
856		- style_finish_page("help");
	856	+ style_finish_page();
857	857	}
858	858
859	859	/*
860	860	** WEBPAGE: test-all-help
861	861	**
		@@ -903,11 +903,11 @@
903	903	help_to_html(aCommand[i].zHelp, cgi_output_blob());
904	904	@ </dd>
905	905	}
906	906	@ </dl>
907	907	blob_reset(&buf);
908		- style_finish_page("help");
	908	+ style_finish_page();
909	909	}
910	910
911	911	static void multi_column_list(const char **azWord, int nWord){
912	912	int i, j, len;
913	913	int mxLen = 0;
914	914

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -851,11 +851,11 @@
851	}
852	}
853	@ </ul></div>
854
855	}
856	style_finish_page("help");
857	}
858
859	/*
860	** WEBPAGE: test-all-help
861	**
	@@ -903,11 +903,11 @@
903	help_to_html(aCommand[i].zHelp, cgi_output_blob());
904	@ </dd>
905	}
906	@ </dl>
907	blob_reset(&buf);
908	style_finish_page("help");
909	}
910
911	static void multi_column_list(const char **azWord, int nWord){
912	int i, j, len;
913	int mxLen = 0;
914

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -851,11 +851,11 @@
851	}
852	}
853	@ </ul></div>
854
855	}
856	style_finish_page();
857	}
858
859	/*
860	** WEBPAGE: test-all-help
861	**
	@@ -903,11 +903,11 @@
903	help_to_html(aCommand[i].zHelp, cgi_output_blob());
904	@ </dd>
905	}
906	@ </dl>
907	blob_reset(&buf);
908	style_finish_page();
909	}
910
911	static void multi_column_list(const char **azWord, int nWord){
912	int i, j, len;
913	int mxLen = 0;
914

M src/doc.c

+9 -9

		--- src/doc.c
		+++ src/doc.c
		@@ -555,11 +555,11 @@
555	555	}
556	556	@ <tr><td>%s(zFlag)%h(aMime[i].zSuffix)<td>%h(aMime[i].zMimetype)</tr>
557	557	}
558	558	@ </tbody></table>
559	559	style_table_sorter();
560		- style_finish_page("mimetypes");
	560	+ style_finish_page();
561	561	}
562	562
563	563	/*
564	564	** Check to see if the file in the pContent blob is "embedded HTML". Return
565	565	** true if it is, and fill pTitle with the document title.
		@@ -770,11 +770,11 @@
770	770	}else{
771	771	style_header("%s", zDefaultTitle);
772	772	wiki_convert(pBody, 0, WIKI_BUTTONS);
773	773	}
774	774	document_emit_js();
775		- style_finish_page("doc");
	775	+ style_finish_page();
776	776	}else if( fossil_strcmp(zMime, "text/x-markdown")==0 ){
777	777	Blob tail = BLOB_INITIALIZER;
778	778	markdown_to_html(pBody, &title, &tail);
779	779	if( blob_size(&title)>0 ){
780	780	style_header("%s", blob_str(&title));
		@@ -781,30 +781,30 @@
781	781	}else{
782	782	style_header("%s", zDefaultTitle);
783	783	}
784	784	convert_href_and_output(&tail);
785	785	document_emit_js();
786		- style_finish_page("doc");
	786	+ style_finish_page();
787	787	}else if( fossil_strcmp(zMime, "text/plain")==0 ){
788	788	style_header("%s", zDefaultTitle);
789	789	@ <blockquote><pre>
790	790	@ %h(blob_str(pBody))
791	791	@ </pre></blockquote>
792	792	document_emit_js();
793		- style_finish_page("doc");
	793	+ style_finish_page();
794	794	}else if( fossil_strcmp(zMime, "text/html")==0
795	795	&& doc_is_embedded_html(pBody, &title) ){
796	796	if( blob_size(&title)==0 ) blob_append(&title,zFilename,-1);
797	797	style_header("%s", blob_str(&title));
798	798	convert_href_and_output(pBody);
799	799	document_emit_js();
800		- style_finish_page("doc");
	800	+ style_finish_page();
801	801	}else if( fossil_strcmp(zMime, "text/x-pikchr")==0 ){
802	802	style_adunit_config(ADUNIT_RIGHT_OK);
803	803	style_header("%s", zDefaultTitle);
804	804	wiki_render_by_mimetype(pBody, zMime);
805		- style_finish_page("doc");
	805	+ style_finish_page();
806	806	#ifdef FOSSIL_ENABLE_TH1_DOCS
807	807	}else if( Th_AreDocsEnabled() &&
808	808	fossil_strcmp(zMime, "application/x-th1")==0 ){
809	809	int raw = P("raw")!=0;
810	810	if( !raw ){
		@@ -821,11 +821,11 @@
821	821	}else{
822	822	Th_Render(blob_str(pBody));
823	823	}
824	824	if( !raw ){
825	825	document_emit_js();
826		- style_finish_page("doc");
	826	+ style_finish_page();
827	827	}
828	828	#endif
829	829	}else{
830	830	fossil_free(style_csp(1));
831	831	cgi_set_content_type(zMime);
		@@ -1030,11 +1030,11 @@
1030	1030	style_header("Not Found");
1031	1031	@ <p>Document %h(zOrigName) not found
1032	1032	if( fossil_strcmp(zCheckin,"ckout")!=0 ){
1033	1033	@ in %z(href("%R/tree?ci=%T",zCheckin))%h(zCheckin)</a>
1034	1034	}
1035		- style_finish_page("doc");
	1035	+ style_finish_page();
1036	1036	return;
1037	1037	}
1038	1038
1039	1039	/*
1040	1040	** The default logo.
		@@ -1203,7 +1203,7 @@
1203	1203	*/
1204	1204	void doc_search_page(void){
1205	1205	login_check_credentials();
1206	1206	style_header("Document Search");
1207	1207	search_screen(SRCH_DOC, 0);
1208		- style_finish_page("docsrch");
	1208	+ style_finish_page();
1209	1209	}
1210	1210

	--- src/doc.c
	+++ src/doc.c
	@@ -555,11 +555,11 @@
555	}
556	@ <tr><td>%s(zFlag)%h(aMime[i].zSuffix)<td>%h(aMime[i].zMimetype)</tr>
557	}
558	@ </tbody></table>
559	style_table_sorter();
560	style_finish_page("mimetypes");
561	}
562
563	/*
564	** Check to see if the file in the pContent blob is "embedded HTML". Return
565	** true if it is, and fill pTitle with the document title.
	@@ -770,11 +770,11 @@
770	}else{
771	style_header("%s", zDefaultTitle);
772	wiki_convert(pBody, 0, WIKI_BUTTONS);
773	}
774	document_emit_js();
775	style_finish_page("doc");
776	}else if( fossil_strcmp(zMime, "text/x-markdown")==0 ){
777	Blob tail = BLOB_INITIALIZER;
778	markdown_to_html(pBody, &title, &tail);
779	if( blob_size(&title)>0 ){
780	style_header("%s", blob_str(&title));
	@@ -781,30 +781,30 @@
781	}else{
782	style_header("%s", zDefaultTitle);
783	}
784	convert_href_and_output(&tail);
785	document_emit_js();
786	style_finish_page("doc");
787	}else if( fossil_strcmp(zMime, "text/plain")==0 ){
788	style_header("%s", zDefaultTitle);
789	@ <blockquote><pre>
790	@ %h(blob_str(pBody))
791	@ </pre></blockquote>
792	document_emit_js();
793	style_finish_page("doc");
794	}else if( fossil_strcmp(zMime, "text/html")==0
795	&& doc_is_embedded_html(pBody, &title) ){
796	if( blob_size(&title)==0 ) blob_append(&title,zFilename,-1);
797	style_header("%s", blob_str(&title));
798	convert_href_and_output(pBody);
799	document_emit_js();
800	style_finish_page("doc");
801	}else if( fossil_strcmp(zMime, "text/x-pikchr")==0 ){
802	style_adunit_config(ADUNIT_RIGHT_OK);
803	style_header("%s", zDefaultTitle);
804	wiki_render_by_mimetype(pBody, zMime);
805	style_finish_page("doc");
806	#ifdef FOSSIL_ENABLE_TH1_DOCS
807	}else if( Th_AreDocsEnabled() &&
808	fossil_strcmp(zMime, "application/x-th1")==0 ){
809	int raw = P("raw")!=0;
810	if( !raw ){
	@@ -821,11 +821,11 @@
821	}else{
822	Th_Render(blob_str(pBody));
823	}
824	if( !raw ){
825	document_emit_js();
826	style_finish_page("doc");
827	}
828	#endif
829	}else{
830	fossil_free(style_csp(1));
831	cgi_set_content_type(zMime);
	@@ -1030,11 +1030,11 @@
1030	style_header("Not Found");
1031	@ <p>Document %h(zOrigName) not found
1032	if( fossil_strcmp(zCheckin,"ckout")!=0 ){
1033	@ in %z(href("%R/tree?ci=%T",zCheckin))%h(zCheckin)</a>
1034	}
1035	style_finish_page("doc");
1036	return;
1037	}
1038
1039	/*
1040	** The default logo.
	@@ -1203,7 +1203,7 @@
1203	*/
1204	void doc_search_page(void){
1205	login_check_credentials();
1206	style_header("Document Search");
1207	search_screen(SRCH_DOC, 0);
1208	style_finish_page("docsrch");
1209	}
1210

	--- src/doc.c
	+++ src/doc.c
	@@ -555,11 +555,11 @@
555	}
556	@ <tr><td>%s(zFlag)%h(aMime[i].zSuffix)<td>%h(aMime[i].zMimetype)</tr>
557	}
558	@ </tbody></table>
559	style_table_sorter();
560	style_finish_page();
561	}
562
563	/*
564	** Check to see if the file in the pContent blob is "embedded HTML". Return
565	** true if it is, and fill pTitle with the document title.
	@@ -770,11 +770,11 @@
770	}else{
771	style_header("%s", zDefaultTitle);
772	wiki_convert(pBody, 0, WIKI_BUTTONS);
773	}
774	document_emit_js();
775	style_finish_page();
776	}else if( fossil_strcmp(zMime, "text/x-markdown")==0 ){
777	Blob tail = BLOB_INITIALIZER;
778	markdown_to_html(pBody, &title, &tail);
779	if( blob_size(&title)>0 ){
780	style_header("%s", blob_str(&title));
	@@ -781,30 +781,30 @@
781	}else{
782	style_header("%s", zDefaultTitle);
783	}
784	convert_href_and_output(&tail);
785	document_emit_js();
786	style_finish_page();
787	}else if( fossil_strcmp(zMime, "text/plain")==0 ){
788	style_header("%s", zDefaultTitle);
789	@ <blockquote><pre>
790	@ %h(blob_str(pBody))
791	@ </pre></blockquote>
792	document_emit_js();
793	style_finish_page();
794	}else if( fossil_strcmp(zMime, "text/html")==0
795	&& doc_is_embedded_html(pBody, &title) ){
796	if( blob_size(&title)==0 ) blob_append(&title,zFilename,-1);
797	style_header("%s", blob_str(&title));
798	convert_href_and_output(pBody);
799	document_emit_js();
800	style_finish_page();
801	}else if( fossil_strcmp(zMime, "text/x-pikchr")==0 ){
802	style_adunit_config(ADUNIT_RIGHT_OK);
803	style_header("%s", zDefaultTitle);
804	wiki_render_by_mimetype(pBody, zMime);
805	style_finish_page();
806	#ifdef FOSSIL_ENABLE_TH1_DOCS
807	}else if( Th_AreDocsEnabled() &&
808	fossil_strcmp(zMime, "application/x-th1")==0 ){
809	int raw = P("raw")!=0;
810	if( !raw ){
	@@ -821,11 +821,11 @@
821	}else{
822	Th_Render(blob_str(pBody));
823	}
824	if( !raw ){
825	document_emit_js();
826	style_finish_page();
827	}
828	#endif
829	}else{
830	fossil_free(style_csp(1));
831	cgi_set_content_type(zMime);
	@@ -1030,11 +1030,11 @@
1030	style_header("Not Found");
1031	@ <p>Document %h(zOrigName) not found
1032	if( fossil_strcmp(zCheckin,"ckout")!=0 ){
1033	@ in %z(href("%R/tree?ci=%T",zCheckin))%h(zCheckin)</a>
1034	}
1035	style_finish_page();
1036	return;
1037	}
1038
1039	/*
1040	** The default logo.
	@@ -1203,7 +1203,7 @@
1203	*/
1204	void doc_search_page(void){
1205	login_check_credentials();
1206	style_header("Document Search");
1207	search_screen(SRCH_DOC, 0);
1208	style_finish_page();
1209	}
1210

M src/event.c

+4 -4

		--- src/event.c
		+++ src/event.c
		@@ -114,11 +114,11 @@
114	114	db_finalize(&q1);
115	115	style_set_current_feature("event");
116	116	if( rid==0 \|\| (specRid!=0 && specRid!=rid) ){
117	117	style_header("No Such Tech-Note");
118	118	@ Cannot locate a technical note called <b>%h(zId)</b>.
119		- style_finish_page("event");
	119	+ style_finish_page();
120	120	return;
121	121	}
122	122	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
123	123	zVerbose = P("v");
124	124	if( !zVerbose ){
		@@ -230,11 +230,11 @@
230	230	" FROM tag"
231	231	" WHERE tagname GLOB 'event-%q*'",
232	232	zId);
233	233	attachment_list(zFullId, "<hr /><h2>Attachments:</h2><ul>");
234	234	document_emit_js();
235		- style_finish_page("event");
	235	+ style_finish_page();
236	236	manifest_destroy(pTNote);
237	237	}
238	238
239	239	/*
240	240	** Add or update a new tech note to the repository. rid is id of
		@@ -475,11 +475,11 @@
475	475	zMimetype, zComment, zTags,
476	476	zClrFlag[0] ? zClr : 0) ){
477	477	style_header("Error");
478	478	@ Internal error: Fossil tried to make an invalid artifact for
479	479	@ the edited technote.
480		- style_finish_page("event");
	480	+ style_finish_page();
481	481	return;
482	482	}
483	483	cgi_redirectf("%R/technote?name=%T", zId);
484	484	}
485	485	if( P("cancel")!=0 ){
		@@ -569,11 +569,11 @@
569	569	if( P("preview") ){
570	570	@ <input type="submit" name="submit" value="Submit" />
571	571	}
572	572	@ </td></tr></table>
573	573	@ </div></form>
574		- style_finish_page("event");
	574	+ style_finish_page();
575	575	}
576	576
577	577	/*
578	578	** Add a new tech note to the repository. The timestamp is
579	579	** given by the zETime parameter. rid must be zero to create
580	580

	--- src/event.c
	+++ src/event.c
	@@ -114,11 +114,11 @@
114	db_finalize(&q1);
115	style_set_current_feature("event");
116	if( rid==0 \|\| (specRid!=0 && specRid!=rid) ){
117	style_header("No Such Tech-Note");
118	@ Cannot locate a technical note called <b>%h(zId)</b>.
119	style_finish_page("event");
120	return;
121	}
122	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
123	zVerbose = P("v");
124	if( !zVerbose ){
	@@ -230,11 +230,11 @@
230	" FROM tag"
231	" WHERE tagname GLOB 'event-%q*'",
232	zId);
233	attachment_list(zFullId, "<hr /><h2>Attachments:</h2><ul>");
234	document_emit_js();
235	style_finish_page("event");
236	manifest_destroy(pTNote);
237	}
238
239	/*
240	** Add or update a new tech note to the repository. rid is id of
	@@ -475,11 +475,11 @@
475	zMimetype, zComment, zTags,
476	zClrFlag[0] ? zClr : 0) ){
477	style_header("Error");
478	@ Internal error: Fossil tried to make an invalid artifact for
479	@ the edited technote.
480	style_finish_page("event");
481	return;
482	}
483	cgi_redirectf("%R/technote?name=%T", zId);
484	}
485	if( P("cancel")!=0 ){
	@@ -569,11 +569,11 @@
569	if( P("preview") ){
570	@ <input type="submit" name="submit" value="Submit" />
571	}
572	@ </td></tr></table>
573	@ </div></form>
574	style_finish_page("event");
575	}
576
577	/*
578	** Add a new tech note to the repository. The timestamp is
579	** given by the zETime parameter. rid must be zero to create
580

	--- src/event.c
	+++ src/event.c
	@@ -114,11 +114,11 @@
114	db_finalize(&q1);
115	style_set_current_feature("event");
116	if( rid==0 \|\| (specRid!=0 && specRid!=rid) ){
117	style_header("No Such Tech-Note");
118	@ Cannot locate a technical note called <b>%h(zId)</b>.
119	style_finish_page();
120	return;
121	}
122	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
123	zVerbose = P("v");
124	if( !zVerbose ){
	@@ -230,11 +230,11 @@
230	" FROM tag"
231	" WHERE tagname GLOB 'event-%q*'",
232	zId);
233	attachment_list(zFullId, "<hr /><h2>Attachments:</h2><ul>");
234	document_emit_js();
235	style_finish_page();
236	manifest_destroy(pTNote);
237	}
238
239	/*
240	** Add or update a new tech note to the repository. rid is id of
	@@ -475,11 +475,11 @@
475	zMimetype, zComment, zTags,
476	zClrFlag[0] ? zClr : 0) ){
477	style_header("Error");
478	@ Internal error: Fossil tried to make an invalid artifact for
479	@ the edited technote.
480	style_finish_page();
481	return;
482	}
483	cgi_redirectf("%R/technote?name=%T", zId);
484	}
485	if( P("cancel")!=0 ){
	@@ -569,11 +569,11 @@
569	if( P("preview") ){
570	@ <input type="submit" name="submit" value="Submit" />
571	}
572	@ </td></tr></table>
573	@ </div></form>
574	style_finish_page();
575	}
576
577	/*
578	** Add a new tech note to the repository. The timestamp is
579	** given by the zETime parameter. rid must be zero to create
580

M src/extcgi.c

+1 -1

		--- src/extcgi.c
		+++ src/extcgi.c
		@@ -421,7 +421,7 @@
421	421	@ </tr>
422	422	}
423	423	db_finalize(&q);
424	424	@ </tbody>
425	425	@ </table>
426		- style_finish_page("extcgi");
	426	+ style_finish_page();
427	427	}
428	428

	--- src/extcgi.c
	+++ src/extcgi.c
	@@ -421,7 +421,7 @@
421	@ </tr>
422	}
423	db_finalize(&q);
424	@ </tbody>
425	@ </table>
426	style_finish_page("extcgi");
427	}
428

	--- src/extcgi.c
	+++ src/extcgi.c
	@@ -421,7 +421,7 @@
421	@ </tr>
422	}
423	db_finalize(&q);
424	@ </tbody>
425	@ </table>
426	style_finish_page();
427	}
428

M src/fileedit.c

+2 -2

		--- src/fileedit.c
		+++ src/fileedit.c
		@@ -1606,11 +1606,11 @@
1606	1606	"values matching files which may be edited online."
1607	1607	"</p>\n");
1608	1608	}else{
1609	1609	CX("<p>Online editing is disabled for this repository.</p>\n");
1610	1610	}
1611		- style_finish_page("fileedit");
	1611	+ style_finish_page();
1612	1612	return;
1613	1613	}
1614	1614
1615	1615	/* Dispatch AJAX methods based tail of the request URI.
1616	1616	** The AJAX parts do their own permissions/CSRF check and
		@@ -2061,7 +2061,7 @@
2061	2061	style_script_end();
2062	2062	}
2063	2063	blob_reset(&err);
2064	2064	CheckinMiniInfo_cleanup(&cimi);
2065	2065	db_end_transaction(0);
2066		- style_finish_page("fileedit");
	2066	+ style_finish_page();
2067	2067	}
2068	2068

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -1606,11 +1606,11 @@
1606	"values matching files which may be edited online."
1607	"</p>\n");
1608	}else{
1609	CX("<p>Online editing is disabled for this repository.</p>\n");
1610	}
1611	style_finish_page("fileedit");
1612	return;
1613	}
1614
1615	/* Dispatch AJAX methods based tail of the request URI.
1616	** The AJAX parts do their own permissions/CSRF check and
	@@ -2061,7 +2061,7 @@
2061	style_script_end();
2062	}
2063	blob_reset(&err);
2064	CheckinMiniInfo_cleanup(&cimi);
2065	db_end_transaction(0);
2066	style_finish_page("fileedit");
2067	}
2068

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -1606,11 +1606,11 @@
1606	"values matching files which may be edited online."
1607	"</p>\n");
1608	}else{
1609	CX("<p>Online editing is disabled for this repository.</p>\n");
1610	}
1611	style_finish_page();
1612	return;
1613	}
1614
1615	/* Dispatch AJAX methods based tail of the request URI.
1616	** The AJAX parts do their own permissions/CSRF check and
	@@ -2061,7 +2061,7 @@
2061	style_script_end();
2062	}
2063	blob_reset(&err);
2064	CheckinMiniInfo_cleanup(&cimi);
2065	db_end_transaction(0);
2066	style_finish_page();
2067	}
2068

M src/finfo.c

+3 -3

		--- src/finfo.c
		+++ src/finfo.c
		@@ -367,11 +367,11 @@
367	367	ridFrom = name_to_rid_www("from");
368	368	zPrevDate[0] = 0;
369	369	cookie_render();
370	370	if( fnid==0 ){
371	371	@ No such file: %h(zFilename)
372		- style_finish_page("finfo");
	372	+ style_finish_page();
373	373	return;
374	374	}
375	375	if( g.perm.Admin ){
376	376	style_submenu_element("MLink Table", "%R/mlink?name=%t", zFilename);
377	377	}
		@@ -754,11 +754,11 @@
754	754	@ <td></td><td></td><td></td></tr>
755	755	}
756	756	}
757	757	@ </table>
758	758	timeline_output_graph_javascript(pGraph, TIMELINE_FILEDIFF, iTableId);
759		- style_finish_page("finfo");
	759	+ style_finish_page();
760	760	}
761	761
762	762	/*
763	763	** WEBPAGE: mlink
764	764	** URL: /mlink?name=FILENAME
		@@ -935,7 +935,7 @@
935	935	db_finalize(&q);
936	936	@ </tbody>
937	937	@ </table>
938	938	@ </div>
939	939	}
940		- style_finish_page("finfo");
	940	+ style_finish_page();
941	941	}
942	942

	--- src/finfo.c
	+++ src/finfo.c
	@@ -367,11 +367,11 @@
367	ridFrom = name_to_rid_www("from");
368	zPrevDate[0] = 0;
369	cookie_render();
370	if( fnid==0 ){
371	@ No such file: %h(zFilename)
372	style_finish_page("finfo");
373	return;
374	}
375	if( g.perm.Admin ){
376	style_submenu_element("MLink Table", "%R/mlink?name=%t", zFilename);
377	}
	@@ -754,11 +754,11 @@
754	@ <td></td><td></td><td></td></tr>
755	}
756	}
757	@ </table>
758	timeline_output_graph_javascript(pGraph, TIMELINE_FILEDIFF, iTableId);
759	style_finish_page("finfo");
760	}
761
762	/*
763	** WEBPAGE: mlink
764	** URL: /mlink?name=FILENAME
	@@ -935,7 +935,7 @@
935	db_finalize(&q);
936	@ </tbody>
937	@ </table>
938	@ </div>
939	}
940	style_finish_page("finfo");
941	}
942

	--- src/finfo.c
	+++ src/finfo.c
	@@ -367,11 +367,11 @@
367	ridFrom = name_to_rid_www("from");
368	zPrevDate[0] = 0;
369	cookie_render();
370	if( fnid==0 ){
371	@ No such file: %h(zFilename)
372	style_finish_page();
373	return;
374	}
375	if( g.perm.Admin ){
376	style_submenu_element("MLink Table", "%R/mlink?name=%t", zFilename);
377	}
	@@ -754,11 +754,11 @@
754	@ <td></td><td></td><td></td></tr>
755	}
756	}
757	@ </table>
758	timeline_output_graph_javascript(pGraph, TIMELINE_FILEDIFF, iTableId);
759	style_finish_page();
760	}
761
762	/*
763	** WEBPAGE: mlink
764	** URL: /mlink?name=FILENAME
	@@ -935,7 +935,7 @@
935	db_finalize(&q);
936	@ </tbody>
937	@ </table>
938	@ </div>
939	}
940	style_finish_page();
941	}
942

M src/forum.c

+6 -6

		--- src/forum.c
		+++ src/forum.c
		@@ -884,11 +884,11 @@
884	884	/* Emit Forum Javascript. */
885	885	builtin_request_js("forum.js");
886	886	forum_emit_js();
887	887
888	888	/* Emit the page style. */
889		- style_finish_page("forum");
	889	+ style_finish_page();
890	890	}
891	891
892	892	/*
893	893	** Return true if a forum post should be moderated.
894	894	*/
		@@ -1081,11 +1081,11 @@
1081	1081	@ <input type="submit" value="Login">
1082	1082	@ </form>
1083	1083	@ <td>Log into an existing account
1084	1084	@ </table>
1085	1085	forum_emit_js();
1086		- style_finish_page("forum");
	1086	+ style_finish_page();
1087	1087	fossil_free(zGoto);
1088	1088	}
1089	1089
1090	1090	/*
1091	1091	** Write the "From: USER" line on the webpage.
		@@ -1143,11 +1143,11 @@
1143	1143	@ Show query parameters</label>
1144	1144	@ </div>
1145	1145	}
1146	1146	@ </form>
1147	1147	forum_emit_js();
1148		- style_finish_page("forum");
	1148	+ style_finish_page();
1149	1149	}
1150	1150
1151	1151	/*
1152	1152	** WEBPAGE: forume2
1153	1153	**
		@@ -1324,11 +1324,11 @@
1324	1324	@ Show query parameters</label>
1325	1325	@ </div>
1326	1326	}
1327	1327	@ </form>
1328	1328	forum_emit_js();
1329		- style_finish_page("forum");
	1329	+ style_finish_page();
1330	1330	}
1331	1331
1332	1332	/*
1333	1333	** WEBPAGE: forummain
1334	1334	** WEBPAGE: forum
		@@ -1367,11 +1367,11 @@
1367	1367	style_submenu_element("Moderation Requests", "%R/modreq");
1368	1368	}
1369	1369	if( (srchFlags & SRCH_FORUM)!=0 ){
1370	1370	if( search_screen(SRCH_FORUM, 0) ){
1371	1371	style_submenu_element("Recent Threads","%R/forum");
1372		- style_finish_page("forum");
	1372	+ style_finish_page();
1373	1373	return;
1374	1374	}
1375	1375	}
1376	1376	iLimit = atoi(PD("n","25"));
1377	1377	iOfst = atoi(PD("x","0"));
		@@ -1460,7 +1460,7 @@
1460	1460	if( iCnt>0 ){
1461	1461	@ </table></div>
1462	1462	}else{
1463	1463	@ <h1>No forum posts found</h1>
1464	1464	}
1465		- style_finish_page("forum");
	1465	+ style_finish_page();
1466	1466	}
1467	1467

	--- src/forum.c
	+++ src/forum.c
	@@ -884,11 +884,11 @@
884	/* Emit Forum Javascript. */
885	builtin_request_js("forum.js");
886	forum_emit_js();
887
888	/* Emit the page style. */
889	style_finish_page("forum");
890	}
891
892	/*
893	** Return true if a forum post should be moderated.
894	*/
	@@ -1081,11 +1081,11 @@
1081	@ <input type="submit" value="Login">
1082	@ </form>
1083	@ <td>Log into an existing account
1084	@ </table>
1085	forum_emit_js();
1086	style_finish_page("forum");
1087	fossil_free(zGoto);
1088	}
1089
1090	/*
1091	** Write the "From: USER" line on the webpage.
	@@ -1143,11 +1143,11 @@
1143	@ Show query parameters</label>
1144	@ </div>
1145	}
1146	@ </form>
1147	forum_emit_js();
1148	style_finish_page("forum");
1149	}
1150
1151	/*
1152	** WEBPAGE: forume2
1153	**
	@@ -1324,11 +1324,11 @@
1324	@ Show query parameters</label>
1325	@ </div>
1326	}
1327	@ </form>
1328	forum_emit_js();
1329	style_finish_page("forum");
1330	}
1331
1332	/*
1333	** WEBPAGE: forummain
1334	** WEBPAGE: forum
	@@ -1367,11 +1367,11 @@
1367	style_submenu_element("Moderation Requests", "%R/modreq");
1368	}
1369	if( (srchFlags & SRCH_FORUM)!=0 ){
1370	if( search_screen(SRCH_FORUM, 0) ){
1371	style_submenu_element("Recent Threads","%R/forum");
1372	style_finish_page("forum");
1373	return;
1374	}
1375	}
1376	iLimit = atoi(PD("n","25"));
1377	iOfst = atoi(PD("x","0"));
	@@ -1460,7 +1460,7 @@
1460	if( iCnt>0 ){
1461	@ </table></div>
1462	}else{
1463	@ <h1>No forum posts found</h1>
1464	}
1465	style_finish_page("forum");
1466	}
1467

	--- src/forum.c
	+++ src/forum.c
	@@ -884,11 +884,11 @@
884	/* Emit Forum Javascript. */
885	builtin_request_js("forum.js");
886	forum_emit_js();
887
888	/* Emit the page style. */
889	style_finish_page();
890	}
891
892	/*
893	** Return true if a forum post should be moderated.
894	*/
	@@ -1081,11 +1081,11 @@
1081	@ <input type="submit" value="Login">
1082	@ </form>
1083	@ <td>Log into an existing account
1084	@ </table>
1085	forum_emit_js();
1086	style_finish_page();
1087	fossil_free(zGoto);
1088	}
1089
1090	/*
1091	** Write the "From: USER" line on the webpage.
	@@ -1143,11 +1143,11 @@
1143	@ Show query parameters</label>
1144	@ </div>
1145	}
1146	@ </form>
1147	forum_emit_js();
1148	style_finish_page();
1149	}
1150
1151	/*
1152	** WEBPAGE: forume2
1153	**
	@@ -1324,11 +1324,11 @@
1324	@ Show query parameters</label>
1325	@ </div>
1326	}
1327	@ </form>
1328	forum_emit_js();
1329	style_finish_page();
1330	}
1331
1332	/*
1333	** WEBPAGE: forummain
1334	** WEBPAGE: forum
	@@ -1367,11 +1367,11 @@
1367	style_submenu_element("Moderation Requests", "%R/modreq");
1368	}
1369	if( (srchFlags & SRCH_FORUM)!=0 ){
1370	if( search_screen(SRCH_FORUM, 0) ){
1371	style_submenu_element("Recent Threads","%R/forum");
1372	style_finish_page();
1373	return;
1374	}
1375	}
1376	iLimit = atoi(PD("n","25"));
1377	iOfst = atoi(PD("x","0"));
	@@ -1460,7 +1460,7 @@
1460	if( iCnt>0 ){
1461	@ </table></div>
1462	}else{
1463	@ <h1>No forum posts found</h1>
1464	}
1465	style_finish_page();
1466	}
1467

M src/info.c

+16 -16

		--- src/info.c
		+++ src/info.c
		@@ -503,11 +503,11 @@
503	503	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
504	504	rid = name_to_rid_www("name");
505	505	if( rid==0 ){
506	506	style_header("Check-in Information Error");
507	507	@ No such object: %h(g.argv[2])
508		- style_finish_page("ci_tags");
	508	+ style_finish_page();
509	509	return;
510	510	}
511	511	zHash = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
512	512	style_header("Tags and Properties");
513	513	@ <h1>Tags and Properties for Check-In \
		@@ -595,11 +595,11 @@
595	595	blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
596	596	db_prepare(&q, "%s", blob_sql_text(&sql));
597	597	www_print_timeline(&q, TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_NOSCROLL,
598	598	0, 0, 0, rid, 0, 0);
599	599	db_finalize(&q);
600		- style_finish_page("ci_tags");
	600	+ style_finish_page();
601	601	}
602	602
603	603	/*
604	604	** WEBPAGE: vinfo
605	605	** WEBPAGE: ci
		@@ -635,11 +635,11 @@
635	635	zName = P("name");
636	636	rid = name_to_rid_www("name");
637	637	if( rid==0 ){
638	638	style_header("Check-in Information Error");
639	639	@ No such object: %h(g.argv[2])
640		- style_finish_page("vinfo");
	640	+ style_finish_page();
641	641	return;
642	642	}
643	643	zRe = P("regex");
644	644	if( zRe ) re_compile(&pRe, zRe, 0);
645	645	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
		@@ -941,11 +941,11 @@
941	941	diffFlags,pRe,mperm);
942	942	}
943	943	db_finalize(&q3);
944	944	append_diff_javascript(diffType==2);
945	945	cookie_render();
946		- style_finish_page("vinfo");
	946	+ style_finish_page();
947	947	}
948	948
949	949	/*
950	950	** WEBPAGE: winfo
951	951	** URL: /winfo?name=HASH
		@@ -968,11 +968,11 @@
968	968	style_set_current_feature("winfo");
969	969	rid = name_to_rid_www("name");
970	970	if( rid==0 \|\| (pWiki = manifest_get(rid, CFTYPE_WIKI, 0))==0 ){
971	971	style_header("Wiki Page Information Error");
972	972	@ No such object: %h(P("name"))
973		- style_finish_page("winfo");
	973	+ style_finish_page();
974	974	return;
975	975	}
976	976	if( g.perm.ModWiki && (zModAction = P("modaction"))!=0 ){
977	977	if( strcmp(zModAction,"delete")==0 ){
978	978	moderation_disapprove(rid);
		@@ -1056,11 +1056,11 @@
1056	1056	safe_html_context(DOCSRC_WIKI);
1057	1057	wiki_render_by_mimetype(&wiki, pWiki->zMimetype);
1058	1058	blob_reset(&wiki);
1059	1059	manifest_destroy(pWiki);
1060	1060	document_emit_js();
1061		- style_finish_page("winfo");
	1061	+ style_finish_page();
1062	1062	}
1063	1063
1064	1064	/*
1065	1065	** Find an check-in based on query parameter zParam and parse its
1066	1066	** manifest. Return the number of errors.
		@@ -1330,11 +1330,11 @@
1330	1330	}
1331	1331	}
1332	1332	manifest_destroy(pFrom);
1333	1333	manifest_destroy(pTo);
1334	1334	append_diff_javascript(diffType==2);
1335		- style_finish_page("vdiff");
	1335	+ style_finish_page();
1336	1336	}
1337	1337
1338	1338	#if INTERFACE
1339	1339	/*
1340	1340	** Possible return values from object_description()
		@@ -1765,11 +1765,11 @@
1765	1765	@ are shown.</b>
1766	1766	}
1767	1767	@ <hr />
1768	1768	append_diff(zV1, zV2, diffFlags, pRe);
1769	1769	append_diff_javascript(diffType);
1770		- style_finish_page("fdiff");
	1770	+ style_finish_page();
1771	1771	}
1772	1772
1773	1773	/*
1774	1774	** WEBPAGE: raw
1775	1775	** URL: /raw/ARTIFACTID
		@@ -1969,11 +1969,11 @@
1969	1969	@ <hr />
1970	1970	content_get(rid, &content);
1971	1971	@ <blockquote><pre>
1972	1972	hexdump(&content);
1973	1973	@ </pre></blockquote>
1974		- style_finish_page("hexdump");
	1974	+ style_finish_page();
1975	1975	}
1976	1976
1977	1977	/*
1978	1978	** Look for "ci" and "filename" query parameters. If found, try to
1979	1979	** use them to extract the record ID of an artifact for the file.
		@@ -2268,11 +2268,11 @@
2268	2268	page_tree();
2269	2269	return;
2270	2270	}
2271	2271	style_header("Missing name= query parameter");
2272	2272	@ The name= query parameter is missing
2273		- style_finish_page("artifact");
	2273	+ style_finish_page();
2274	2274	return;
2275	2275	}
2276	2276
2277	2277	url_initialize(&url, g.zPath);
2278	2278	url_add_parameter(&url, "name", zName);
		@@ -2329,11 +2329,11 @@
2329	2329	}else{
2330	2330	style_header("No such artifact");
2331	2331	@ Artifact '%h(zName)' does not exist in this repository.
2332	2332	}
2333	2333	if( rid==0 ){
2334		- style_finish_page("artifact");
	2334	+ style_finish_page();
2335	2335	return;
2336	2336	}
2337	2337	}
2338	2338
2339	2339	if( descOnly \|\| P("verbose")!=0 ){
		@@ -2537,11 +2537,11 @@
2537	2537	@ <i>(file is %d(blob_size(&content)) bytes of binary data)</i>
2538	2538	}
2539	2539	@ </blockquote>
2540	2540	}
2541	2541	}
2542		- style_finish_page("artifact");
	2542	+ style_finish_page();
2543	2543	}
2544	2544
2545	2545	/*
2546	2546	** WEBPAGE: tinfo
2547	2547	** URL: /tinfo?name=ARTIFACTID
		@@ -2645,11 +2645,11 @@
2645	2645
2646	2646	@ <div class="section">Changes</div>
2647	2647	@ <p>
2648	2648	ticket_output_change_artifact(pTktChng, 0, 1);
2649	2649	manifest_destroy(pTktChng);
2650		- style_finish_page("tinfo");
	2650	+ style_finish_page();
2651	2651	}
2652	2652
2653	2653
2654	2654	/*
2655	2655	** WEBPAGE: info
		@@ -2696,11 +2696,11 @@
2696	2696	@ <p>No such object: %h(zName)</p>
2697	2697	if( nLen<4 ){
2698	2698	@ <p>Object name should be no less than 4 characters. Ten or more
2699	2699	@ characters are recommended.</p>
2700	2700	}
2701		- style_finish_page("info");
	2701	+ style_finish_page();
2702	2702	return;
2703	2703	}else if( rc==2 ){
2704	2704	cgi_set_parameter("src","info");
2705	2705	ambiguous_page();
2706	2706	return;
		@@ -2708,11 +2708,11 @@
2708	2708	zName = blob_str(&uuid);
2709	2709	rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", zName);
2710	2710	if( rid==0 ){
2711	2711	style_header("Broken Link");
2712	2712	@ <p>No such object: %h(zName)</p>
2713		- style_finish_page("info");
	2713	+ style_finish_page();
2714	2714	return;
2715	2715	}
2716	2716	if( db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
2717	2717	ci_page();
2718	2718	}else
		@@ -3233,11 +3233,11 @@
3233	3233	}
3234	3234	@ </td></tr>
3235	3235	@ </table>
3236	3236	@ </div></form>
3237	3237	builtin_request_js("ci_edit.js");
3238		- style_finish_page("ci_edit");
	3238	+ style_finish_page();
3239	3239	}
3240	3240
3241	3241	/*
3242	3242	** Prepare an ammended commit comment. Let the user modify it using the
3243	3243	** editor specified in the global_config table or either
3244	3244

	--- src/info.c
	+++ src/info.c
	@@ -503,11 +503,11 @@
503	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
504	rid = name_to_rid_www("name");
505	if( rid==0 ){
506	style_header("Check-in Information Error");
507	@ No such object: %h(g.argv[2])
508	style_finish_page("ci_tags");
509	return;
510	}
511	zHash = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
512	style_header("Tags and Properties");
513	@ <h1>Tags and Properties for Check-In \
	@@ -595,11 +595,11 @@
595	blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
596	db_prepare(&q, "%s", blob_sql_text(&sql));
597	www_print_timeline(&q, TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_NOSCROLL,
598	0, 0, 0, rid, 0, 0);
599	db_finalize(&q);
600	style_finish_page("ci_tags");
601	}
602
603	/*
604	** WEBPAGE: vinfo
605	** WEBPAGE: ci
	@@ -635,11 +635,11 @@
635	zName = P("name");
636	rid = name_to_rid_www("name");
637	if( rid==0 ){
638	style_header("Check-in Information Error");
639	@ No such object: %h(g.argv[2])
640	style_finish_page("vinfo");
641	return;
642	}
643	zRe = P("regex");
644	if( zRe ) re_compile(&pRe, zRe, 0);
645	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
	@@ -941,11 +941,11 @@
941	diffFlags,pRe,mperm);
942	}
943	db_finalize(&q3);
944	append_diff_javascript(diffType==2);
945	cookie_render();
946	style_finish_page("vinfo");
947	}
948
949	/*
950	** WEBPAGE: winfo
951	** URL: /winfo?name=HASH
	@@ -968,11 +968,11 @@
968	style_set_current_feature("winfo");
969	rid = name_to_rid_www("name");
970	if( rid==0 \|\| (pWiki = manifest_get(rid, CFTYPE_WIKI, 0))==0 ){
971	style_header("Wiki Page Information Error");
972	@ No such object: %h(P("name"))
973	style_finish_page("winfo");
974	return;
975	}
976	if( g.perm.ModWiki && (zModAction = P("modaction"))!=0 ){
977	if( strcmp(zModAction,"delete")==0 ){
978	moderation_disapprove(rid);
	@@ -1056,11 +1056,11 @@
1056	safe_html_context(DOCSRC_WIKI);
1057	wiki_render_by_mimetype(&wiki, pWiki->zMimetype);
1058	blob_reset(&wiki);
1059	manifest_destroy(pWiki);
1060	document_emit_js();
1061	style_finish_page("winfo");
1062	}
1063
1064	/*
1065	** Find an check-in based on query parameter zParam and parse its
1066	** manifest. Return the number of errors.
	@@ -1330,11 +1330,11 @@
1330	}
1331	}
1332	manifest_destroy(pFrom);
1333	manifest_destroy(pTo);
1334	append_diff_javascript(diffType==2);
1335	style_finish_page("vdiff");
1336	}
1337
1338	#if INTERFACE
1339	/*
1340	** Possible return values from object_description()
	@@ -1765,11 +1765,11 @@
1765	@ are shown.</b>
1766	}
1767	@ <hr />
1768	append_diff(zV1, zV2, diffFlags, pRe);
1769	append_diff_javascript(diffType);
1770	style_finish_page("fdiff");
1771	}
1772
1773	/*
1774	** WEBPAGE: raw
1775	** URL: /raw/ARTIFACTID
	@@ -1969,11 +1969,11 @@
1969	@ <hr />
1970	content_get(rid, &content);
1971	@ <blockquote><pre>
1972	hexdump(&content);
1973	@ </pre></blockquote>
1974	style_finish_page("hexdump");
1975	}
1976
1977	/*
1978	** Look for "ci" and "filename" query parameters. If found, try to
1979	** use them to extract the record ID of an artifact for the file.
	@@ -2268,11 +2268,11 @@
2268	page_tree();
2269	return;
2270	}
2271	style_header("Missing name= query parameter");
2272	@ The name= query parameter is missing
2273	style_finish_page("artifact");
2274	return;
2275	}
2276
2277	url_initialize(&url, g.zPath);
2278	url_add_parameter(&url, "name", zName);
	@@ -2329,11 +2329,11 @@
2329	}else{
2330	style_header("No such artifact");
2331	@ Artifact '%h(zName)' does not exist in this repository.
2332	}
2333	if( rid==0 ){
2334	style_finish_page("artifact");
2335	return;
2336	}
2337	}
2338
2339	if( descOnly \|\| P("verbose")!=0 ){
	@@ -2537,11 +2537,11 @@
2537	@ <i>(file is %d(blob_size(&content)) bytes of binary data)</i>
2538	}
2539	@ </blockquote>
2540	}
2541	}
2542	style_finish_page("artifact");
2543	}
2544
2545	/*
2546	** WEBPAGE: tinfo
2547	** URL: /tinfo?name=ARTIFACTID
	@@ -2645,11 +2645,11 @@
2645
2646	@ <div class="section">Changes</div>
2647	@ <p>
2648	ticket_output_change_artifact(pTktChng, 0, 1);
2649	manifest_destroy(pTktChng);
2650	style_finish_page("tinfo");
2651	}
2652
2653
2654	/*
2655	** WEBPAGE: info
	@@ -2696,11 +2696,11 @@
2696	@ <p>No such object: %h(zName)</p>
2697	if( nLen<4 ){
2698	@ <p>Object name should be no less than 4 characters. Ten or more
2699	@ characters are recommended.</p>
2700	}
2701	style_finish_page("info");
2702	return;
2703	}else if( rc==2 ){
2704	cgi_set_parameter("src","info");
2705	ambiguous_page();
2706	return;
	@@ -2708,11 +2708,11 @@
2708	zName = blob_str(&uuid);
2709	rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", zName);
2710	if( rid==0 ){
2711	style_header("Broken Link");
2712	@ <p>No such object: %h(zName)</p>
2713	style_finish_page("info");
2714	return;
2715	}
2716	if( db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
2717	ci_page();
2718	}else
	@@ -3233,11 +3233,11 @@
3233	}
3234	@ </td></tr>
3235	@ </table>
3236	@ </div></form>
3237	builtin_request_js("ci_edit.js");
3238	style_finish_page("ci_edit");
3239	}
3240
3241	/*
3242	** Prepare an ammended commit comment. Let the user modify it using the
3243	** editor specified in the global_config table or either
3244

	--- src/info.c
	+++ src/info.c
	@@ -503,11 +503,11 @@
503	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
504	rid = name_to_rid_www("name");
505	if( rid==0 ){
506	style_header("Check-in Information Error");
507	@ No such object: %h(g.argv[2])
508	style_finish_page();
509	return;
510	}
511	zHash = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
512	style_header("Tags and Properties");
513	@ <h1>Tags and Properties for Check-In \
	@@ -595,11 +595,11 @@
595	blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
596	db_prepare(&q, "%s", blob_sql_text(&sql));
597	www_print_timeline(&q, TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_NOSCROLL,
598	0, 0, 0, rid, 0, 0);
599	db_finalize(&q);
600	style_finish_page();
601	}
602
603	/*
604	** WEBPAGE: vinfo
605	** WEBPAGE: ci
	@@ -635,11 +635,11 @@
635	zName = P("name");
636	rid = name_to_rid_www("name");
637	if( rid==0 ){
638	style_header("Check-in Information Error");
639	@ No such object: %h(g.argv[2])
640	style_finish_page();
641	return;
642	}
643	zRe = P("regex");
644	if( zRe ) re_compile(&pRe, zRe, 0);
645	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
	@@ -941,11 +941,11 @@
941	diffFlags,pRe,mperm);
942	}
943	db_finalize(&q3);
944	append_diff_javascript(diffType==2);
945	cookie_render();
946	style_finish_page();
947	}
948
949	/*
950	** WEBPAGE: winfo
951	** URL: /winfo?name=HASH
	@@ -968,11 +968,11 @@
968	style_set_current_feature("winfo");
969	rid = name_to_rid_www("name");
970	if( rid==0 \|\| (pWiki = manifest_get(rid, CFTYPE_WIKI, 0))==0 ){
971	style_header("Wiki Page Information Error");
972	@ No such object: %h(P("name"))
973	style_finish_page();
974	return;
975	}
976	if( g.perm.ModWiki && (zModAction = P("modaction"))!=0 ){
977	if( strcmp(zModAction,"delete")==0 ){
978	moderation_disapprove(rid);
	@@ -1056,11 +1056,11 @@
1056	safe_html_context(DOCSRC_WIKI);
1057	wiki_render_by_mimetype(&wiki, pWiki->zMimetype);
1058	blob_reset(&wiki);
1059	manifest_destroy(pWiki);
1060	document_emit_js();
1061	style_finish_page();
1062	}
1063
1064	/*
1065	** Find an check-in based on query parameter zParam and parse its
1066	** manifest. Return the number of errors.
	@@ -1330,11 +1330,11 @@
1330	}
1331	}
1332	manifest_destroy(pFrom);
1333	manifest_destroy(pTo);
1334	append_diff_javascript(diffType==2);
1335	style_finish_page();
1336	}
1337
1338	#if INTERFACE
1339	/*
1340	** Possible return values from object_description()
	@@ -1765,11 +1765,11 @@
1765	@ are shown.</b>
1766	}
1767	@ <hr />
1768	append_diff(zV1, zV2, diffFlags, pRe);
1769	append_diff_javascript(diffType);
1770	style_finish_page();
1771	}
1772
1773	/*
1774	** WEBPAGE: raw
1775	** URL: /raw/ARTIFACTID
	@@ -1969,11 +1969,11 @@
1969	@ <hr />
1970	content_get(rid, &content);
1971	@ <blockquote><pre>
1972	hexdump(&content);
1973	@ </pre></blockquote>
1974	style_finish_page();
1975	}
1976
1977	/*
1978	** Look for "ci" and "filename" query parameters. If found, try to
1979	** use them to extract the record ID of an artifact for the file.
	@@ -2268,11 +2268,11 @@
2268	page_tree();
2269	return;
2270	}
2271	style_header("Missing name= query parameter");
2272	@ The name= query parameter is missing
2273	style_finish_page();
2274	return;
2275	}
2276
2277	url_initialize(&url, g.zPath);
2278	url_add_parameter(&url, "name", zName);
	@@ -2329,11 +2329,11 @@
2329	}else{
2330	style_header("No such artifact");
2331	@ Artifact '%h(zName)' does not exist in this repository.
2332	}
2333	if( rid==0 ){
2334	style_finish_page();
2335	return;
2336	}
2337	}
2338
2339	if( descOnly \|\| P("verbose")!=0 ){
	@@ -2537,11 +2537,11 @@
2537	@ <i>(file is %d(blob_size(&content)) bytes of binary data)</i>
2538	}
2539	@ </blockquote>
2540	}
2541	}
2542	style_finish_page();
2543	}
2544
2545	/*
2546	** WEBPAGE: tinfo
2547	** URL: /tinfo?name=ARTIFACTID
	@@ -2645,11 +2645,11 @@
2645
2646	@ <div class="section">Changes</div>
2647	@ <p>
2648	ticket_output_change_artifact(pTktChng, 0, 1);
2649	manifest_destroy(pTktChng);
2650	style_finish_page();
2651	}
2652
2653
2654	/*
2655	** WEBPAGE: info
	@@ -2696,11 +2696,11 @@
2696	@ <p>No such object: %h(zName)</p>
2697	if( nLen<4 ){
2698	@ <p>Object name should be no less than 4 characters. Ten or more
2699	@ characters are recommended.</p>
2700	}
2701	style_finish_page();
2702	return;
2703	}else if( rc==2 ){
2704	cgi_set_parameter("src","info");
2705	ambiguous_page();
2706	return;
	@@ -2708,11 +2708,11 @@
2708	zName = blob_str(&uuid);
2709	rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", zName);
2710	if( rid==0 ){
2711	style_header("Broken Link");
2712	@ <p>No such object: %h(zName)</p>
2713	style_finish_page();
2714	return;
2715	}
2716	if( db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
2717	ci_page();
2718	}else
	@@ -3233,11 +3233,11 @@
3233	}
3234	@ </td></tr>
3235	@ </table>
3236	@ </div></form>
3237	builtin_request_js("ci_edit.js");
3238	style_finish_page();
3239	}
3240
3241	/*
3242	** Prepare an ammended commit comment. Let the user modify it using the
3243	** editor specified in the global_config table or either
3244

M src/interwiki.c

+2 -2

		--- src/interwiki.c
		+++ src/interwiki.c
		@@ -389,11 +389,11 @@
389	389	@ No mappings are currently defined.
390	390	}
391	391
392	392	if( !g.perm.Setup ){
393	393	/* Do not show intermap editing fields to non-setup users */
394		- style_finish_page("interwiki");
	394	+ style_finish_page();
395	395	return;
396	396	}
397	397
398	398	@ <p>To add a new mapping, fill out the form below providing a unique name
399	399	@ for the tag. To edit an exist mapping, fill out the form and use the
		@@ -422,7 +422,7 @@
422	422	@ <tr><td></td>
423	423	@ <td><input type="submit" name="submit" value="Apply Changes"></td></tr>
424	424	@ </table>
425	425	@ </form>
426	426
427		- style_finish_page("interwiki");
	427	+ style_finish_page();
428	428	}
429	429

	--- src/interwiki.c
	+++ src/interwiki.c
	@@ -389,11 +389,11 @@
389	@ No mappings are currently defined.
390	}
391
392	if( !g.perm.Setup ){
393	/* Do not show intermap editing fields to non-setup users */
394	style_finish_page("interwiki");
395	return;
396	}
397
398	@ <p>To add a new mapping, fill out the form below providing a unique name
399	@ for the tag. To edit an exist mapping, fill out the form and use the
	@@ -422,7 +422,7 @@
422	@ <tr><td></td>
423	@ <td><input type="submit" name="submit" value="Apply Changes"></td></tr>
424	@ </table>
425	@ </form>
426
427	style_finish_page("interwiki");
428	}
429

	--- src/interwiki.c
	+++ src/interwiki.c
	@@ -389,11 +389,11 @@
389	@ No mappings are currently defined.
390	}
391
392	if( !g.perm.Setup ){
393	/* Do not show intermap editing fields to non-setup users */
394	style_finish_page();
395	return;
396	}
397
398	@ <p>To add a new mapping, fill out the form below providing a unique name
399	@ for the tag. To edit an exist mapping, fill out the form and use the
	@@ -422,7 +422,7 @@
422	@ <tr><td></td>
423	@ <td><input type="submit" name="submit" value="Apply Changes"></td></tr>
424	@ </table>
425	@ </form>
426
427	style_finish_page();
428	}
429

M src/loadctrl.c

+1 -1

		--- src/loadctrl.c
		+++ src/loadctrl.c
		@@ -58,10 +58,10 @@
58	58	style_header("Server Overload");
59	59	@ <h2>The server load is currently too high.
60	60	@ Please try again later.</h2>
61	61	@ <p>Current load average: %f(load_average()).<br />
62	62	@ Load average limit: %f(mxLoad)</p>
63		- style_finish_page("test");
	63	+ style_finish_page();
64	64	cgi_set_status(503,"Server Overload");
65	65	cgi_reply();
66	66	exit(0);
67	67	}
68	68

	--- src/loadctrl.c
	+++ src/loadctrl.c
	@@ -58,10 +58,10 @@
58	style_header("Server Overload");
59	@ <h2>The server load is currently too high.
60	@ Please try again later.</h2>
61	@ <p>Current load average: %f(load_average()).<br />
62	@ Load average limit: %f(mxLoad)</p>
63	style_finish_page("test");
64	cgi_set_status(503,"Server Overload");
65	cgi_reply();
66	exit(0);
67	}
68

	--- src/loadctrl.c
	+++ src/loadctrl.c
	@@ -58,10 +58,10 @@
58	style_header("Server Overload");
59	@ <h2>The server load is currently too high.
60	@ Please try again later.</h2>
61	@ <p>Current load average: %f(load_average()).<br />
62	@ Load average limit: %f(mxLoad)</p>
63	style_finish_page();
64	cgi_set_status(503,"Server Overload");
65	cgi_reply();
66	exit(0);
67	}
68

M src/login.c

+4 -4

		--- src/login.c
		+++ src/login.c
		@@ -796,11 +796,11 @@
796	796	@ <td><input type="submit" value="Change Password" /></td></tr>
797	797	@ </table>
798	798	@ </form>
799	799	}
800	800	}
801		- style_finish_page("login");
	801	+ style_finish_page();
802	802	}
803	803
804	804	/*
805	805	** Attempt to find login credentials for user zLogin on a peer repository
806	806	** with project code zCode. Transfer those credentials to the local
		@@ -1550,11 +1550,11 @@
1550	1550	int doAlerts = 0; /* True if subscription is wanted too */
1551	1551	if( !db_get_boolean("self-register", 0) ){
1552	1552	style_header("Registration not possible");
1553	1553	@ <p>This project does not allow user self-registration. Please contact the
1554	1554	@ project administrator to obtain an account.</p>
1555		- style_finish_page("register");
	1555	+ style_finish_page();
1556	1556	return;
1557	1557	}
1558	1558	zPerms = db_get("default-perms", "u");
1559	1559
1560	1560	/* Prompt the user for email alerts if this repository is configured for
		@@ -1709,11 +1709,11 @@
1709	1709	}
1710	1710	alert_sender_free(pSender);
1711	1711	if( zGoto ){
1712	1712	@ <p><a href='%h(zGoto)'>Continue</a>
1713	1713	}
1714		- style_finish_page("register");
	1714	+ style_finish_page();
1715	1715	return;
1716	1716	}
1717	1717	redirect_to_g();
1718	1718	}
1719	1719
		@@ -1801,11 +1801,11 @@
1801	1801	@ %h(zCaptcha)
1802	1802	@ </pre>
1803	1803	@ Enter this 8-letter code in the "Captcha" box above.
1804	1804	@ </td></tr></table></div>
1805	1805	@ </form>
1806		- style_finish_page("register");
	1806	+ style_finish_page();
1807	1807
1808	1808	free(zCaptcha);
1809	1809	}
1810	1810
1811	1811	/*
1812	1812

	--- src/login.c
	+++ src/login.c
	@@ -796,11 +796,11 @@
796	@ <td><input type="submit" value="Change Password" /></td></tr>
797	@ </table>
798	@ </form>
799	}
800	}
801	style_finish_page("login");
802	}
803
804	/*
805	** Attempt to find login credentials for user zLogin on a peer repository
806	** with project code zCode. Transfer those credentials to the local
	@@ -1550,11 +1550,11 @@
1550	int doAlerts = 0; /* True if subscription is wanted too */
1551	if( !db_get_boolean("self-register", 0) ){
1552	style_header("Registration not possible");
1553	@ <p>This project does not allow user self-registration. Please contact the
1554	@ project administrator to obtain an account.</p>
1555	style_finish_page("register");
1556	return;
1557	}
1558	zPerms = db_get("default-perms", "u");
1559
1560	/* Prompt the user for email alerts if this repository is configured for
	@@ -1709,11 +1709,11 @@
1709	}
1710	alert_sender_free(pSender);
1711	if( zGoto ){
1712	@ <p><a href='%h(zGoto)'>Continue</a>
1713	}
1714	style_finish_page("register");
1715	return;
1716	}
1717	redirect_to_g();
1718	}
1719
	@@ -1801,11 +1801,11 @@
1801	@ %h(zCaptcha)
1802	@ </pre>
1803	@ Enter this 8-letter code in the "Captcha" box above.
1804	@ </td></tr></table></div>
1805	@ </form>
1806	style_finish_page("register");
1807
1808	free(zCaptcha);
1809	}
1810
1811	/*
1812

	--- src/login.c
	+++ src/login.c
	@@ -796,11 +796,11 @@
796	@ <td><input type="submit" value="Change Password" /></td></tr>
797	@ </table>
798	@ </form>
799	}
800	}
801	style_finish_page();
802	}
803
804	/*
805	** Attempt to find login credentials for user zLogin on a peer repository
806	** with project code zCode. Transfer those credentials to the local
	@@ -1550,11 +1550,11 @@
1550	int doAlerts = 0; /* True if subscription is wanted too */
1551	if( !db_get_boolean("self-register", 0) ){
1552	style_header("Registration not possible");
1553	@ <p>This project does not allow user self-registration. Please contact the
1554	@ project administrator to obtain an account.</p>
1555	style_finish_page();
1556	return;
1557	}
1558	zPerms = db_get("default-perms", "u");
1559
1560	/* Prompt the user for email alerts if this repository is configured for
	@@ -1709,11 +1709,11 @@
1709	}
1710	alert_sender_free(pSender);
1711	if( zGoto ){
1712	@ <p><a href='%h(zGoto)'>Continue</a>
1713	}
1714	style_finish_page();
1715	return;
1716	}
1717	redirect_to_g();
1718	}
1719
	@@ -1801,11 +1801,11 @@
1801	@ %h(zCaptcha)
1802	@ </pre>
1803	@ Enter this 8-letter code in the "Captcha" box above.
1804	@ </td></tr></table></div>
1805	@ </form>
1806	style_finish_page();
1807
1808	free(zCaptcha);
1809	}
1810
1811	/*
1812

M src/main.c

+2 -2

		--- src/main.c
		+++ src/main.c
		@@ -1310,11 +1310,11 @@
1310	1310	style_submenu_element("Stat", "stat");
1311	1311	fossil_version_blob(&versionInfo, verboseFlag);
1312	1312	@ <pre>
1313	1313	@ %h(blob_str(&versionInfo))
1314	1314	@ </pre>
1315		- style_finish_page("version");
	1315	+ style_finish_page();
1316	1316	}
1317	1317
1318	1318
1319	1319	/*
1320	1320	** Set the g.zBaseURL value to the full URL for the toplevel of
		@@ -3098,7 +3098,7 @@
3098	3098	cgi_reset_content();
3099	3099	webpage_error("Case 7 from /test-warning");
3100	3100	}
3101	3101	@ </ol>
3102	3102	@ <p>End of test</p>
3103		- style_finish_page("test");
	3103	+ style_finish_page();
3104	3104	}
3105	3105

	--- src/main.c
	+++ src/main.c
	@@ -1310,11 +1310,11 @@
1310	style_submenu_element("Stat", "stat");
1311	fossil_version_blob(&versionInfo, verboseFlag);
1312	@ <pre>
1313	@ %h(blob_str(&versionInfo))
1314	@ </pre>
1315	style_finish_page("version");
1316	}
1317
1318
1319	/*
1320	** Set the g.zBaseURL value to the full URL for the toplevel of
	@@ -3098,7 +3098,7 @@
3098	cgi_reset_content();
3099	webpage_error("Case 7 from /test-warning");
3100	}
3101	@ </ol>
3102	@ <p>End of test</p>
3103	style_finish_page("test");
3104	}
3105

	--- src/main.c
	+++ src/main.c
	@@ -1310,11 +1310,11 @@
1310	style_submenu_element("Stat", "stat");
1311	fossil_version_blob(&versionInfo, verboseFlag);
1312	@ <pre>
1313	@ %h(blob_str(&versionInfo))
1314	@ </pre>
1315	style_finish_page();
1316	}
1317
1318
1319	/*
1320	** Set the g.zBaseURL value to the full URL for the toplevel of
	@@ -3098,7 +3098,7 @@
3098	cgi_reset_content();
3099	webpage_error("Case 7 from /test-warning");
3100	}
3101	@ </ol>
3102	@ <p>End of test</p>
3103	style_finish_page();
3104	}
3105

M src/moderate.c

+1 -1

		--- src/moderate.c
		+++ src/moderate.c
		@@ -189,11 +189,11 @@
189	189	);
190	190	db_prepare(&q, "%s", blob_sql_text(&sql));
191	191	www_print_timeline(&q, 0, 0, 0, 0, 0, 0, 0);
192	192	db_finalize(&q);
193	193	}
194		- style_finish_page("modreq");
	194	+ style_finish_page();
195	195	}
196	196
197	197	/*
198	198	** Disapproves any entries in the modreq table which belong to any
199	199	** user whose name is no longer found in the user table. This is only
200	200

	--- src/moderate.c
	+++ src/moderate.c
	@@ -189,11 +189,11 @@
189	);
190	db_prepare(&q, "%s", blob_sql_text(&sql));
191	www_print_timeline(&q, 0, 0, 0, 0, 0, 0, 0);
192	db_finalize(&q);
193	}
194	style_finish_page("modreq");
195	}
196
197	/*
198	** Disapproves any entries in the modreq table which belong to any
199	** user whose name is no longer found in the user table. This is only
200

	--- src/moderate.c
	+++ src/moderate.c
	@@ -189,11 +189,11 @@
189	);
190	db_prepare(&q, "%s", blob_sql_text(&sql));
191	www_print_timeline(&q, 0, 0, 0, 0, 0, 0, 0);
192	db_finalize(&q);
193	}
194	style_finish_page();
195	}
196
197	/*
198	** Disapproves any entries in the modreq table which belong to any
199	** user whose name is no longer found in the user table. This is only
200

M src/name.c

+6 -6

		--- src/name.c
		+++ src/name.c
		@@ -668,11 +668,11 @@
668	668	@ </li></ul>
669	669	@ </p></li>
670	670	}
671	671	@ </ol>
672	672	db_finalize(&q);
673		- style_finish_page("ambiguous");
	673	+ style_finish_page();
674	674	}
675	675
676	676	/*
677	677	** Convert the name in CGI parameter zParamName into a rid and return that
678	678	** rid. If the CGI parameter is missing or is not a valid artifact tag,
		@@ -1328,11 +1328,11 @@
1328	1328	for(i=1; i<=mx; i+=n){
1329	1329	@ <li> %z(href("%R/bloblist?s=%d&n=%d",i,n))
1330	1330	@ %d(i)..%d(i+n-1<mx?i+n-1:mx)</a>
1331	1331	}
1332	1332	@ </ul>
1333		- style_finish_page("bloblist");
	1333	+ style_finish_page();
1334	1334	return;
1335	1335	}
1336	1336	if( phantomOnly \|\| privOnly \|\| mx>n ){
1337	1337	style_submenu_element("Index", "bloblist");
1338	1338	}
		@@ -1407,11 +1407,11 @@
1407	1407	}
1408	1408	@ </tr>
1409	1409	}
1410	1410	@ </table>
1411	1411	db_finalize(&q);
1412		- style_finish_page("bloblist");
	1412	+ style_finish_page();
1413	1413	}
1414	1414
1415	1415	/*
1416	1416	** Output HTML that shows a table of all public phantoms.
1417	1417	*/
		@@ -1489,11 +1489,11 @@
1489	1489	}
1490	1490	if( g.perm.Write ){
1491	1491	style_submenu_element("Artifact Stats", "artifact_stats");
1492	1492	}
1493	1493	table_of_public_phantoms();
1494		- style_finish_page("phantoms");
	1494	+ style_finish_page();
1495	1495	}
1496	1496
1497	1497	/*
1498	1498	** WEBPAGE: bigbloblist
1499	1499	**
		@@ -1553,11 +1553,11 @@
1553	1553	@ </tr>
1554	1554	}
1555	1555	@ </tbody></table>
1556	1556	db_finalize(&q);
1557	1557	style_table_sorter();
1558		- style_finish_page("bigbloblist");
	1558	+ style_finish_page();
1559	1559	}
1560	1560
1561	1561	/*
1562	1562	** COMMAND: test-unsent
1563	1563	**
		@@ -1677,7 +1677,7 @@
1677	1677	collision_report("SELECT (SELECT uuid FROM blob WHERE rid=objid)"
1678	1678	" FROM event WHERE event.type='ci'"
1679	1679	" ORDER BY 1");
1680	1680	@ <h1>Hash Prefix Collisions on All Artifacts</h1>
1681	1681	collision_report("SELECT uuid FROM blob ORDER BY 1");
1682		- style_finish_page("hash-collisions");
	1682	+ style_finish_page();
1683	1683	}
1684	1684

	--- src/name.c
	+++ src/name.c
	@@ -668,11 +668,11 @@
668	@ </li></ul>
669	@ </p></li>
670	}
671	@ </ol>
672	db_finalize(&q);
673	style_finish_page("ambiguous");
674	}
675
676	/*
677	** Convert the name in CGI parameter zParamName into a rid and return that
678	** rid. If the CGI parameter is missing or is not a valid artifact tag,
	@@ -1328,11 +1328,11 @@
1328	for(i=1; i<=mx; i+=n){
1329	@ <li> %z(href("%R/bloblist?s=%d&n=%d",i,n))
1330	@ %d(i)..%d(i+n-1<mx?i+n-1:mx)</a>
1331	}
1332	@ </ul>
1333	style_finish_page("bloblist");
1334	return;
1335	}
1336	if( phantomOnly \|\| privOnly \|\| mx>n ){
1337	style_submenu_element("Index", "bloblist");
1338	}
	@@ -1407,11 +1407,11 @@
1407	}
1408	@ </tr>
1409	}
1410	@ </table>
1411	db_finalize(&q);
1412	style_finish_page("bloblist");
1413	}
1414
1415	/*
1416	** Output HTML that shows a table of all public phantoms.
1417	*/
	@@ -1489,11 +1489,11 @@
1489	}
1490	if( g.perm.Write ){
1491	style_submenu_element("Artifact Stats", "artifact_stats");
1492	}
1493	table_of_public_phantoms();
1494	style_finish_page("phantoms");
1495	}
1496
1497	/*
1498	** WEBPAGE: bigbloblist
1499	**
	@@ -1553,11 +1553,11 @@
1553	@ </tr>
1554	}
1555	@ </tbody></table>
1556	db_finalize(&q);
1557	style_table_sorter();
1558	style_finish_page("bigbloblist");
1559	}
1560
1561	/*
1562	** COMMAND: test-unsent
1563	**
	@@ -1677,7 +1677,7 @@
1677	collision_report("SELECT (SELECT uuid FROM blob WHERE rid=objid)"
1678	" FROM event WHERE event.type='ci'"
1679	" ORDER BY 1");
1680	@ <h1>Hash Prefix Collisions on All Artifacts</h1>
1681	collision_report("SELECT uuid FROM blob ORDER BY 1");
1682	style_finish_page("hash-collisions");
1683	}
1684

	--- src/name.c
	+++ src/name.c
	@@ -668,11 +668,11 @@
668	@ </li></ul>
669	@ </p></li>
670	}
671	@ </ol>
672	db_finalize(&q);
673	style_finish_page();
674	}
675
676	/*
677	** Convert the name in CGI parameter zParamName into a rid and return that
678	** rid. If the CGI parameter is missing or is not a valid artifact tag,
	@@ -1328,11 +1328,11 @@
1328	for(i=1; i<=mx; i+=n){
1329	@ <li> %z(href("%R/bloblist?s=%d&n=%d",i,n))
1330	@ %d(i)..%d(i+n-1<mx?i+n-1:mx)</a>
1331	}
1332	@ </ul>
1333	style_finish_page();
1334	return;
1335	}
1336	if( phantomOnly \|\| privOnly \|\| mx>n ){
1337	style_submenu_element("Index", "bloblist");
1338	}
	@@ -1407,11 +1407,11 @@
1407	}
1408	@ </tr>
1409	}
1410	@ </table>
1411	db_finalize(&q);
1412	style_finish_page();
1413	}
1414
1415	/*
1416	** Output HTML that shows a table of all public phantoms.
1417	*/
	@@ -1489,11 +1489,11 @@
1489	}
1490	if( g.perm.Write ){
1491	style_submenu_element("Artifact Stats", "artifact_stats");
1492	}
1493	table_of_public_phantoms();
1494	style_finish_page();
1495	}
1496
1497	/*
1498	** WEBPAGE: bigbloblist
1499	**
	@@ -1553,11 +1553,11 @@
1553	@ </tr>
1554	}
1555	@ </tbody></table>
1556	db_finalize(&q);
1557	style_table_sorter();
1558	style_finish_page();
1559	}
1560
1561	/*
1562	** COMMAND: test-unsent
1563	**
	@@ -1677,7 +1677,7 @@
1677	collision_report("SELECT (SELECT uuid FROM blob WHERE rid=objid)"
1678	" FROM event WHERE event.type='ci'"
1679	" ORDER BY 1");
1680	@ <h1>Hash Prefix Collisions on All Artifacts</h1>
1681	collision_report("SELECT uuid FROM blob ORDER BY 1");
1682	style_finish_page();
1683	}
1684

M src/path.c

+1 -1

		--- src/path.c
		+++ src/path.c
		@@ -652,7 +652,7 @@
652	652	@ <td>%z(href("%R/info/%!S",zUuid))%S(zUuid)</a></td></tr>
653	653	}
654	654	@ </tbody></table>
655	655	db_finalize(&q);
656	656	style_table_sorter();
657		- style_finish_page("test");
	657	+ style_finish_page();
658	658	}
659	659

	--- src/path.c
	+++ src/path.c
	@@ -652,7 +652,7 @@
652	@ <td>%z(href("%R/info/%!S",zUuid))%S(zUuid)</a></td></tr>
653	}
654	@ </tbody></table>
655	db_finalize(&q);
656	style_table_sorter();
657	style_finish_page("test");
658	}
659

	--- src/path.c
	+++ src/path.c
	@@ -652,7 +652,7 @@
652	@ <td>%z(href("%R/info/%!S",zUuid))%S(zUuid)</a></td></tr>
653	}
654	@ </tbody></table>
655	db_finalize(&q);
656	style_table_sorter();
657	style_finish_page();
658	}
659

M src/piechart.c

+1 -1

		--- src/piechart.c
		+++ src/piechart.c
		@@ -329,7 +329,7 @@
329	329	@ <li> <a href='test-piechart?data=2,2,2,2,2,44,44,2,2,2,2,2'>Case 2</a>
330	330	@ <li> <a href='test-piechart?data=20,2,2,2,2,2,2,2,2,2,2,80'>Case 3</a>
331	331	@ <li> <a href='test-piechart?data=80,2,2,2,2,2,2,2,2,2,2,20'>Case 4</a>
332	332	@ <li> <a href='test-piechart?data=2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2'>Case 5</a>
333	333	@ </ul>
334		- style_finish_page("test");
	334	+ style_finish_page();
335	335	}
336	336

	--- src/piechart.c
	+++ src/piechart.c
	@@ -329,7 +329,7 @@
329	@ <li> <a href='test-piechart?data=2,2,2,2,2,44,44,2,2,2,2,2'>Case 2</a>
330	@ <li> <a href='test-piechart?data=20,2,2,2,2,2,2,2,2,2,2,80'>Case 3</a>
331	@ <li> <a href='test-piechart?data=80,2,2,2,2,2,2,2,2,2,2,20'>Case 4</a>
332	@ <li> <a href='test-piechart?data=2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2'>Case 5</a>
333	@ </ul>
334	style_finish_page("test");
335	}
336

	--- src/piechart.c
	+++ src/piechart.c
	@@ -329,7 +329,7 @@
329	@ <li> <a href='test-piechart?data=2,2,2,2,2,44,44,2,2,2,2,2'>Case 2</a>
330	@ <li> <a href='test-piechart?data=20,2,2,2,2,2,2,2,2,2,2,80'>Case 3</a>
331	@ <li> <a href='test-piechart?data=80,2,2,2,2,2,2,2,2,2,2,20'>Case 4</a>
332	@ <li> <a href='test-piechart?data=2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2'>Case 5</a>
333	@ </ul>
334	style_finish_page();
335	}
336

M src/pikchrshow.c

+1 -1

		--- src/pikchrshow.c
		+++ src/pikchrshow.c
		@@ -374,11 +374,11 @@
374	374	} CX("</div>"/sbs-wrapper/);
375	375	builtin_fossil_js_bundle_or("fetch", "copybutton", "popupwidget",
376	376	"storage", "pikchr", NULL);
377	377	builtin_request_js("fossil.page.pikchrshow.js");
378	378	builtin_fulfill_js_requests();
379		- style_finish_page("pikchrshow");
	379	+ style_finish_page();
380	380	}
381	381
382	382	/*
383	383	** COMMAND: pikchr*
384	384	**
385	385

	--- src/pikchrshow.c
	+++ src/pikchrshow.c
	@@ -374,11 +374,11 @@
374	} CX("</div>"/sbs-wrapper/);
375	builtin_fossil_js_bundle_or("fetch", "copybutton", "popupwidget",
376	"storage", "pikchr", NULL);
377	builtin_request_js("fossil.page.pikchrshow.js");
378	builtin_fulfill_js_requests();
379	style_finish_page("pikchrshow");
380	}
381
382	/*
383	** COMMAND: pikchr*
384	**
385

	--- src/pikchrshow.c
	+++ src/pikchrshow.c
	@@ -374,11 +374,11 @@
374	} CX("</div>"/sbs-wrapper/);
375	builtin_fossil_js_bundle_or("fetch", "copybutton", "popupwidget",
376	"storage", "pikchr", NULL);
377	builtin_request_js("fossil.page.pikchrshow.js");
378	builtin_fulfill_js_requests();
379	style_finish_page();
380	}
381
382	/*
383	** COMMAND: pikchr*
384	**
385

M src/printf.c

+1 -1

		--- src/printf.c
		+++ src/printf.c
		@@ -1121,11 +1121,11 @@
1121	1121	style_set_current_feature("error");
1122	1122	style_header("Bad Request");
1123	1123	etag_cancel();
1124	1124	@ <p class="generalError">%h(z)</p>
1125	1125	cgi_set_status(400, "Bad Request");
1126		- style_finish_page("error");
	1126	+ style_finish_page();
1127	1127	cgi_reply();
1128	1128	}else if( !g.fQuiet ){
1129	1129	fossil_force_newline();
1130	1130	fossil_trace("%s\n", z);
1131	1131	}
1132	1132

	--- src/printf.c
	+++ src/printf.c
	@@ -1121,11 +1121,11 @@
1121	style_set_current_feature("error");
1122	style_header("Bad Request");
1123	etag_cancel();
1124	@ <p class="generalError">%h(z)</p>
1125	cgi_set_status(400, "Bad Request");
1126	style_finish_page("error");
1127	cgi_reply();
1128	}else if( !g.fQuiet ){
1129	fossil_force_newline();
1130	fossil_trace("%s\n", z);
1131	}
1132

	--- src/printf.c
	+++ src/printf.c
	@@ -1121,11 +1121,11 @@
1121	style_set_current_feature("error");
1122	style_header("Bad Request");
1123	etag_cancel();
1124	@ <p class="generalError">%h(z)</p>
1125	cgi_set_status(400, "Bad Request");
1126	style_finish_page();
1127	cgi_reply();
1128	}else if( !g.fQuiet ){
1129	fossil_force_newline();
1130	fossil_trace("%s\n", z);
1131	}
1132

M src/repolist.c

+1 -1

		--- src/repolist.c
		+++ src/repolist.c
		@@ -249,11 +249,11 @@
249	249	login_check_credentials();
250	250	style_set_current_feature("repolist");
251	251	style_header("Repository List");
252	252	@ %s(blob_str(&html))
253	253	style_table_sorter();
254		- style_finish_page("repolist");
	254	+ style_finish_page();
255	255	}else{
256	256	/* If no repositories were found that had the "repolist_skin"
257	257	** property set, then use a default skin */
258	258	@ <html>
259	259	@ <head>
260	260

	--- src/repolist.c
	+++ src/repolist.c
	@@ -249,11 +249,11 @@
249	login_check_credentials();
250	style_set_current_feature("repolist");
251	style_header("Repository List");
252	@ %s(blob_str(&html))
253	style_table_sorter();
254	style_finish_page("repolist");
255	}else{
256	/* If no repositories were found that had the "repolist_skin"
257	** property set, then use a default skin */
258	@ <html>
259	@ <head>
260

	--- src/repolist.c
	+++ src/repolist.c
	@@ -249,11 +249,11 @@
249	login_check_credentials();
250	style_set_current_feature("repolist");
251	style_header("Repository List");
252	@ %s(blob_str(&html))
253	style_table_sorter();
254	style_finish_page();
255	}else{
256	/* If no repositories were found that had the "repolist_skin"
257	** property set, then use a default skin */
258	@ <html>
259	@ <head>
260

M src/report.c

+7 -7

		--- src/report.c
		+++ src/report.c
		@@ -97,11 +97,11 @@
97	97	Th_Render(zScript);
98	98
99	99	blob_reset(&ril);
100	100	if( g.thTrace ) Th_Trace("END_REPORTLIST<br />\n", -1);
101	101
102		- style_finish_page("reportlist");
	102	+ style_finish_page();
103	103	}
104	104
105	105	/*
106	106	** Remove whitespace from both ends of a string.
107	107	*/
		@@ -329,11 +329,11 @@
329	329	"FROM reportfmt WHERE rn=%d",rn);
330	330	style_set_current_feature("report");
331	331	style_header("SQL For Report Format Number %d", rn);
332	332	if( db_step(&q)!=SQLITE_ROW ){
333	333	@ <p>Unknown report number: %d(rn)</p>
334		- style_finish_page("report");
	334	+ style_finish_page();
335	335	db_finalize(&q);
336	336	return;
337	337	}
338	338	zTitle = db_column_text(&q, 0);
339	339	zSQL = db_column_text(&q, 1);
		@@ -351,11 +351,11 @@
351	351	@ <td width=15></td><td valign="top">
352	352	output_color_key(zClrKey, 0, "border=0 cellspacing=0 cellpadding=3");
353	353	@ </td>
354	354	@ </tr></table>
355	355	report_format_hints();
356		- style_finish_page("report");
	356	+ style_finish_page();
357	357	db_finalize(&q);
358	358	}
359	359
360	360	/*
361	361	** WEBPAGE: rptnew
		@@ -412,11 +412,11 @@
412	412	@ <input type="hidden" name="rn" value="%d(rn)">
413	413	login_insert_csrf_secret();
414	414	@ <input type="submit" name="del2" value="Delete The Report">
415	415	@ <input type="submit" name="can" value="Cancel">
416	416	@ </form>
417		- style_finish_page("report");
	417	+ style_finish_page();
418	418	return;
419	419	}else if( P("can") ){
420	420	/* user cancelled */
421	421	cgi_redirect("reportlist");
422	422	return;
		@@ -504,20 +504,20 @@
504	504	if( !g.perm.Admin && fossil_strcmp(zOwner,g.zLogin)!=0 ){
505	505	@ <p>This report format is owned by %h(zOwner). You are not allowed
506	506	@ to change it.</p>
507	507	@ </form>
508	508	report_format_hints();
509		- style_finish_page("report");
	509	+ style_finish_page();
510	510	return;
511	511	}
512	512	@ <input type="submit" value="Apply Changes" />
513	513	if( rn>0 ){
514	514	@ <input type="submit" value="Delete This Report" name="del1" />
515	515	}
516	516	@ </div></form>
517	517	report_format_hints();
518		- style_finish_page("report");
	518	+ style_finish_page();
519	519	}
520	520
521	521	/*
522	522	** Output a bunch of text that provides information about report
523	523	** formats
		@@ -1060,11 +1060,11 @@
1060	1060	@ <p class="reportError">Error: %h(zErr1)</p>
1061	1061	}else if( zErr2 ){
1062	1062	@ <p class="reportError">Error: %h(zErr2)</p>
1063	1063	}
1064	1064	style_table_sorter();
1065		- style_finish_page("report");
	1065	+ style_finish_page();
1066	1066	}else{
1067	1067	report_restrict_sql(&zErr1);
1068	1068	db_exec_readonly(g.db, zSql, output_tab_separated, &count, &zErr2);
1069	1069	report_unrestrict_sql();
1070	1070	cgi_set_content_type("text/plain");
1071	1071

	--- src/report.c
	+++ src/report.c
	@@ -97,11 +97,11 @@
97	Th_Render(zScript);
98
99	blob_reset(&ril);
100	if( g.thTrace ) Th_Trace("END_REPORTLIST<br />\n", -1);
101
102	style_finish_page("reportlist");
103	}
104
105	/*
106	** Remove whitespace from both ends of a string.
107	*/
	@@ -329,11 +329,11 @@
329	"FROM reportfmt WHERE rn=%d",rn);
330	style_set_current_feature("report");
331	style_header("SQL For Report Format Number %d", rn);
332	if( db_step(&q)!=SQLITE_ROW ){
333	@ <p>Unknown report number: %d(rn)</p>
334	style_finish_page("report");
335	db_finalize(&q);
336	return;
337	}
338	zTitle = db_column_text(&q, 0);
339	zSQL = db_column_text(&q, 1);
	@@ -351,11 +351,11 @@
351	@ <td width=15></td><td valign="top">
352	output_color_key(zClrKey, 0, "border=0 cellspacing=0 cellpadding=3");
353	@ </td>
354	@ </tr></table>
355	report_format_hints();
356	style_finish_page("report");
357	db_finalize(&q);
358	}
359
360	/*
361	** WEBPAGE: rptnew
	@@ -412,11 +412,11 @@
412	@ <input type="hidden" name="rn" value="%d(rn)">
413	login_insert_csrf_secret();
414	@ <input type="submit" name="del2" value="Delete The Report">
415	@ <input type="submit" name="can" value="Cancel">
416	@ </form>
417	style_finish_page("report");
418	return;
419	}else if( P("can") ){
420	/* user cancelled */
421	cgi_redirect("reportlist");
422	return;
	@@ -504,20 +504,20 @@
504	if( !g.perm.Admin && fossil_strcmp(zOwner,g.zLogin)!=0 ){
505	@ <p>This report format is owned by %h(zOwner). You are not allowed
506	@ to change it.</p>
507	@ </form>
508	report_format_hints();
509	style_finish_page("report");
510	return;
511	}
512	@ <input type="submit" value="Apply Changes" />
513	if( rn>0 ){
514	@ <input type="submit" value="Delete This Report" name="del1" />
515	}
516	@ </div></form>
517	report_format_hints();
518	style_finish_page("report");
519	}
520
521	/*
522	** Output a bunch of text that provides information about report
523	** formats
	@@ -1060,11 +1060,11 @@
1060	@ <p class="reportError">Error: %h(zErr1)</p>
1061	}else if( zErr2 ){
1062	@ <p class="reportError">Error: %h(zErr2)</p>
1063	}
1064	style_table_sorter();
1065	style_finish_page("report");
1066	}else{
1067	report_restrict_sql(&zErr1);
1068	db_exec_readonly(g.db, zSql, output_tab_separated, &count, &zErr2);
1069	report_unrestrict_sql();
1070	cgi_set_content_type("text/plain");
1071

	--- src/report.c
	+++ src/report.c
	@@ -97,11 +97,11 @@
97	Th_Render(zScript);
98
99	blob_reset(&ril);
100	if( g.thTrace ) Th_Trace("END_REPORTLIST<br />\n", -1);
101
102	style_finish_page();
103	}
104
105	/*
106	** Remove whitespace from both ends of a string.
107	*/
	@@ -329,11 +329,11 @@
329	"FROM reportfmt WHERE rn=%d",rn);
330	style_set_current_feature("report");
331	style_header("SQL For Report Format Number %d", rn);
332	if( db_step(&q)!=SQLITE_ROW ){
333	@ <p>Unknown report number: %d(rn)</p>
334	style_finish_page();
335	db_finalize(&q);
336	return;
337	}
338	zTitle = db_column_text(&q, 0);
339	zSQL = db_column_text(&q, 1);
	@@ -351,11 +351,11 @@
351	@ <td width=15></td><td valign="top">
352	output_color_key(zClrKey, 0, "border=0 cellspacing=0 cellpadding=3");
353	@ </td>
354	@ </tr></table>
355	report_format_hints();
356	style_finish_page();
357	db_finalize(&q);
358	}
359
360	/*
361	** WEBPAGE: rptnew
	@@ -412,11 +412,11 @@
412	@ <input type="hidden" name="rn" value="%d(rn)">
413	login_insert_csrf_secret();
414	@ <input type="submit" name="del2" value="Delete The Report">
415	@ <input type="submit" name="can" value="Cancel">
416	@ </form>
417	style_finish_page();
418	return;
419	}else if( P("can") ){
420	/* user cancelled */
421	cgi_redirect("reportlist");
422	return;
	@@ -504,20 +504,20 @@
504	if( !g.perm.Admin && fossil_strcmp(zOwner,g.zLogin)!=0 ){
505	@ <p>This report format is owned by %h(zOwner). You are not allowed
506	@ to change it.</p>
507	@ </form>
508	report_format_hints();
509	style_finish_page();
510	return;
511	}
512	@ <input type="submit" value="Apply Changes" />
513	if( rn>0 ){
514	@ <input type="submit" value="Delete This Report" name="del1" />
515	}
516	@ </div></form>
517	report_format_hints();
518	style_finish_page();
519	}
520
521	/*
522	** Output a bunch of text that provides information about report
523	** formats
	@@ -1060,11 +1060,11 @@
1060	@ <p class="reportError">Error: %h(zErr1)</p>
1061	}else if( zErr2 ){
1062	@ <p class="reportError">Error: %h(zErr2)</p>
1063	}
1064	style_table_sorter();
1065	style_finish_page();
1066	}else{
1067	report_restrict_sql(&zErr1);
1068	db_exec_readonly(g.db, zSql, output_tab_separated, &count, &zErr2);
1069	report_unrestrict_sql();
1070	cgi_set_content_type("text/plain");
1071

M src/search.c

+5 -5

		--- src/search.c
		+++ src/search.c
		@@ -1212,11 +1212,11 @@
1212	1212	*/
1213	1213	void search_page(void){
1214	1214	login_check_credentials();
1215	1215	style_header("Search");
1216	1216	search_screen(SRCH_ALL, 1);
1217		- style_finish_page("search");
	1217	+ style_finish_page();
1218	1218	}
1219	1219
1220	1220
1221	1221	/*
1222	1222	** This is a helper function for search_stext(). Writing into pOut
		@@ -1982,11 +1982,11 @@
1982	1982	login_check_credentials();
1983	1983	if( !g.perm.Admin ){ login_needed(0); return; }
1984	1984	style_set_current_feature("test");
1985	1985	if( !search_index_exists() ){
1986	1986	@ <p>Indexed search is disabled
1987		- style_finish_page("report");
	1987	+ style_finish_page();
1988	1988	return;
1989	1989	}
1990	1990	search_sql_setup(g.db);
1991	1991	style_submenu_element("Setup","%R/srchsetup");
1992	1992	if( zId!=0 && (id = atoi(zId))>0 ){
		@@ -2026,11 +2026,11 @@
2026	2026	style_submenu_element(zName,"%R/test-ftsdocs?y=%c&ixed=1",zDocId[0]);
2027	2027	zName = mprintf("Unindexed '%c' docs",zDocId[0]);
2028	2028	style_submenu_element(zName,"%R/test-ftsdocs?y=%c&ixed=0",zDocId[0]);
2029	2029	}
2030	2030	db_finalize(&q);
2031		- style_finish_page("test");
	2031	+ style_finish_page();
2032	2032	return;
2033	2033	}
2034	2034	if( zType!=0 && zType[0]!=0 && zType[1]==0 &&
2035	2035	zIdxed!=0 && (zIdxed[0]=='1' \|\| zIdxed[0]=='0') && zIdxed[1]==0
2036	2036	){
		@@ -2056,11 +2056,11 @@
2056	2056	@ <li> <a href='test-ftsdocs?id=%d(db_column_int(&q,0))'>
2057	2057	@ %h(db_column_text(&q,1))</a>
2058	2058	}
2059	2059	@ </ul>
2060	2060	db_finalize(&q);
2061		- style_finish_page("test");
	2061	+ style_finish_page();
2062	2062	return;
2063	2063	}
2064	2064	style_header("Summary of ftsdocs");
2065	2065	db_prepare(&q,
2066	2066	"SELECT type, sum(idxed IS TRUE), sum(idxed IS FALSE), count(*)"
		@@ -2100,7 +2100,7 @@
2100	2100	@ </tbody><tfooter>
2101	2101	@ <tr><th>Total<th align="right">%d(cnt1)<th align="right">%d(cnt2)
2102	2102	@ <th align="right">%d(cnt3)
2103	2103	@ </tfooter>
2104	2104	@ </table>
2105		- style_finish_page("test");
	2105	+ style_finish_page();
2106	2106	}
2107	2107

	--- src/search.c
	+++ src/search.c
	@@ -1212,11 +1212,11 @@
1212	*/
1213	void search_page(void){
1214	login_check_credentials();
1215	style_header("Search");
1216	search_screen(SRCH_ALL, 1);
1217	style_finish_page("search");
1218	}
1219
1220
1221	/*
1222	** This is a helper function for search_stext(). Writing into pOut
	@@ -1982,11 +1982,11 @@
1982	login_check_credentials();
1983	if( !g.perm.Admin ){ login_needed(0); return; }
1984	style_set_current_feature("test");
1985	if( !search_index_exists() ){
1986	@ <p>Indexed search is disabled
1987	style_finish_page("report");
1988	return;
1989	}
1990	search_sql_setup(g.db);
1991	style_submenu_element("Setup","%R/srchsetup");
1992	if( zId!=0 && (id = atoi(zId))>0 ){
	@@ -2026,11 +2026,11 @@
2026	style_submenu_element(zName,"%R/test-ftsdocs?y=%c&ixed=1",zDocId[0]);
2027	zName = mprintf("Unindexed '%c' docs",zDocId[0]);
2028	style_submenu_element(zName,"%R/test-ftsdocs?y=%c&ixed=0",zDocId[0]);
2029	}
2030	db_finalize(&q);
2031	style_finish_page("test");
2032	return;
2033	}
2034	if( zType!=0 && zType[0]!=0 && zType[1]==0 &&
2035	zIdxed!=0 && (zIdxed[0]=='1' \|\| zIdxed[0]=='0') && zIdxed[1]==0
2036	){
	@@ -2056,11 +2056,11 @@
2056	@ <li> <a href='test-ftsdocs?id=%d(db_column_int(&q,0))'>
2057	@ %h(db_column_text(&q,1))</a>
2058	}
2059	@ </ul>
2060	db_finalize(&q);
2061	style_finish_page("test");
2062	return;
2063	}
2064	style_header("Summary of ftsdocs");
2065	db_prepare(&q,
2066	"SELECT type, sum(idxed IS TRUE), sum(idxed IS FALSE), count(*)"
	@@ -2100,7 +2100,7 @@
2100	@ </tbody><tfooter>
2101	@ <tr><th>Total<th align="right">%d(cnt1)<th align="right">%d(cnt2)
2102	@ <th align="right">%d(cnt3)
2103	@ </tfooter>
2104	@ </table>
2105	style_finish_page("test");
2106	}
2107

	--- src/search.c
	+++ src/search.c
	@@ -1212,11 +1212,11 @@
1212	*/
1213	void search_page(void){
1214	login_check_credentials();
1215	style_header("Search");
1216	search_screen(SRCH_ALL, 1);
1217	style_finish_page();
1218	}
1219
1220
1221	/*
1222	** This is a helper function for search_stext(). Writing into pOut
	@@ -1982,11 +1982,11 @@
1982	login_check_credentials();
1983	if( !g.perm.Admin ){ login_needed(0); return; }
1984	style_set_current_feature("test");
1985	if( !search_index_exists() ){
1986	@ <p>Indexed search is disabled
1987	style_finish_page();
1988	return;
1989	}
1990	search_sql_setup(g.db);
1991	style_submenu_element("Setup","%R/srchsetup");
1992	if( zId!=0 && (id = atoi(zId))>0 ){
	@@ -2026,11 +2026,11 @@
2026	style_submenu_element(zName,"%R/test-ftsdocs?y=%c&ixed=1",zDocId[0]);
2027	zName = mprintf("Unindexed '%c' docs",zDocId[0]);
2028	style_submenu_element(zName,"%R/test-ftsdocs?y=%c&ixed=0",zDocId[0]);
2029	}
2030	db_finalize(&q);
2031	style_finish_page();
2032	return;
2033	}
2034	if( zType!=0 && zType[0]!=0 && zType[1]==0 &&
2035	zIdxed!=0 && (zIdxed[0]=='1' \|\| zIdxed[0]=='0') && zIdxed[1]==0
2036	){
	@@ -2056,11 +2056,11 @@
2056	@ <li> <a href='test-ftsdocs?id=%d(db_column_int(&q,0))'>
2057	@ %h(db_column_text(&q,1))</a>
2058	}
2059	@ </ul>
2060	db_finalize(&q);
2061	style_finish_page();
2062	return;
2063	}
2064	style_header("Summary of ftsdocs");
2065	db_prepare(&q,
2066	"SELECT type, sum(idxed IS TRUE), sum(idxed IS FALSE), count(*)"
	@@ -2100,7 +2100,7 @@
2100	@ </tbody><tfooter>
2101	@ <tr><th>Total<th align="right">%d(cnt1)<th align="right">%d(cnt2)
2102	@ <th align="right">%d(cnt3)
2103	@ </tfooter>
2104	@ </table>
2105	style_finish_page();
2106	}
2107

M src/security_audit.c

+6 -6

		--- src/security_audit.c
		+++ src/security_audit.c
		@@ -591,11 +591,11 @@
591	591	table_of_public_phantoms();
592	592	@ </li>
593	593	}
594	594
595	595	@ </ol>
596		- style_finish_page("secaudit");
	596	+ style_finish_page();
597	597	}
598	598
599	599	/*
600	600	** WEBPAGE: takeitprivate
601	601	**
		@@ -633,11 +633,11 @@
633	633	@ <form action="%s(g.zPath)" method="post">
634	634	@ <input type="submit" name="apply" value="Make It Private">
635	635	@ <input type="submit" name="cancel" value="Cancel">
636	636	@ </form>
637	637
638		- style_finish_page("takeitprivate");
	638	+ style_finish_page();
639	639	}
640	640
641	641	/*
642	642	** The maximum number of bytes of log to show
643	643	*/
		@@ -674,11 +674,11 @@
674	674	@ If the server is running using one of
675	675	@ the "fossil http" or "fossil server" commands then add
676	676	@ a command-line option "--errorlog <i>FILENAME</i>" to that
677	677	@ command.
678	678	@ </ol>
679		- style_finish_page("errorlog");
	679	+ style_finish_page();
680	680	return;
681	681	}
682	682	if( P("truncate1") && cgi_csrf_safe(1) ){
683	683	fclose(fopen(g.zErrlog,"w"));
684	684	}
		@@ -694,20 +694,20 @@
694	694	@ <form action="%R/errorlog" method="POST">
695	695	@ <p>Confirm that you want to truncate the %,lld(szFile)-byte error log:
696	696	@ <input type="submit" name="truncate1" value="Confirm">
697	697	@ <input type="submit" name="cancel" value="Cancel">
698	698	@ </form>
699		- style_finish_page("errorlog");
	699	+ style_finish_page();
700	700	return;
701	701	}
702	702	@ <p>The server error log at "%h(g.zErrlog)" is %,lld(szFile) bytes in size.
703	703	style_submenu_element("Download", "%R/errorlog?download");
704	704	style_submenu_element("Truncate", "%R/errorlog?truncate");
705	705	in = fossil_fopen(g.zErrlog, "rb");
706	706	if( in==0 ){
707	707	@ <p class='generalError'>Unable to open that file for reading!</p>
708		- style_finish_page("errorlog");
	708	+ style_finish_page();
709	709	return;
710	710	}
711	711	if( szFile>MXSHOWLOG && P("all")==0 ){
712	712	@ <form action="%R/errorlog" method="POST">
713	713	@ <p>Only the last %,d(MXSHOWLOG) bytes are shown.
		@@ -720,7 +720,7 @@
720	720	while( fgets(z, sizeof(z), in) ){
721	721	@ %h(z)\
722	722	}
723	723	fclose(in);
724	724	@ </pre>
725		- style_finish_page("errorlog");
	725	+ style_finish_page();
726	726	}
727	727

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -591,11 +591,11 @@
591	table_of_public_phantoms();
592	@ </li>
593	}
594
595	@ </ol>
596	style_finish_page("secaudit");
597	}
598
599	/*
600	** WEBPAGE: takeitprivate
601	**
	@@ -633,11 +633,11 @@
633	@ <form action="%s(g.zPath)" method="post">
634	@ <input type="submit" name="apply" value="Make It Private">
635	@ <input type="submit" name="cancel" value="Cancel">
636	@ </form>
637
638	style_finish_page("takeitprivate");
639	}
640
641	/*
642	** The maximum number of bytes of log to show
643	*/
	@@ -674,11 +674,11 @@
674	@ If the server is running using one of
675	@ the "fossil http" or "fossil server" commands then add
676	@ a command-line option "--errorlog <i>FILENAME</i>" to that
677	@ command.
678	@ </ol>
679	style_finish_page("errorlog");
680	return;
681	}
682	if( P("truncate1") && cgi_csrf_safe(1) ){
683	fclose(fopen(g.zErrlog,"w"));
684	}
	@@ -694,20 +694,20 @@
694	@ <form action="%R/errorlog" method="POST">
695	@ <p>Confirm that you want to truncate the %,lld(szFile)-byte error log:
696	@ <input type="submit" name="truncate1" value="Confirm">
697	@ <input type="submit" name="cancel" value="Cancel">
698	@ </form>
699	style_finish_page("errorlog");
700	return;
701	}
702	@ <p>The server error log at "%h(g.zErrlog)" is %,lld(szFile) bytes in size.
703	style_submenu_element("Download", "%R/errorlog?download");
704	style_submenu_element("Truncate", "%R/errorlog?truncate");
705	in = fossil_fopen(g.zErrlog, "rb");
706	if( in==0 ){
707	@ <p class='generalError'>Unable to open that file for reading!</p>
708	style_finish_page("errorlog");
709	return;
710	}
711	if( szFile>MXSHOWLOG && P("all")==0 ){
712	@ <form action="%R/errorlog" method="POST">
713	@ <p>Only the last %,d(MXSHOWLOG) bytes are shown.
	@@ -720,7 +720,7 @@
720	while( fgets(z, sizeof(z), in) ){
721	@ %h(z)\
722	}
723	fclose(in);
724	@ </pre>
725	style_finish_page("errorlog");
726	}
727

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -591,11 +591,11 @@
591	table_of_public_phantoms();
592	@ </li>
593	}
594
595	@ </ol>
596	style_finish_page();
597	}
598
599	/*
600	** WEBPAGE: takeitprivate
601	**
	@@ -633,11 +633,11 @@
633	@ <form action="%s(g.zPath)" method="post">
634	@ <input type="submit" name="apply" value="Make It Private">
635	@ <input type="submit" name="cancel" value="Cancel">
636	@ </form>
637
638	style_finish_page();
639	}
640
641	/*
642	** The maximum number of bytes of log to show
643	*/
	@@ -674,11 +674,11 @@
674	@ If the server is running using one of
675	@ the "fossil http" or "fossil server" commands then add
676	@ a command-line option "--errorlog <i>FILENAME</i>" to that
677	@ command.
678	@ </ol>
679	style_finish_page();
680	return;
681	}
682	if( P("truncate1") && cgi_csrf_safe(1) ){
683	fclose(fopen(g.zErrlog,"w"));
684	}
	@@ -694,20 +694,20 @@
694	@ <form action="%R/errorlog" method="POST">
695	@ <p>Confirm that you want to truncate the %,lld(szFile)-byte error log:
696	@ <input type="submit" name="truncate1" value="Confirm">
697	@ <input type="submit" name="cancel" value="Cancel">
698	@ </form>
699	style_finish_page();
700	return;
701	}
702	@ <p>The server error log at "%h(g.zErrlog)" is %,lld(szFile) bytes in size.
703	style_submenu_element("Download", "%R/errorlog?download");
704	style_submenu_element("Truncate", "%R/errorlog?truncate");
705	in = fossil_fopen(g.zErrlog, "rb");
706	if( in==0 ){
707	@ <p class='generalError'>Unable to open that file for reading!</p>
708	style_finish_page();
709	return;
710	}
711	if( szFile>MXSHOWLOG && P("all")==0 ){
712	@ <form action="%R/errorlog" method="POST">
713	@ <p>Only the last %,d(MXSHOWLOG) bytes are shown.
	@@ -720,7 +720,7 @@
720	while( fgets(z, sizeof(z), in) ){
721	@ %h(z)\
722	}
723	fclose(in);
724	@ </pre>
725	style_finish_page();
726	}
727

M src/setup.c

+15 -15

		--- src/setup.c
		+++ src/setup.c
		@@ -176,11 +176,11 @@
176	176	setup_menu_entry("TH1", "admin_th1",
177	177	"Enter raw TH1 commands");
178	178	}
179	179	@ </table>
180	180
181		- style_finish_page("setup");
	181	+ style_finish_page();
182	182	}
183	183
184	184	/*
185	185	** Generate a checkbox for an attribute.
186	186	*/
		@@ -578,11 +578,11 @@
578	578
579	579	@ <hr />
580	580	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
581	581	@ </div></form>
582	582	db_end_transaction(0);
583		- style_finish_page("setup");
	583	+ style_finish_page();
584	584	}
585	585
586	586	/*
587	587	** WEBPAGE: setup_login_group
588	588	**
		@@ -707,11 +707,11 @@
707	707	}
708	708	db_finalize(&q);
709	709	@ </tbody></table>
710	710	style_table_sorter();
711	711	}
712		- style_finish_page("setup");
	712	+ style_finish_page();
713	713	}
714	714
715	715	/*
716	716	** WEBPAGE: setup_timeline
717	717	**
		@@ -847,11 +847,11 @@
847	847
848	848	@ <hr />
849	849	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
850	850	@ </div></form>
851	851	db_end_transaction(0);
852		- style_finish_page("setup");
	852	+ style_finish_page();
853	853	}
854	854
855	855	/*
856	856	** WEBPAGE: setup_settings
857	857	**
		@@ -941,11 +941,11 @@
941	941	}
942	942	}
943	943	@ </td></tr></table>
944	944	@ </div></form>
945	945	db_end_transaction(0);
946		- style_finish_page("setup");
	946	+ style_finish_page();
947	947	}
948	948
949	949	/*
950	950	** WEBPAGE: setup_config
951	951	**
		@@ -1038,11 +1038,11 @@
1038	1038	@ (Property: sitemap-contact)
1039	1039	@ <hr />
1040	1040	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1041	1041	@ </div></form>
1042	1042	db_end_transaction(0);
1043		- style_finish_page("setup");
	1043	+ style_finish_page();
1044	1044	}
1045	1045
1046	1046	/*
1047	1047	** WEBPAGE: setup_wiki
1048	1048	**
		@@ -1115,11 +1115,11 @@
1115	1115	@ (Property: "wiki-use-html")
1116	1116	@ <hr />
1117	1117	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1118	1118	@ </div></form>
1119	1119	db_end_transaction(0);
1120		- style_finish_page("setup");
	1120	+ style_finish_page();
1121	1121	}
1122	1122
1123	1123	/*
1124	1124	** WEBPAGE: setup_modreq
1125	1125	**
		@@ -1162,11 +1162,11 @@
1162	1162
1163	1163	@ <hr />
1164	1164	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1165	1165	@ </div></form>
1166	1166	db_end_transaction(0);
1167		- style_finish_page("setup");
	1167	+ style_finish_page();
1168	1168
1169	1169	}
1170	1170
1171	1171	/*
1172	1172	** WEBPAGE: setup_adunit
		@@ -1244,11 +1244,11 @@
1244	1244	@ border: 1px solid #f11;
1245	1245	@ background-color: #fcc;
1246	1246	@ '>Demo Ad</div>
1247	1247	@ </pre></blockquote>
1248	1248	@ </li>
1249		- style_finish_page("setup");
	1249	+ style_finish_page();
1250	1250	db_end_transaction(0);
1251	1251	}
1252	1252
1253	1253	/*
1254	1254	** WEBPAGE: setup_logo
		@@ -1447,11 +1447,11 @@
1447	1447	@ <hr />
1448	1448	@
1449	1449	@ <p><span class="note">Note:</span> Your browser has probably cached these
1450	1450	@ images, so you may need to press the Reload button before changes will
1451	1451	@ take effect. </p>
1452		- style_finish_page("setup");
	1452	+ style_finish_page();
1453	1453	db_end_transaction(0);
1454	1454	}
1455	1455
1456	1456	/*
1457	1457	** Prevent the RAW SQL feature from being used to ATTACH a different
		@@ -1610,11 +1610,11 @@
1610	1610	}
1611	1611	sqlite3_finalize(pStmt);
1612	1612	@ </table>
1613	1613	}
1614	1614	}
1615		- style_finish_page("setup");
	1615	+ style_finish_page();
1616	1616	}
1617	1617
1618	1618
1619	1619	/*
1620	1620	** WEBPAGE: admin_th1
		@@ -1655,11 +1655,11 @@
1655	1655	@ <pre class="th1result">%h(zR)</pre>
1656	1656	}else{
1657	1657	@ <pre class="th1error">%h(zR)</pre>
1658	1658	}
1659	1659	}
1660		- style_finish_page("setup");
	1660	+ style_finish_page();
1661	1661	}
1662	1662
1663	1663	/*
1664	1664	** WEBPAGE: admin_log
1665	1665	**
		@@ -1723,11 +1723,11 @@
1723	1723	db_finalize(&stLog);
1724	1724	@ </tbody></table>
1725	1725	if( counter>ofst+limit ){
1726	1726	@ <p><a href="admin_log?n=%d(limit)&x=%d(limit+ofst)">[Older]</a></p>
1727	1727	}
1728		- style_finish_page("setup");
	1728	+ style_finish_page();
1729	1729	}
1730	1730
1731	1731	/*
1732	1732	** WEBPAGE: srchsetup
1733	1733	**
		@@ -1804,11 +1804,11 @@
1804	1804	@ larger repositories.</p>
1805	1805	onoff_attribute("Use Porter Stemmer","search-stemmer","ss",0,0);
1806	1806	@ <p><input type="submit" name="fts1" value="Create A Full-Text Index">
1807	1807	}
1808	1808	@ </div></form>
1809		- style_finish_page("setup");
	1809	+ style_finish_page();
1810	1810	}
1811	1811
1812	1812	/*
1813	1813	** A URL Alias originally called zOldName is now zNewName/zValue.
1814	1814	** Write SQL to make this change into pSql.
		@@ -1963,7 +1963,7 @@
1963	1963	@ <p>To delete an entry from the alias table, change its name or value to an
1964	1964	@ empty string and press "Apply Changes".
1965	1965	@
1966	1966	@ <p>To add a new alias, fill in the name and value in the bottom row
1967	1967	@ of the table above and press "Apply Changes".
1968		- style_finish_page("setup");
	1968	+ style_finish_page();
1969	1969	}
1970	1970

	--- src/setup.c
	+++ src/setup.c
	@@ -176,11 +176,11 @@
176	setup_menu_entry("TH1", "admin_th1",
177	"Enter raw TH1 commands");
178	}
179	@ </table>
180
181	style_finish_page("setup");
182	}
183
184	/*
185	** Generate a checkbox for an attribute.
186	*/
	@@ -578,11 +578,11 @@
578
579	@ <hr />
580	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
581	@ </div></form>
582	db_end_transaction(0);
583	style_finish_page("setup");
584	}
585
586	/*
587	** WEBPAGE: setup_login_group
588	**
	@@ -707,11 +707,11 @@
707	}
708	db_finalize(&q);
709	@ </tbody></table>
710	style_table_sorter();
711	}
712	style_finish_page("setup");
713	}
714
715	/*
716	** WEBPAGE: setup_timeline
717	**
	@@ -847,11 +847,11 @@
847
848	@ <hr />
849	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
850	@ </div></form>
851	db_end_transaction(0);
852	style_finish_page("setup");
853	}
854
855	/*
856	** WEBPAGE: setup_settings
857	**
	@@ -941,11 +941,11 @@
941	}
942	}
943	@ </td></tr></table>
944	@ </div></form>
945	db_end_transaction(0);
946	style_finish_page("setup");
947	}
948
949	/*
950	** WEBPAGE: setup_config
951	**
	@@ -1038,11 +1038,11 @@
1038	@ (Property: sitemap-contact)
1039	@ <hr />
1040	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1041	@ </div></form>
1042	db_end_transaction(0);
1043	style_finish_page("setup");
1044	}
1045
1046	/*
1047	** WEBPAGE: setup_wiki
1048	**
	@@ -1115,11 +1115,11 @@
1115	@ (Property: "wiki-use-html")
1116	@ <hr />
1117	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1118	@ </div></form>
1119	db_end_transaction(0);
1120	style_finish_page("setup");
1121	}
1122
1123	/*
1124	** WEBPAGE: setup_modreq
1125	**
	@@ -1162,11 +1162,11 @@
1162
1163	@ <hr />
1164	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1165	@ </div></form>
1166	db_end_transaction(0);
1167	style_finish_page("setup");
1168
1169	}
1170
1171	/*
1172	** WEBPAGE: setup_adunit
	@@ -1244,11 +1244,11 @@
1244	@ border: 1px solid #f11;
1245	@ background-color: #fcc;
1246	@ '>Demo Ad</div>
1247	@ </pre></blockquote>
1248	@ </li>
1249	style_finish_page("setup");
1250	db_end_transaction(0);
1251	}
1252
1253	/*
1254	** WEBPAGE: setup_logo
	@@ -1447,11 +1447,11 @@
1447	@ <hr />
1448	@
1449	@ <p><span class="note">Note:</span> Your browser has probably cached these
1450	@ images, so you may need to press the Reload button before changes will
1451	@ take effect. </p>
1452	style_finish_page("setup");
1453	db_end_transaction(0);
1454	}
1455
1456	/*
1457	** Prevent the RAW SQL feature from being used to ATTACH a different
	@@ -1610,11 +1610,11 @@
1610	}
1611	sqlite3_finalize(pStmt);
1612	@ </table>
1613	}
1614	}
1615	style_finish_page("setup");
1616	}
1617
1618
1619	/*
1620	** WEBPAGE: admin_th1
	@@ -1655,11 +1655,11 @@
1655	@ <pre class="th1result">%h(zR)</pre>
1656	}else{
1657	@ <pre class="th1error">%h(zR)</pre>
1658	}
1659	}
1660	style_finish_page("setup");
1661	}
1662
1663	/*
1664	** WEBPAGE: admin_log
1665	**
	@@ -1723,11 +1723,11 @@
1723	db_finalize(&stLog);
1724	@ </tbody></table>
1725	if( counter>ofst+limit ){
1726	@ <p><a href="admin_log?n=%d(limit)&x=%d(limit+ofst)">[Older]</a></p>
1727	}
1728	style_finish_page("setup");
1729	}
1730
1731	/*
1732	** WEBPAGE: srchsetup
1733	**
	@@ -1804,11 +1804,11 @@
1804	@ larger repositories.</p>
1805	onoff_attribute("Use Porter Stemmer","search-stemmer","ss",0,0);
1806	@ <p><input type="submit" name="fts1" value="Create A Full-Text Index">
1807	}
1808	@ </div></form>
1809	style_finish_page("setup");
1810	}
1811
1812	/*
1813	** A URL Alias originally called zOldName is now zNewName/zValue.
1814	** Write SQL to make this change into pSql.
	@@ -1963,7 +1963,7 @@
1963	@ <p>To delete an entry from the alias table, change its name or value to an
1964	@ empty string and press "Apply Changes".
1965	@
1966	@ <p>To add a new alias, fill in the name and value in the bottom row
1967	@ of the table above and press "Apply Changes".
1968	style_finish_page("setup");
1969	}
1970

	--- src/setup.c
	+++ src/setup.c
	@@ -176,11 +176,11 @@
176	setup_menu_entry("TH1", "admin_th1",
177	"Enter raw TH1 commands");
178	}
179	@ </table>
180
181	style_finish_page();
182	}
183
184	/*
185	** Generate a checkbox for an attribute.
186	*/
	@@ -578,11 +578,11 @@
578
579	@ <hr />
580	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
581	@ </div></form>
582	db_end_transaction(0);
583	style_finish_page();
584	}
585
586	/*
587	** WEBPAGE: setup_login_group
588	**
	@@ -707,11 +707,11 @@
707	}
708	db_finalize(&q);
709	@ </tbody></table>
710	style_table_sorter();
711	}
712	style_finish_page();
713	}
714
715	/*
716	** WEBPAGE: setup_timeline
717	**
	@@ -847,11 +847,11 @@
847
848	@ <hr />
849	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
850	@ </div></form>
851	db_end_transaction(0);
852	style_finish_page();
853	}
854
855	/*
856	** WEBPAGE: setup_settings
857	**
	@@ -941,11 +941,11 @@
941	}
942	}
943	@ </td></tr></table>
944	@ </div></form>
945	db_end_transaction(0);
946	style_finish_page();
947	}
948
949	/*
950	** WEBPAGE: setup_config
951	**
	@@ -1038,11 +1038,11 @@
1038	@ (Property: sitemap-contact)
1039	@ <hr />
1040	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1041	@ </div></form>
1042	db_end_transaction(0);
1043	style_finish_page();
1044	}
1045
1046	/*
1047	** WEBPAGE: setup_wiki
1048	**
	@@ -1115,11 +1115,11 @@
1115	@ (Property: "wiki-use-html")
1116	@ <hr />
1117	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1118	@ </div></form>
1119	db_end_transaction(0);
1120	style_finish_page();
1121	}
1122
1123	/*
1124	** WEBPAGE: setup_modreq
1125	**
	@@ -1162,11 +1162,11 @@
1162
1163	@ <hr />
1164	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1165	@ </div></form>
1166	db_end_transaction(0);
1167	style_finish_page();
1168
1169	}
1170
1171	/*
1172	** WEBPAGE: setup_adunit
	@@ -1244,11 +1244,11 @@
1244	@ border: 1px solid #f11;
1245	@ background-color: #fcc;
1246	@ '>Demo Ad</div>
1247	@ </pre></blockquote>
1248	@ </li>
1249	style_finish_page();
1250	db_end_transaction(0);
1251	}
1252
1253	/*
1254	** WEBPAGE: setup_logo
	@@ -1447,11 +1447,11 @@
1447	@ <hr />
1448	@
1449	@ <p><span class="note">Note:</span> Your browser has probably cached these
1450	@ images, so you may need to press the Reload button before changes will
1451	@ take effect. </p>
1452	style_finish_page();
1453	db_end_transaction(0);
1454	}
1455
1456	/*
1457	** Prevent the RAW SQL feature from being used to ATTACH a different
	@@ -1610,11 +1610,11 @@
1610	}
1611	sqlite3_finalize(pStmt);
1612	@ </table>
1613	}
1614	}
1615	style_finish_page();
1616	}
1617
1618
1619	/*
1620	** WEBPAGE: admin_th1
	@@ -1655,11 +1655,11 @@
1655	@ <pre class="th1result">%h(zR)</pre>
1656	}else{
1657	@ <pre class="th1error">%h(zR)</pre>
1658	}
1659	}
1660	style_finish_page();
1661	}
1662
1663	/*
1664	** WEBPAGE: admin_log
1665	**
	@@ -1723,11 +1723,11 @@
1723	db_finalize(&stLog);
1724	@ </tbody></table>
1725	if( counter>ofst+limit ){
1726	@ <p><a href="admin_log?n=%d(limit)&x=%d(limit+ofst)">[Older]</a></p>
1727	}
1728	style_finish_page();
1729	}
1730
1731	/*
1732	** WEBPAGE: srchsetup
1733	**
	@@ -1804,11 +1804,11 @@
1804	@ larger repositories.</p>
1805	onoff_attribute("Use Porter Stemmer","search-stemmer","ss",0,0);
1806	@ <p><input type="submit" name="fts1" value="Create A Full-Text Index">
1807	}
1808	@ </div></form>
1809	style_finish_page();
1810	}
1811
1812	/*
1813	** A URL Alias originally called zOldName is now zNewName/zValue.
1814	** Write SQL to make this change into pSql.
	@@ -1963,7 +1963,7 @@
1963	@ <p>To delete an entry from the alias table, change its name or value to an
1964	@ empty string and press "Apply Changes".
1965	@
1966	@ <p>To add a new alias, fill in the name and value in the bottom row
1967	@ of the table above and press "Apply Changes".
1968	style_finish_page();
1969	}
1970

M src/setupuser.c

+7 -7

		--- src/setupuser.c
		+++ src/setupuser.c
		@@ -203,11 +203,11 @@
203	203	fossil_free(zAge);
204	204	}
205	205	@ </tbody></table>
206	206	db_finalize(&s);
207	207	style_table_sorter();
208		- style_finish_page("setupuser");
	208	+ style_finish_page();
209	209	}
210	210
211	211	/*
212	212	** WEBPAGE: setup_ulist_notes
213	213	**
		@@ -250,11 +250,11 @@
250	250	@
251	251	@ <li><p>The permission flags are as follows:</p>
252	252	capabilities_table(CAPCLASS_ALL);
253	253	@ </li>
254	254	@ </ol>
255		- style_finish_page("setupuser");
	255	+ style_finish_page();
256	256	}
257	257
258	258	/*
259	259	** WEBPAGE: setup_ucap_list
260	260	**
		@@ -278,11 +278,11 @@
278	278	capabilities_table(CAPCLASS_WIKI);
279	279	@ <h1>Administrative capabilities</h1>
280	280	capabilities_table(CAPCLASS_SUPER);
281	281	@ <h1>Miscellaneous capabilities</h1>
282	282	capabilities_table(CAPCLASS_OTHER);
283		- style_finish_page("setupuser");
	283	+ style_finish_page();
284	284	}
285	285
286	286	/*
287	287	** Return true if zPw is a valid password string. A valid
288	288	** password string is:
		@@ -414,11 +414,11 @@
414	414	style_header("User Creation Error");
415	415	@ <span class="loginError">Empty login not allowed.</span>
416	416	@
417	417	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
418	418	@ [Bummer]</a></p>
419		- style_finish_page("setupuser");
	419	+ style_finish_page();
420	420	return;
421	421	}
422	422	if( isValidPwString(zPw) ){
423	423	zPw = sha1_shared_secret(zPw, zLogin, 0);
424	424	}else{
		@@ -431,11 +431,11 @@
431	431	@ <span class="loginError">Login "%h(zLogin)" is already used by
432	432	@ a different user.</span>
433	433	@
434	434	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
435	435	@ [Bummer]</a></p>
436		- style_finish_page("setupuser");
	436	+ style_finish_page();
437	437	return;
438	438	}
439	439	login_verify_csrf_secret();
440	440	db_unprotect(PROTECT_USER);
441	441	db_multi_exec(
		@@ -483,11 +483,11 @@
483	483	admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
484	484	@ <span class="loginError">%h(zErr)</span>
485	485	@
486	486	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
487	487	@ [Bummer]</a></p>
488		- style_finish_page("setupuser");
	488	+ style_finish_page();
489	489	return;
490	490	}
491	491	}
492	492	cgi_redirect(cgi_referer("setup_ulist"));
493	493	return;
		@@ -901,7 +901,7 @@
901	901	@ template for users who are allowed more access than
902	902	@ <span class="usertype">anonymous</span>,
903	903	@ but less than a <span class="usertype">developer</span>.
904	904	@ </p></li>
905	905	@ </ul>
906		- style_finish_page("setupuser");
	906	+ style_finish_page();
907	907	}
908	908

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -203,11 +203,11 @@
203	fossil_free(zAge);
204	}
205	@ </tbody></table>
206	db_finalize(&s);
207	style_table_sorter();
208	style_finish_page("setupuser");
209	}
210
211	/*
212	** WEBPAGE: setup_ulist_notes
213	**
	@@ -250,11 +250,11 @@
250	@
251	@ <li><p>The permission flags are as follows:</p>
252	capabilities_table(CAPCLASS_ALL);
253	@ </li>
254	@ </ol>
255	style_finish_page("setupuser");
256	}
257
258	/*
259	** WEBPAGE: setup_ucap_list
260	**
	@@ -278,11 +278,11 @@
278	capabilities_table(CAPCLASS_WIKI);
279	@ <h1>Administrative capabilities</h1>
280	capabilities_table(CAPCLASS_SUPER);
281	@ <h1>Miscellaneous capabilities</h1>
282	capabilities_table(CAPCLASS_OTHER);
283	style_finish_page("setupuser");
284	}
285
286	/*
287	** Return true if zPw is a valid password string. A valid
288	** password string is:
	@@ -414,11 +414,11 @@
414	style_header("User Creation Error");
415	@ <span class="loginError">Empty login not allowed.</span>
416	@
417	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
418	@ [Bummer]</a></p>
419	style_finish_page("setupuser");
420	return;
421	}
422	if( isValidPwString(zPw) ){
423	zPw = sha1_shared_secret(zPw, zLogin, 0);
424	}else{
	@@ -431,11 +431,11 @@
431	@ <span class="loginError">Login "%h(zLogin)" is already used by
432	@ a different user.</span>
433	@
434	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
435	@ [Bummer]</a></p>
436	style_finish_page("setupuser");
437	return;
438	}
439	login_verify_csrf_secret();
440	db_unprotect(PROTECT_USER);
441	db_multi_exec(
	@@ -483,11 +483,11 @@
483	admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
484	@ <span class="loginError">%h(zErr)</span>
485	@
486	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
487	@ [Bummer]</a></p>
488	style_finish_page("setupuser");
489	return;
490	}
491	}
492	cgi_redirect(cgi_referer("setup_ulist"));
493	return;
	@@ -901,7 +901,7 @@
901	@ template for users who are allowed more access than
902	@ <span class="usertype">anonymous</span>,
903	@ but less than a <span class="usertype">developer</span>.
904	@ </p></li>
905	@ </ul>
906	style_finish_page("setupuser");
907	}
908

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -203,11 +203,11 @@
203	fossil_free(zAge);
204	}
205	@ </tbody></table>
206	db_finalize(&s);
207	style_table_sorter();
208	style_finish_page();
209	}
210
211	/*
212	** WEBPAGE: setup_ulist_notes
213	**
	@@ -250,11 +250,11 @@
250	@
251	@ <li><p>The permission flags are as follows:</p>
252	capabilities_table(CAPCLASS_ALL);
253	@ </li>
254	@ </ol>
255	style_finish_page();
256	}
257
258	/*
259	** WEBPAGE: setup_ucap_list
260	**
	@@ -278,11 +278,11 @@
278	capabilities_table(CAPCLASS_WIKI);
279	@ <h1>Administrative capabilities</h1>
280	capabilities_table(CAPCLASS_SUPER);
281	@ <h1>Miscellaneous capabilities</h1>
282	capabilities_table(CAPCLASS_OTHER);
283	style_finish_page();
284	}
285
286	/*
287	** Return true if zPw is a valid password string. A valid
288	** password string is:
	@@ -414,11 +414,11 @@
414	style_header("User Creation Error");
415	@ <span class="loginError">Empty login not allowed.</span>
416	@
417	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
418	@ [Bummer]</a></p>
419	style_finish_page();
420	return;
421	}
422	if( isValidPwString(zPw) ){
423	zPw = sha1_shared_secret(zPw, zLogin, 0);
424	}else{
	@@ -431,11 +431,11 @@
431	@ <span class="loginError">Login "%h(zLogin)" is already used by
432	@ a different user.</span>
433	@
434	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
435	@ [Bummer]</a></p>
436	style_finish_page();
437	return;
438	}
439	login_verify_csrf_secret();
440	db_unprotect(PROTECT_USER);
441	db_multi_exec(
	@@ -483,11 +483,11 @@
483	admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
484	@ <span class="loginError">%h(zErr)</span>
485	@
486	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
487	@ [Bummer]</a></p>
488	style_finish_page();
489	return;
490	}
491	}
492	cgi_redirect(cgi_referer("setup_ulist"));
493	return;
	@@ -901,7 +901,7 @@
901	@ template for users who are allowed more access than
902	@ <span class="usertype">anonymous</span>,
903	@ but less than a <span class="usertype">developer</span>.
904	@ </p></li>
905	@ </ul>
906	style_finish_page();
907	}
908

M src/shun.c

+3 -3

		--- src/shun.c
		+++ src/shun.c
		@@ -263,11 +263,11 @@
263	263	if( cnt==0 ){
264	264	@ <i>no artifacts are shunned on this server</i>
265	265	}
266	266	db_finalize(&q);
267	267	@ </p></blockquote>
268		- style_finish_page("shun");
	268	+ style_finish_page();
269	269	fossil_free(zCanonical);
270	270	}
271	271
272	272	/*
273	273	** Remove from the BLOB table all artifacts that are in the SHUN table.
		@@ -403,11 +403,11 @@
403	403	@ </tr>
404	404	}
405	405	}
406	406	db_finalize(&q);
407	407	@ </table>
408		- style_finish_page("rcvfromlist");
	408	+ style_finish_page();
409	409	}
410	410
411	411	/*
412	412	** WEBPAGE: rcvfrom
413	413	**
		@@ -549,7 +549,7 @@
549	549	@ </td></tr>
550	550	}
551	551	}
552	552	@ </table>
553	553	db_finalize(&q);
554		- style_finish_page("rcvfrom");
	554	+ style_finish_page();
555	555	}
556	556

	--- src/shun.c
	+++ src/shun.c
	@@ -263,11 +263,11 @@
263	if( cnt==0 ){
264	@ <i>no artifacts are shunned on this server</i>
265	}
266	db_finalize(&q);
267	@ </p></blockquote>
268	style_finish_page("shun");
269	fossil_free(zCanonical);
270	}
271
272	/*
273	** Remove from the BLOB table all artifacts that are in the SHUN table.
	@@ -403,11 +403,11 @@
403	@ </tr>
404	}
405	}
406	db_finalize(&q);
407	@ </table>
408	style_finish_page("rcvfromlist");
409	}
410
411	/*
412	** WEBPAGE: rcvfrom
413	**
	@@ -549,7 +549,7 @@
549	@ </td></tr>
550	}
551	}
552	@ </table>
553	db_finalize(&q);
554	style_finish_page("rcvfrom");
555	}
556

	--- src/shun.c
	+++ src/shun.c
	@@ -263,11 +263,11 @@
263	if( cnt==0 ){
264	@ <i>no artifacts are shunned on this server</i>
265	}
266	db_finalize(&q);
267	@ </p></blockquote>
268	style_finish_page();
269	fossil_free(zCanonical);
270	}
271
272	/*
273	** Remove from the BLOB table all artifacts that are in the SHUN table.
	@@ -403,11 +403,11 @@
403	@ </tr>
404	}
405	}
406	db_finalize(&q);
407	@ </table>
408	style_finish_page();
409	}
410
411	/*
412	** WEBPAGE: rcvfrom
413	**
	@@ -549,7 +549,7 @@
549	@ </td></tr>
550	}
551	}
552	@ </table>
553	db_finalize(&q);
554	style_finish_page();
555	}
556

M src/sitemap.c

+3 -3

		--- src/sitemap.c
		+++ src/sitemap.c
		@@ -221,11 +221,11 @@
221	221	if( isPopup ){
222	222	@ <li>%z(href("%R/sitemap"))Site Map</a></li>
223	223	}
224	224	@ </ul>
225	225	if( !isPopup ){
226		- style_finish_page("sitemap");
	226	+ style_finish_page();
227	227	}
228	228	}
229	229
230	230	/*
231	231	** WEBPAGE: sitemap-test
		@@ -274,11 +274,11 @@
274	274	}
275	275	@ <li>%z(href("%R/cookies"))Content of display preference cookie</a></li>
276	276	@ <li>%z(href("%R/test-captcha"))Random ASCII-art Captcha image</a></li>
277	277	@ <li>%z(href("%R/test-piechart"))Pie-Chart generator test</a></li>
278	278	if( !isPopup ){
279		- style_finish_page("sitemap");
	279	+ style_finish_page();
280	280	}
281	281	}
282	282
283	283	/*
284	284	** WEBPAGE: sitemap-timeline
		@@ -315,8 +315,8 @@
315	315	@ <li>%z(href("%R/timewarps"))Timewarps</a></li>
316	316	@ <li>%z(href("%R/timeline?ubg"))Color-coded by user</a></li>
317	317	@ <li>%z(href("%R/timeline?deltabg"))Delta vs. baseline manifests</a></li>
318	318	@ </ul>
319	319	if( !isPopup ){
320		- style_finish_page("sitemap");
	320	+ style_finish_page();
321	321	}
322	322	}
323	323

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -221,11 +221,11 @@
221	if( isPopup ){
222	@ <li>%z(href("%R/sitemap"))Site Map</a></li>
223	}
224	@ </ul>
225	if( !isPopup ){
226	style_finish_page("sitemap");
227	}
228	}
229
230	/*
231	** WEBPAGE: sitemap-test
	@@ -274,11 +274,11 @@
274	}
275	@ <li>%z(href("%R/cookies"))Content of display preference cookie</a></li>
276	@ <li>%z(href("%R/test-captcha"))Random ASCII-art Captcha image</a></li>
277	@ <li>%z(href("%R/test-piechart"))Pie-Chart generator test</a></li>
278	if( !isPopup ){
279	style_finish_page("sitemap");
280	}
281	}
282
283	/*
284	** WEBPAGE: sitemap-timeline
	@@ -315,8 +315,8 @@
315	@ <li>%z(href("%R/timewarps"))Timewarps</a></li>
316	@ <li>%z(href("%R/timeline?ubg"))Color-coded by user</a></li>
317	@ <li>%z(href("%R/timeline?deltabg"))Delta vs. baseline manifests</a></li>
318	@ </ul>
319	if( !isPopup ){
320	style_finish_page("sitemap");
321	}
322	}
323

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -221,11 +221,11 @@
221	if( isPopup ){
222	@ <li>%z(href("%R/sitemap"))Site Map</a></li>
223	}
224	@ </ul>
225	if( !isPopup ){
226	style_finish_page();
227	}
228	}
229
230	/*
231	** WEBPAGE: sitemap-test
	@@ -274,11 +274,11 @@
274	}
275	@ <li>%z(href("%R/cookies"))Content of display preference cookie</a></li>
276	@ <li>%z(href("%R/test-captcha"))Random ASCII-art Captcha image</a></li>
277	@ <li>%z(href("%R/test-piechart"))Pie-Chart generator test</a></li>
278	if( !isPopup ){
279	style_finish_page();
280	}
281	}
282
283	/*
284	** WEBPAGE: sitemap-timeline
	@@ -315,8 +315,8 @@
315	@ <li>%z(href("%R/timewarps"))Timewarps</a></li>
316	@ <li>%z(href("%R/timeline?ubg"))Color-coded by user</a></li>
317	@ <li>%z(href("%R/timeline?deltabg"))Delta vs. baseline manifests</a></li>
318	@ </ul>
319	if( !isPopup ){
320	style_finish_page();
321	}
322	}
323

M src/skins.c

+6 -6

		--- src/skins.c
		+++ src/skins.c
		@@ -405,11 +405,11 @@
405	405	@ <input type="submit" name="rename" value="Rename">
406	406	@ <input type="submit" name="canren" value="Cancel">
407	407	@ </table>
408	408	login_insert_csrf_secret();
409	409	@ </div></form>
410		- style_finish_page("skins");
	410	+ style_finish_page();
411	411	return 1;
412	412	}
413	413	db_unprotect(PROTECT_CONFIG);
414	414	db_multi_exec(
415	415	"UPDATE config SET name='skin:%q' WHERE name='skin:%q';",
		@@ -446,11 +446,11 @@
446	446	@ <input type="submit" name="save" value="Save">
447	447	@ <input type="submit" name="cansave" value="Cancel">
448	448	@ </table>
449	449	login_insert_csrf_secret();
450	450	@ </div></form>
451		- style_finish_page("skins");
	451	+ style_finish_page();
452	452	return 1;
453	453	}
454	454	db_unprotect(PROTECT_CONFIG);
455	455	db_multi_exec(
456	456	"INSERT OR IGNORE INTO config(name, value, mtime)"
		@@ -499,11 +499,11 @@
499	499	@ <input type="hidden" name="sn" value="%h(P("sn"))" />
500	500	@ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
501	501	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
502	502	login_insert_csrf_secret();
503	503	@ </div></form>
504		- style_finish_page("skins");
	504	+ style_finish_page();
505	505	db_end_transaction(1);
506	506	return;
507	507	}
508	508	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
509	509	db_unprotect(PROTECT_CONFIG);
		@@ -652,11 +652,11 @@
652	652	@ </form></tr>
653	653	}
654	654	db_finalize(&q);
655	655
656	656	@ </table>
657		- style_finish_page("skins");
	657	+ style_finish_page();
658	658	db_end_transaction(0);
659	659	}
660	660
661	661	/*
662	662	** Generate HTML for a <select> that lists all the available skin names,
		@@ -850,11 +850,11 @@
850	850	blob_reset(&from);
851	851	blob_reset(&to);
852	852	blob_reset(&out);
853	853	}
854	854	@ </div></form>
855		- style_finish_page("skins");
	855	+ style_finish_page();
856	856	db_end_transaction(0);
857	857	}
858	858
859	859	/*
860	860	** Try to initialize draft skin iSkin to the built-in or preexisting
		@@ -1129,7 +1129,7 @@
1129	1129	}else{
1130	1130	@ <p>Visit the <a href='%R/setup_skin_admin'>Skin Admin</a> page
1131	1131	@ for cleanup and recovery actions.
1132	1132	}
1133	1133	builtin_request_js("skin.js");
1134		- style_finish_page("skins");
	1134	+ style_finish_page();
1135	1135	}
1136	1136

	--- src/skins.c
	+++ src/skins.c
	@@ -405,11 +405,11 @@
405	@ <input type="submit" name="rename" value="Rename">
406	@ <input type="submit" name="canren" value="Cancel">
407	@ </table>
408	login_insert_csrf_secret();
409	@ </div></form>
410	style_finish_page("skins");
411	return 1;
412	}
413	db_unprotect(PROTECT_CONFIG);
414	db_multi_exec(
415	"UPDATE config SET name='skin:%q' WHERE name='skin:%q';",
	@@ -446,11 +446,11 @@
446	@ <input type="submit" name="save" value="Save">
447	@ <input type="submit" name="cansave" value="Cancel">
448	@ </table>
449	login_insert_csrf_secret();
450	@ </div></form>
451	style_finish_page("skins");
452	return 1;
453	}
454	db_unprotect(PROTECT_CONFIG);
455	db_multi_exec(
456	"INSERT OR IGNORE INTO config(name, value, mtime)"
	@@ -499,11 +499,11 @@
499	@ <input type="hidden" name="sn" value="%h(P("sn"))" />
500	@ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
501	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
502	login_insert_csrf_secret();
503	@ </div></form>
504	style_finish_page("skins");
505	db_end_transaction(1);
506	return;
507	}
508	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
509	db_unprotect(PROTECT_CONFIG);
	@@ -652,11 +652,11 @@
652	@ </form></tr>
653	}
654	db_finalize(&q);
655
656	@ </table>
657	style_finish_page("skins");
658	db_end_transaction(0);
659	}
660
661	/*
662	** Generate HTML for a <select> that lists all the available skin names,
	@@ -850,11 +850,11 @@
850	blob_reset(&from);
851	blob_reset(&to);
852	blob_reset(&out);
853	}
854	@ </div></form>
855	style_finish_page("skins");
856	db_end_transaction(0);
857	}
858
859	/*
860	** Try to initialize draft skin iSkin to the built-in or preexisting
	@@ -1129,7 +1129,7 @@
1129	}else{
1130	@ <p>Visit the <a href='%R/setup_skin_admin'>Skin Admin</a> page
1131	@ for cleanup and recovery actions.
1132	}
1133	builtin_request_js("skin.js");
1134	style_finish_page("skins");
1135	}
1136

	--- src/skins.c
	+++ src/skins.c
	@@ -405,11 +405,11 @@
405	@ <input type="submit" name="rename" value="Rename">
406	@ <input type="submit" name="canren" value="Cancel">
407	@ </table>
408	login_insert_csrf_secret();
409	@ </div></form>
410	style_finish_page();
411	return 1;
412	}
413	db_unprotect(PROTECT_CONFIG);
414	db_multi_exec(
415	"UPDATE config SET name='skin:%q' WHERE name='skin:%q';",
	@@ -446,11 +446,11 @@
446	@ <input type="submit" name="save" value="Save">
447	@ <input type="submit" name="cansave" value="Cancel">
448	@ </table>
449	login_insert_csrf_secret();
450	@ </div></form>
451	style_finish_page();
452	return 1;
453	}
454	db_unprotect(PROTECT_CONFIG);
455	db_multi_exec(
456	"INSERT OR IGNORE INTO config(name, value, mtime)"
	@@ -499,11 +499,11 @@
499	@ <input type="hidden" name="sn" value="%h(P("sn"))" />
500	@ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
501	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
502	login_insert_csrf_secret();
503	@ </div></form>
504	style_finish_page();
505	db_end_transaction(1);
506	return;
507	}
508	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
509	db_unprotect(PROTECT_CONFIG);
	@@ -652,11 +652,11 @@
652	@ </form></tr>
653	}
654	db_finalize(&q);
655
656	@ </table>
657	style_finish_page();
658	db_end_transaction(0);
659	}
660
661	/*
662	** Generate HTML for a <select> that lists all the available skin names,
	@@ -850,11 +850,11 @@
850	blob_reset(&from);
851	blob_reset(&to);
852	blob_reset(&out);
853	}
854	@ </div></form>
855	style_finish_page();
856	db_end_transaction(0);
857	}
858
859	/*
860	** Try to initialize draft skin iSkin to the built-in or preexisting
	@@ -1129,7 +1129,7 @@
1129	}else{
1130	@ <p>Visit the <a href='%R/setup_skin_admin'>Skin Admin</a> page
1131	@ for cleanup and recovery actions.
1132	}
1133	builtin_request_js("skin.js");
1134	style_finish_page();
1135	}
1136

M src/smtp.c

+2 -2

		--- src/smtp.c
		+++ src/smtp.c
		@@ -806,11 +806,11 @@
806	806	@ <form method="POST" action="%R/setup_smtp_route">
807	807	@ <input type="submit" value="New">
808	808	@ ← Add a new email address
809	809	@ </form>
810	810	@ </table>
811		- style_finish_page("smtp");
	811	+ style_finish_page();
812	812	db_end_transaction(0);
813	813	}
814	814
815	815	/*
816	816	** WEBPAGE: setup_smtp_route
		@@ -926,11 +926,11 @@
926	926	@ with USER.LOGIN=<i>login-name</i>.
927	927	@ </ul>
928	928	@
929	929	@ <p>To delete a route → erase all text from the "Routing" field then
930	930	@ press the "Apply" button.
931		- style_finish_page("smtp");
	931	+ style_finish_page();
932	932	}
933	933
934	934	#if LOCAL_INTERFACE
935	935	/*
936	936	** State information for the server
937	937

	--- src/smtp.c
	+++ src/smtp.c
	@@ -806,11 +806,11 @@
806	@ <form method="POST" action="%R/setup_smtp_route">
807	@ <input type="submit" value="New">
808	@ ← Add a new email address
809	@ </form>
810	@ </table>
811	style_finish_page("smtp");
812	db_end_transaction(0);
813	}
814
815	/*
816	** WEBPAGE: setup_smtp_route
	@@ -926,11 +926,11 @@
926	@ with USER.LOGIN=<i>login-name</i>.
927	@ </ul>
928	@
929	@ <p>To delete a route → erase all text from the "Routing" field then
930	@ press the "Apply" button.
931	style_finish_page("smtp");
932	}
933
934	#if LOCAL_INTERFACE
935	/*
936	** State information for the server
937

	--- src/smtp.c
	+++ src/smtp.c
	@@ -806,11 +806,11 @@
806	@ <form method="POST" action="%R/setup_smtp_route">
807	@ <input type="submit" value="New">
808	@ ← Add a new email address
809	@ </form>
810	@ </table>
811	style_finish_page();
812	db_end_transaction(0);
813	}
814
815	/*
816	** WEBPAGE: setup_smtp_route
	@@ -926,11 +926,11 @@
926	@ with USER.LOGIN=<i>login-name</i>.
927	@ </ul>
928	@
929	@ <p>To delete a route → erase all text from the "Routing" field then
930	@ press the "Apply" button.
931	style_finish_page();
932	}
933
934	#if LOCAL_INTERFACE
935	/*
936	** State information for the server
937

M src/stat.c

+7 -7

		--- src/stat.c
		+++ src/stat.c
		@@ -288,11 +288,11 @@
288	288	if( g.perm.Admin && alert_enabled() ){
289	289	stats_for_email();
290	290	}
291	291
292	292	@ </table>
293		- style_finish_page("stat");
	293	+ style_finish_page();
294	294	}
295	295
296	296	/*
297	297	** COMMAND: dbstat
298	298	**
		@@ -517,11 +517,11 @@
517	517	}else{
518	518	@ <p>%h(zRemote)</p>
519	519	}
520	520	@ </div>
521	521	}
522		- style_finish_page("stat");
	522	+ style_finish_page();
523	523	}
524	524
525	525	/*
526	526	** WEBPAGE: repo_schema
527	527	**
		@@ -576,11 +576,11 @@
576	576	db_finalize(&q);
577	577	}else{
578	578	style_submenu_element("Stat1","repo_stat1");
579	579	}
580	580	}
581		- style_finish_page("stat");
	581	+ style_finish_page();
582	582	}
583	583
584	584	/*
585	585	** WEBPAGE: repo_stat1
586	586	**
		@@ -609,11 +609,11 @@
609	609	@ INSERT INTO sqlite_stat1 VALUES('%z(zUrl)%h(zTab)</a>','%h(zIdx)','%h(zStat)');
610	610	}
611	611	@ </pre>
612	612	db_finalize(&q);
613	613	}
614		- style_finish_page("stat");
	614	+ style_finish_page();
615	615	}
616	616
617	617	/*
618	618	** WEBPAGE: repo-tabsize
619	619	**
		@@ -682,11 +682,11 @@
682	682	@ <h2>%h(file_tail(g.zLocalDbName)) Size: %s(zBuf)</h2>
683	683	@ <center><svg width='800' height='500'>
684	684	piechart_render(800,500,PIE_OTHER\|PIE_PERCENT);
685	685	@ </svg></center>
686	686	}
687		- style_finish_page("stat");
	687	+ style_finish_page();
688	688	}
689	689
690	690	/*
691	691	** Gather statistics on artifact types, counts, and sizes.
692	692	**
		@@ -824,11 +824,11 @@
824	824	sumCmpr = db_column_int64(&q, 4);
825	825	sumExp = db_column_int64(&q, 5);
826	826	db_finalize(&q);
827	827	if( nTotal==0 ){
828	828	@ No artifacts in this repository!
829		- style_finish_page("stat");
	829	+ style_finish_page();
830	830	return;
831	831	}
832	832	avgCmpr = (double)sumCmpr/nTotal;
833	833	avgExp = (double)sumExp/nTotal;
834	834
		@@ -969,7 +969,7 @@
969	969	}
970	970	@ </tbody></table></div>
971	971	db_finalize(&q);
972	972	}
973	973	style_table_sorter();
974		- style_finish_page("stat");
	974	+ style_finish_page();
975	975	}
976	976

	--- src/stat.c
	+++ src/stat.c
	@@ -288,11 +288,11 @@
288	if( g.perm.Admin && alert_enabled() ){
289	stats_for_email();
290	}
291
292	@ </table>
293	style_finish_page("stat");
294	}
295
296	/*
297	** COMMAND: dbstat
298	**
	@@ -517,11 +517,11 @@
517	}else{
518	@ <p>%h(zRemote)</p>
519	}
520	@ </div>
521	}
522	style_finish_page("stat");
523	}
524
525	/*
526	** WEBPAGE: repo_schema
527	**
	@@ -576,11 +576,11 @@
576	db_finalize(&q);
577	}else{
578	style_submenu_element("Stat1","repo_stat1");
579	}
580	}
581	style_finish_page("stat");
582	}
583
584	/*
585	** WEBPAGE: repo_stat1
586	**
	@@ -609,11 +609,11 @@
609	@ INSERT INTO sqlite_stat1 VALUES('%z(zUrl)%h(zTab)</a>','%h(zIdx)','%h(zStat)');
610	}
611	@ </pre>
612	db_finalize(&q);
613	}
614	style_finish_page("stat");
615	}
616
617	/*
618	** WEBPAGE: repo-tabsize
619	**
	@@ -682,11 +682,11 @@
682	@ <h2>%h(file_tail(g.zLocalDbName)) Size: %s(zBuf)</h2>
683	@ <center><svg width='800' height='500'>
684	piechart_render(800,500,PIE_OTHER\|PIE_PERCENT);
685	@ </svg></center>
686	}
687	style_finish_page("stat");
688	}
689
690	/*
691	** Gather statistics on artifact types, counts, and sizes.
692	**
	@@ -824,11 +824,11 @@
824	sumCmpr = db_column_int64(&q, 4);
825	sumExp = db_column_int64(&q, 5);
826	db_finalize(&q);
827	if( nTotal==0 ){
828	@ No artifacts in this repository!
829	style_finish_page("stat");
830	return;
831	}
832	avgCmpr = (double)sumCmpr/nTotal;
833	avgExp = (double)sumExp/nTotal;
834
	@@ -969,7 +969,7 @@
969	}
970	@ </tbody></table></div>
971	db_finalize(&q);
972	}
973	style_table_sorter();
974	style_finish_page("stat");
975	}
976

	--- src/stat.c
	+++ src/stat.c
	@@ -288,11 +288,11 @@
288	if( g.perm.Admin && alert_enabled() ){
289	stats_for_email();
290	}
291
292	@ </table>
293	style_finish_page();
294	}
295
296	/*
297	** COMMAND: dbstat
298	**
	@@ -517,11 +517,11 @@
517	}else{
518	@ <p>%h(zRemote)</p>
519	}
520	@ </div>
521	}
522	style_finish_page();
523	}
524
525	/*
526	** WEBPAGE: repo_schema
527	**
	@@ -576,11 +576,11 @@
576	db_finalize(&q);
577	}else{
578	style_submenu_element("Stat1","repo_stat1");
579	}
580	}
581	style_finish_page();
582	}
583
584	/*
585	** WEBPAGE: repo_stat1
586	**
	@@ -609,11 +609,11 @@
609	@ INSERT INTO sqlite_stat1 VALUES('%z(zUrl)%h(zTab)</a>','%h(zIdx)','%h(zStat)');
610	}
611	@ </pre>
612	db_finalize(&q);
613	}
614	style_finish_page();
615	}
616
617	/*
618	** WEBPAGE: repo-tabsize
619	**
	@@ -682,11 +682,11 @@
682	@ <h2>%h(file_tail(g.zLocalDbName)) Size: %s(zBuf)</h2>
683	@ <center><svg width='800' height='500'>
684	piechart_render(800,500,PIE_OTHER\|PIE_PERCENT);
685	@ </svg></center>
686	}
687	style_finish_page();
688	}
689
690	/*
691	** Gather statistics on artifact types, counts, and sizes.
692	**
	@@ -824,11 +824,11 @@
824	sumCmpr = db_column_int64(&q, 4);
825	sumExp = db_column_int64(&q, 5);
826	db_finalize(&q);
827	if( nTotal==0 ){
828	@ No artifacts in this repository!
829	style_finish_page();
830	return;
831	}
832	avgCmpr = (double)sumCmpr/nTotal;
833	avgExp = (double)sumExp/nTotal;
834
	@@ -969,7 +969,7 @@
969	}
970	@ </tbody></table></div>
971	db_finalize(&q);
972	}
973	style_table_sorter();
974	style_finish_page();
975	}
976

M src/statrep.c

+1 -1

		--- src/statrep.c
		+++ src/statrep.c
		@@ -825,7 +825,7 @@
825	825	break;
826	826	case RPT_LASTCHNG:
827	827	stats_report_last_change();
828	828	break;
829	829	}
830		- style_finish_page("reports");
	830	+ style_finish_page();
831	831	}
832	832

	--- src/statrep.c
	+++ src/statrep.c
	@@ -825,7 +825,7 @@
825	break;
826	case RPT_LASTCHNG:
827	stats_report_last_change();
828	break;
829	}
830	style_finish_page("reports");
831	}
832

	--- src/statrep.c
	+++ src/statrep.c
	@@ -825,7 +825,7 @@
825	break;
826	case RPT_LASTCHNG:
827	stats_report_last_change();
828	break;
829	}
830	style_finish_page();
831	}
832

M src/style.c

+5 -9

		--- src/style.c
		+++ src/style.c
		@@ -785,16 +785,12 @@
785	785	** been received.
786	786	**
787	787	** * Finalizes the page content.
788	788	**
789	789	** * Appends the footer.
790		-**
791		-** The zPageType argument is a class name inserted in the <div> that
792		-** surrounds the page content. CSS can use this to have different styles
793		-** according to the page type.
794	790	*/
795		-void style_finish_page(const char* zPageType){
	791	+void style_finish_page(){
796	792	const char *zFooter;
797	793	const char *zAd = 0;
798	794	unsigned int mAdFlags = 0;
799	795
800	796	if( !headerHasBeenGenerated ) return;
		@@ -922,11 +918,11 @@
922	918	@ <div class="adunit_banner">
923	919	cgi_append_content(zAd, -1);
924	920	@ </div>
925	921	}
926	922
927		- @ <div class="content %s(zPageType)"><span id="debugMsg"></span>
	923	+ @ <div class="content"><span id="debugMsg"></span>
928	924	cgi_destination(CGI_BODY);
929	925
930	926	if( sideboxUsed ){
931	927	@ <div class="endContent"></div>
932	928	}
		@@ -1243,15 +1239,15 @@
1243	1239	@ %h(blob_str(&g.httpHeader))
1244	1240	@ </pre>
1245	1241	}
1246	1242	}
1247	1243	if( zErr && zErr[0] ){
1248		- style_finish_page("error");
	1244	+ style_finish_page();
1249	1245	cgi_reply();
1250	1246	fossil_exit(1);
1251	1247	}else{
1252		- style_finish_page("test");
	1248	+ style_finish_page();
1253	1249	}
1254	1250	}
1255	1251
1256	1252	/*
1257	1253	** Generate a Not Yet Implemented error page.
		@@ -1284,11 +1280,11 @@
1284	1280	}
1285	1281	style_set_current_feature("enotfound");
1286	1282	style_header("Not Found");
1287	1283	@ <p>%h(zMsg)</p>
1288	1284	cgi_set_status(404, "Not Found");
1289		- style_finish_page("enotfound");
	1285	+ style_finish_page();
1290	1286	}
1291	1287
1292	1288	#if INTERFACE
1293	1289	# define webpage_assert(T) if(!(T)){webpage_assert_page(__FILE__,__LINE__,#T);}
1294	1290	#endif
1295	1291

	--- src/style.c
	+++ src/style.c
	@@ -785,16 +785,12 @@
785	** been received.
786	**
787	** * Finalizes the page content.
788	**
789	** * Appends the footer.
790	**
791	** The zPageType argument is a class name inserted in the <div> that
792	** surrounds the page content. CSS can use this to have different styles
793	** according to the page type.
794	*/
795	void style_finish_page(const char* zPageType){
796	const char *zFooter;
797	const char *zAd = 0;
798	unsigned int mAdFlags = 0;
799
800	if( !headerHasBeenGenerated ) return;
	@@ -922,11 +918,11 @@
922	@ <div class="adunit_banner">
923	cgi_append_content(zAd, -1);
924	@ </div>
925	}
926
927	@ <div class="content %s(zPageType)"><span id="debugMsg"></span>
928	cgi_destination(CGI_BODY);
929
930	if( sideboxUsed ){
931	@ <div class="endContent"></div>
932	}
	@@ -1243,15 +1239,15 @@
1243	@ %h(blob_str(&g.httpHeader))
1244	@ </pre>
1245	}
1246	}
1247	if( zErr && zErr[0] ){
1248	style_finish_page("error");
1249	cgi_reply();
1250	fossil_exit(1);
1251	}else{
1252	style_finish_page("test");
1253	}
1254	}
1255
1256	/*
1257	** Generate a Not Yet Implemented error page.
	@@ -1284,11 +1280,11 @@
1284	}
1285	style_set_current_feature("enotfound");
1286	style_header("Not Found");
1287	@ <p>%h(zMsg)</p>
1288	cgi_set_status(404, "Not Found");
1289	style_finish_page("enotfound");
1290	}
1291
1292	#if INTERFACE
1293	# define webpage_assert(T) if(!(T)){webpage_assert_page(__FILE__,__LINE__,#T);}
1294	#endif
1295

	--- src/style.c
	+++ src/style.c
	@@ -785,16 +785,12 @@
785	** been received.
786	**
787	** * Finalizes the page content.
788	**
789	** * Appends the footer.




790	*/
791	void style_finish_page(){
792	const char *zFooter;
793	const char *zAd = 0;
794	unsigned int mAdFlags = 0;
795
796	if( !headerHasBeenGenerated ) return;
	@@ -922,11 +918,11 @@
918	@ <div class="adunit_banner">
919	cgi_append_content(zAd, -1);
920	@ </div>
921	}
922
923	@ <div class="content"><span id="debugMsg"></span>
924	cgi_destination(CGI_BODY);
925
926	if( sideboxUsed ){
927	@ <div class="endContent"></div>
928	}
	@@ -1243,15 +1239,15 @@
1239	@ %h(blob_str(&g.httpHeader))
1240	@ </pre>
1241	}
1242	}
1243	if( zErr && zErr[0] ){
1244	style_finish_page();
1245	cgi_reply();
1246	fossil_exit(1);
1247	}else{
1248	style_finish_page();
1249	}
1250	}
1251
1252	/*
1253	** Generate a Not Yet Implemented error page.
	@@ -1284,11 +1280,11 @@
1280	}
1281	style_set_current_feature("enotfound");
1282	style_header("Not Found");
1283	@ <p>%h(zMsg)</p>
1284	cgi_set_status(404, "Not Found");
1285	style_finish_page();
1286	}
1287
1288	#if INTERFACE
1289	# define webpage_assert(T) if(!(T)){webpage_assert_page(__FILE__,__LINE__,#T);}
1290	#endif
1291

M src/tag.c

+2 -2

		--- src/tag.c
		+++ src/tag.c
		@@ -724,11 +724,11 @@
724	724	@ <li><span class="tagDsp">%h(zName)</span></li>
725	725	}
726	726	}
727	727	@ </ul>
728	728	db_finalize(&q);
729		- style_finish_page("taglist");
	729	+ style_finish_page();
730	730	}
731	731
732	732	/*
733	733	** WEBPAGE: /tagtimeline
734	734	**
		@@ -781,7 +781,7 @@
781	781	if( PB("brbg")!=0 ) tmFlags \|= TIMELINE_BRCOLOR;
782	782	if( PB("ubg")!=0 ) tmFlags \|= TIMELINE_UCOLOR;
783	783	www_print_timeline(&q, tmFlags, 0, 0, 0, 0, 0, 0);
784	784	db_finalize(&q);
785	785	@ <br />
786		- style_finish_page("tagtimeline");
	786	+ style_finish_page();
787	787	}
788	788

	--- src/tag.c
	+++ src/tag.c
	@@ -724,11 +724,11 @@
724	@ <li><span class="tagDsp">%h(zName)</span></li>
725	}
726	}
727	@ </ul>
728	db_finalize(&q);
729	style_finish_page("taglist");
730	}
731
732	/*
733	** WEBPAGE: /tagtimeline
734	**
	@@ -781,7 +781,7 @@
781	if( PB("brbg")!=0 ) tmFlags \|= TIMELINE_BRCOLOR;
782	if( PB("ubg")!=0 ) tmFlags \|= TIMELINE_UCOLOR;
783	www_print_timeline(&q, tmFlags, 0, 0, 0, 0, 0, 0);
784	db_finalize(&q);
785	@ <br />
786	style_finish_page("tagtimeline");
787	}
788

	--- src/tag.c
	+++ src/tag.c
	@@ -724,11 +724,11 @@
724	@ <li><span class="tagDsp">%h(zName)</span></li>
725	}
726	}
727	@ </ul>
728	db_finalize(&q);
729	style_finish_page();
730	}
731
732	/*
733	** WEBPAGE: /tagtimeline
734	**
	@@ -781,7 +781,7 @@
781	if( PB("brbg")!=0 ) tmFlags \|= TIMELINE_BRCOLOR;
782	if( PB("ubg")!=0 ) tmFlags \|= TIMELINE_UCOLOR;
783	www_print_timeline(&q, tmFlags, 0, 0, 0, 0, 0, 0);
784	db_finalize(&q);
785	@ <br />
786	style_finish_page();
787	}
788

M src/tar.c

+2 -2

		--- src/tar.c
		+++ src/tar.c
		@@ -785,11 +785,11 @@
785	785	}
786	786	if( zExclude ){
787	787	@ zExclude = "%h(zExclude)"<br />
788	788	}
789	789	@ zKey = "%h(zKey)"
790		- style_finish_page("tarball");
	790	+ style_finish_page();
791	791	return;
792	792	}
793	793	if( referred_from_login() ){
794	794	style_header("Tarball Download");
795	795	@ <form action='%R/tarball/%h(zName).tar.gz'>
		@@ -796,11 +796,11 @@
796	796	cgi_query_parameters_to_hidden();
797	797	@ <p>Tarball named <b>%h(zName).tar.gz</b> holding the content
798	798	@ of check-in <b>%h(zRid)</b>:
799	799	@ <input type="submit" value="Download" />
800	800	@ </form>
801		- style_finish_page("tarball");
	801	+ style_finish_page();
802	802	return;
803	803	}
804	804	blob_zero(&tarball);
805	805	if( cache_read(&tarball, zKey)==0 ){
806	806	tarball_of_checkin(rid, &tarball, zName, pInclude, pExclude);
807	807

	--- src/tar.c
	+++ src/tar.c
	@@ -785,11 +785,11 @@
785	}
786	if( zExclude ){
787	@ zExclude = "%h(zExclude)"<br />
788	}
789	@ zKey = "%h(zKey)"
790	style_finish_page("tarball");
791	return;
792	}
793	if( referred_from_login() ){
794	style_header("Tarball Download");
795	@ <form action='%R/tarball/%h(zName).tar.gz'>
	@@ -796,11 +796,11 @@
796	cgi_query_parameters_to_hidden();
797	@ <p>Tarball named <b>%h(zName).tar.gz</b> holding the content
798	@ of check-in <b>%h(zRid)</b>:
799	@ <input type="submit" value="Download" />
800	@ </form>
801	style_finish_page("tarball");
802	return;
803	}
804	blob_zero(&tarball);
805	if( cache_read(&tarball, zKey)==0 ){
806	tarball_of_checkin(rid, &tarball, zName, pInclude, pExclude);
807

	--- src/tar.c
	+++ src/tar.c
	@@ -785,11 +785,11 @@
785	}
786	if( zExclude ){
787	@ zExclude = "%h(zExclude)"<br />
788	}
789	@ zKey = "%h(zKey)"
790	style_finish_page();
791	return;
792	}
793	if( referred_from_login() ){
794	style_header("Tarball Download");
795	@ <form action='%R/tarball/%h(zName).tar.gz'>
	@@ -796,11 +796,11 @@
796	cgi_query_parameters_to_hidden();
797	@ <p>Tarball named <b>%h(zName).tar.gz</b> holding the content
798	@ of check-in <b>%h(zRid)</b>:
799	@ <input type="submit" value="Download" />
800	@ </form>
801	style_finish_page();
802	return;
803	}
804	blob_zero(&tarball);
805	if( cache_read(&tarball, zKey)==0 ){
806	tarball_of_checkin(rid, &tarball, zName, pInclude, pExclude);
807

M src/th_main.c

+1 -1

		--- src/th_main.c
		+++ src/th_main.c
		@@ -1478,11 +1478,11 @@
1478	1478	){
1479	1479	if( argc!=1 ){
1480	1480	return Th_WrongNumArgs(interp, "styleFooter");
1481	1481	}
1482	1482	if( Th_IsRepositoryOpen() ){
1483		- style_finish_page("th1"); /* TODO: add optional parameter to pass along? */
	1483	+ style_finish_page();
1484	1484	Th_SetResult(interp, 0, 0);
1485	1485	return TH_OK;
1486	1486	}else{
1487	1487	Th_SetResult(interp, "repository unavailable", -1);
1488	1488	return TH_ERROR;
1489	1489

	--- src/th_main.c
	+++ src/th_main.c
	@@ -1478,11 +1478,11 @@
1478	){
1479	if( argc!=1 ){
1480	return Th_WrongNumArgs(interp, "styleFooter");
1481	}
1482	if( Th_IsRepositoryOpen() ){
1483	style_finish_page("th1"); /* TODO: add optional parameter to pass along? */
1484	Th_SetResult(interp, 0, 0);
1485	return TH_OK;
1486	}else{
1487	Th_SetResult(interp, "repository unavailable", -1);
1488	return TH_ERROR;
1489

	--- src/th_main.c
	+++ src/th_main.c
	@@ -1478,11 +1478,11 @@
1478	){
1479	if( argc!=1 ){
1480	return Th_WrongNumArgs(interp, "styleFooter");
1481	}
1482	if( Th_IsRepositoryOpen() ){
1483	style_finish_page();
1484	Th_SetResult(interp, 0, 0);
1485	return TH_OK;
1486	}else{
1487	Th_SetResult(interp, "repository unavailable", -1);
1488	return TH_ERROR;
1489

M src/timeline.c

+4 -4

		--- src/timeline.c
		+++ src/timeline.c
		@@ -215,11 +215,11 @@
215	215	zBr = P(zNm);
216	216	@ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br />
217	217	}
218	218	@ <input type="submit">
219	219	@ </form>
220		- style_finish_page("test");
	220	+ style_finish_page();
221	221	}
222	222
223	223	/*
224	224	** Return a new timelineTable id.
225	225	*/
		@@ -2730,11 +2730,11 @@
2730	2730	if( zOlderButton ){
2731	2731	@ %z(chref("button","%s",zOlderButton))%h(zOlderButtonLabel)\
2732	2732	@  ↓</a>
2733	2733	}
2734	2734	document_emit_js(/handles pikchrs rendered above/);
2735		- style_finish_page("timeline");
	2735	+ style_finish_page();
2736	2736	}
2737	2737
2738	2738	/*
2739	2739	** The input query q selects various records. Print a human-readable
2740	2740	** summary of those records.
		@@ -3237,11 +3237,11 @@
3237	3237	@ <small>%z(href("%R/timeline?c=%t",zId))(more context)</a>\
3238	3238	@ </small></h2>
3239	3239	www_print_timeline(&q, TIMELINE_GRAPH, 0, 0, 0, 0, 0, 0);
3240	3240	}
3241	3241	db_finalize(&q);
3242		- style_finish_page("timeline");
	3242	+ style_finish_page();
3243	3243	}
3244	3244
3245	3245
3246	3246	/*
3247	3247	** COMMAND: test-timewarp-list
		@@ -3343,7 +3343,7 @@
3343	3343	if( cnt==0 ){
3344	3344	@ <p>No timewarps in this repository</p>
3345	3345	}else{
3346	3346	@ </tbody></table></div>
3347	3347	}
3348		- style_finish_page("timewarps");
	3348	+ style_finish_page();
3349	3349	}
3350	3350

	--- src/timeline.c
	+++ src/timeline.c
	@@ -215,11 +215,11 @@
215	zBr = P(zNm);
216	@ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br />
217	}
218	@ <input type="submit">
219	@ </form>
220	style_finish_page("test");
221	}
222
223	/*
224	** Return a new timelineTable id.
225	*/
	@@ -2730,11 +2730,11 @@
2730	if( zOlderButton ){
2731	@ %z(chref("button","%s",zOlderButton))%h(zOlderButtonLabel)\
2732	@  ↓</a>
2733	}
2734	document_emit_js(/handles pikchrs rendered above/);
2735	style_finish_page("timeline");
2736	}
2737
2738	/*
2739	** The input query q selects various records. Print a human-readable
2740	** summary of those records.
	@@ -3237,11 +3237,11 @@
3237	@ <small>%z(href("%R/timeline?c=%t",zId))(more context)</a>\
3238	@ </small></h2>
3239	www_print_timeline(&q, TIMELINE_GRAPH, 0, 0, 0, 0, 0, 0);
3240	}
3241	db_finalize(&q);
3242	style_finish_page("timeline");
3243	}
3244
3245
3246	/*
3247	** COMMAND: test-timewarp-list
	@@ -3343,7 +3343,7 @@
3343	if( cnt==0 ){
3344	@ <p>No timewarps in this repository</p>
3345	}else{
3346	@ </tbody></table></div>
3347	}
3348	style_finish_page("timewarps");
3349	}
3350

	--- src/timeline.c
	+++ src/timeline.c
	@@ -215,11 +215,11 @@
215	zBr = P(zNm);
216	@ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br />
217	}
218	@ <input type="submit">
219	@ </form>
220	style_finish_page();
221	}
222
223	/*
224	** Return a new timelineTable id.
225	*/
	@@ -2730,11 +2730,11 @@
2730	if( zOlderButton ){
2731	@ %z(chref("button","%s",zOlderButton))%h(zOlderButtonLabel)\
2732	@  ↓</a>
2733	}
2734	document_emit_js(/handles pikchrs rendered above/);
2735	style_finish_page();
2736	}
2737
2738	/*
2739	** The input query q selects various records. Print a human-readable
2740	** summary of those records.
	@@ -3237,11 +3237,11 @@
3237	@ <small>%z(href("%R/timeline?c=%t",zId))(more context)</a>\
3238	@ </small></h2>
3239	www_print_timeline(&q, TIMELINE_GRAPH, 0, 0, 0, 0, 0, 0);
3240	}
3241	db_finalize(&q);
3242	style_finish_page();
3243	}
3244
3245
3246	/*
3247	** COMMAND: test-timewarp-list
	@@ -3343,7 +3343,7 @@
3343	if( cnt==0 ){
3344	@ <p>No timewarps in this repository</p>
3345	}else{
3346	@ </tbody></table></div>
3347	}
3348	style_finish_page();
3349	}
3350

M src/tkt.c

+11 -11

		--- src/tkt.c
		+++ src/tkt.c
		@@ -619,11 +619,11 @@
619	619	" WHERE tkt_uuid GLOB '%q*'", zUuid);
620	620	if( zFullName ){
621	621	attachment_list(zFullName, "<hr /><h2>Attachments:</h2><ul>");
622	622	}
623	623
624		- style_finish_page("tkt");
	624	+ style_finish_page();
625	625	}
626	626
627	627	/*
628	628	** TH1 command: append_field FIELD STRING
629	629	**
		@@ -843,11 +843,11 @@
843	843	return;
844	844	}
845	845	captcha_generate(0);
846	846	@ </form>
847	847	if( g.thTrace ) Th_Trace("END_TKTVIEW<br />\n", -1);
848		- style_finish_page("tkt");
	848	+ style_finish_page();
849	849	}
850	850
851	851	/*
852	852	** WEBPAGE: tktedit
853	853	** WEBPAGE: debug_tktedit
		@@ -877,24 +877,24 @@
877	877	style_set_current_feature("tkt");
878	878	style_header("Edit Ticket");
879	879	if( zName==0 \|\| (nName = strlen(zName))<4 \|\| nName>HNAME_LEN_SHA1
880	880	\|\| !validate16(zName,nName) ){
881	881	@ <span class="tktError">Not a valid ticket id: "%h(zName)"</span>
882		- style_finish_page("tkt");
	882	+ style_finish_page();
883	883	return;
884	884	}
885	885	nRec = db_int(0, "SELECT count() FROM ticket WHERE tkt_uuid GLOB '%q'",
886	886	zName);
887	887	if( nRec==0 ){
888	888	@ <span class="tktError">No such ticket: "%h(zName)"</span>
889		- style_finish_page("tkt");
	889	+ style_finish_page();
890	890	return;
891	891	}
892	892	if( nRec>1 ){
893	893	@ <span class="tktError">%d(nRec) tickets begin with:
894	894	@ "%h(zName)"</span>
895		- style_finish_page("tkt");
	895	+ style_finish_page();
896	896	return;
897	897	}
898	898	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
899	899	ticket_init();
900	900	getAllTicketFields();
		@@ -915,11 +915,11 @@
915	915	return;
916	916	}
917	917	captcha_generate(0);
918	918	@ </form>
919	919	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
920		- style_finish_page("tkt");
	920	+ style_finish_page();
921	921	}
922	922
923	923	/*
924	924	** Check the ticket table schema in zSchema to see if it appears to
925	925	** be well-formed. If everything is OK, return NULL. If something is
		@@ -1046,15 +1046,15 @@
1046	1046	sqlite3_snprintf(6, zGlobPattern, "%s", zUuid);
1047	1047	canonical16(zGlobPattern, strlen(zGlobPattern));
1048	1048	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1049	1049	if( tagid==0 ){
1050	1050	@ No such ticket: %h(zUuid)
1051		- style_finish_page("tkt");
	1051	+ style_finish_page();
1052	1052	return;
1053	1053	}
1054	1054	tkt_draw_timeline(tagid, zType);
1055		- style_finish_page("tkt");
	1055	+ style_finish_page();
1056	1056	}
1057	1057
1058	1058	/*
1059	1059	** WEBPAGE: tkthistory
1060	1060	** URL: /tkthistory?name=TICKETUUID
		@@ -1094,11 +1094,11 @@
1094	1094	style_header("%z", zTitle);
1095	1095
1096	1096	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1097	1097	if( tagid==0 ){
1098	1098	@ No such ticket: %h(zUuid)
1099		- style_finish_page("tkt");
	1099	+ style_finish_page();
1100	1100	return;
1101	1101	}
1102	1102	if( P("raw")!=0 ){
1103	1103	@ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2>
1104	1104	}else{
		@@ -1167,11 +1167,11 @@
1167	1167	}
1168	1168	db_finalize(&q);
1169	1169	if( nChng ){
1170	1170	@ </ol>
1171	1171	}
1172		- style_finish_page("tkt");
	1172	+ style_finish_page();
1173	1173	}
1174	1174
1175	1175	/*
1176	1176	** Return TRUE if the given BLOB contains a newline character.
1177	1177	*/
		@@ -1620,7 +1620,7 @@
1620	1620	login_check_credentials();
1621	1621	style_set_current_feature("tkt");
1622	1622	style_header("Ticket Search");
1623	1623	ticket_standard_submenu(T_ALL_BUT(T_SRCH));
1624	1624	search_screen(SRCH_TKT, 0);
1625		- style_finish_page("tkt");
	1625	+ style_finish_page();
1626	1626	}
1627	1627

	--- src/tkt.c
	+++ src/tkt.c
	@@ -619,11 +619,11 @@
619	" WHERE tkt_uuid GLOB '%q*'", zUuid);
620	if( zFullName ){
621	attachment_list(zFullName, "<hr /><h2>Attachments:</h2><ul>");
622	}
623
624	style_finish_page("tkt");
625	}
626
627	/*
628	** TH1 command: append_field FIELD STRING
629	**
	@@ -843,11 +843,11 @@
843	return;
844	}
845	captcha_generate(0);
846	@ </form>
847	if( g.thTrace ) Th_Trace("END_TKTVIEW<br />\n", -1);
848	style_finish_page("tkt");
849	}
850
851	/*
852	** WEBPAGE: tktedit
853	** WEBPAGE: debug_tktedit
	@@ -877,24 +877,24 @@
877	style_set_current_feature("tkt");
878	style_header("Edit Ticket");
879	if( zName==0 \|\| (nName = strlen(zName))<4 \|\| nName>HNAME_LEN_SHA1
880	\|\| !validate16(zName,nName) ){
881	@ <span class="tktError">Not a valid ticket id: "%h(zName)"</span>
882	style_finish_page("tkt");
883	return;
884	}
885	nRec = db_int(0, "SELECT count() FROM ticket WHERE tkt_uuid GLOB '%q'",
886	zName);
887	if( nRec==0 ){
888	@ <span class="tktError">No such ticket: "%h(zName)"</span>
889	style_finish_page("tkt");
890	return;
891	}
892	if( nRec>1 ){
893	@ <span class="tktError">%d(nRec) tickets begin with:
894	@ "%h(zName)"</span>
895	style_finish_page("tkt");
896	return;
897	}
898	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
899	ticket_init();
900	getAllTicketFields();
	@@ -915,11 +915,11 @@
915	return;
916	}
917	captcha_generate(0);
918	@ </form>
919	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
920	style_finish_page("tkt");
921	}
922
923	/*
924	** Check the ticket table schema in zSchema to see if it appears to
925	** be well-formed. If everything is OK, return NULL. If something is
	@@ -1046,15 +1046,15 @@
1046	sqlite3_snprintf(6, zGlobPattern, "%s", zUuid);
1047	canonical16(zGlobPattern, strlen(zGlobPattern));
1048	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1049	if( tagid==0 ){
1050	@ No such ticket: %h(zUuid)
1051	style_finish_page("tkt");
1052	return;
1053	}
1054	tkt_draw_timeline(tagid, zType);
1055	style_finish_page("tkt");
1056	}
1057
1058	/*
1059	** WEBPAGE: tkthistory
1060	** URL: /tkthistory?name=TICKETUUID
	@@ -1094,11 +1094,11 @@
1094	style_header("%z", zTitle);
1095
1096	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1097	if( tagid==0 ){
1098	@ No such ticket: %h(zUuid)
1099	style_finish_page("tkt");
1100	return;
1101	}
1102	if( P("raw")!=0 ){
1103	@ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2>
1104	}else{
	@@ -1167,11 +1167,11 @@
1167	}
1168	db_finalize(&q);
1169	if( nChng ){
1170	@ </ol>
1171	}
1172	style_finish_page("tkt");
1173	}
1174
1175	/*
1176	** Return TRUE if the given BLOB contains a newline character.
1177	*/
	@@ -1620,7 +1620,7 @@
1620	login_check_credentials();
1621	style_set_current_feature("tkt");
1622	style_header("Ticket Search");
1623	ticket_standard_submenu(T_ALL_BUT(T_SRCH));
1624	search_screen(SRCH_TKT, 0);
1625	style_finish_page("tkt");
1626	}
1627

	--- src/tkt.c
	+++ src/tkt.c
	@@ -619,11 +619,11 @@
619	" WHERE tkt_uuid GLOB '%q*'", zUuid);
620	if( zFullName ){
621	attachment_list(zFullName, "<hr /><h2>Attachments:</h2><ul>");
622	}
623
624	style_finish_page();
625	}
626
627	/*
628	** TH1 command: append_field FIELD STRING
629	**
	@@ -843,11 +843,11 @@
843	return;
844	}
845	captcha_generate(0);
846	@ </form>
847	if( g.thTrace ) Th_Trace("END_TKTVIEW<br />\n", -1);
848	style_finish_page();
849	}
850
851	/*
852	** WEBPAGE: tktedit
853	** WEBPAGE: debug_tktedit
	@@ -877,24 +877,24 @@
877	style_set_current_feature("tkt");
878	style_header("Edit Ticket");
879	if( zName==0 \|\| (nName = strlen(zName))<4 \|\| nName>HNAME_LEN_SHA1
880	\|\| !validate16(zName,nName) ){
881	@ <span class="tktError">Not a valid ticket id: "%h(zName)"</span>
882	style_finish_page();
883	return;
884	}
885	nRec = db_int(0, "SELECT count() FROM ticket WHERE tkt_uuid GLOB '%q'",
886	zName);
887	if( nRec==0 ){
888	@ <span class="tktError">No such ticket: "%h(zName)"</span>
889	style_finish_page();
890	return;
891	}
892	if( nRec>1 ){
893	@ <span class="tktError">%d(nRec) tickets begin with:
894	@ "%h(zName)"</span>
895	style_finish_page();
896	return;
897	}
898	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
899	ticket_init();
900	getAllTicketFields();
	@@ -915,11 +915,11 @@
915	return;
916	}
917	captcha_generate(0);
918	@ </form>
919	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
920	style_finish_page();
921	}
922
923	/*
924	** Check the ticket table schema in zSchema to see if it appears to
925	** be well-formed. If everything is OK, return NULL. If something is
	@@ -1046,15 +1046,15 @@
1046	sqlite3_snprintf(6, zGlobPattern, "%s", zUuid);
1047	canonical16(zGlobPattern, strlen(zGlobPattern));
1048	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1049	if( tagid==0 ){
1050	@ No such ticket: %h(zUuid)
1051	style_finish_page();
1052	return;
1053	}
1054	tkt_draw_timeline(tagid, zType);
1055	style_finish_page();
1056	}
1057
1058	/*
1059	** WEBPAGE: tkthistory
1060	** URL: /tkthistory?name=TICKETUUID
	@@ -1094,11 +1094,11 @@
1094	style_header("%z", zTitle);
1095
1096	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1097	if( tagid==0 ){
1098	@ No such ticket: %h(zUuid)
1099	style_finish_page();
1100	return;
1101	}
1102	if( P("raw")!=0 ){
1103	@ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2>
1104	}else{
	@@ -1167,11 +1167,11 @@
1167	}
1168	db_finalize(&q);
1169	if( nChng ){
1170	@ </ol>
1171	}
1172	style_finish_page();
1173	}
1174
1175	/*
1176	** Return TRUE if the given BLOB contains a newline character.
1177	*/
	@@ -1620,7 +1620,7 @@
1620	login_check_credentials();
1621	style_set_current_feature("tkt");
1622	style_header("Ticket Search");
1623	ticket_standard_submenu(T_ALL_BUT(T_SRCH));
1624	search_screen(SRCH_TKT, 0);
1625	style_finish_page();
1626	}
1627

M src/tktsetup.c

+3 -3

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -54,11 +54,11 @@
54	54	setup_menu_entry("Report Template", "tktsetup_rpttplt",
55	55	"The default ticket report format.");
56	56	setup_menu_entry("Key Template", "tktsetup_keytplt",
57	57	"The default color key for reports.");
58	58	@ </table>
59		- style_finish_page("tktsetup");
	59	+ style_finish_page();
60	60	}
61	61
62	62	/*
63	63	** NOTE: When changing the table definition below, also change the
64	64	** equivalent definition found in schema.c.
		@@ -165,11 +165,11 @@
165	165	@ <hr />
166	166	@ <h2>Default %s(zTitle)</h2>
167	167	@ <blockquote><pre>
168	168	@ %h(zDfltValue)
169	169	@ </pre></blockquote>
170		- style_finish_page("tktsetup");
	170	+ style_finish_page();
171	171	}
172	172
173	173	/*
174	174	** WEBPAGE: tktsetup_tab
175	175	** Administrative page for defining the "ticket" table used
		@@ -937,8 +937,8 @@
937	937	@ <input type="submit" name="submit" value="Apply Changes" />
938	938	@ <input type="submit" name="setup" value="Cancel" />
939	939	@ </p>
940	940	@ </div></form>
941	941	db_end_transaction(0);
942		- style_finish_page("tktsetup");
	942	+ style_finish_page();
943	943
944	944	}
945	945

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -54,11 +54,11 @@
54	setup_menu_entry("Report Template", "tktsetup_rpttplt",
55	"The default ticket report format.");
56	setup_menu_entry("Key Template", "tktsetup_keytplt",
57	"The default color key for reports.");
58	@ </table>
59	style_finish_page("tktsetup");
60	}
61
62	/*
63	** NOTE: When changing the table definition below, also change the
64	** equivalent definition found in schema.c.
	@@ -165,11 +165,11 @@
165	@ <hr />
166	@ <h2>Default %s(zTitle)</h2>
167	@ <blockquote><pre>
168	@ %h(zDfltValue)
169	@ </pre></blockquote>
170	style_finish_page("tktsetup");
171	}
172
173	/*
174	** WEBPAGE: tktsetup_tab
175	** Administrative page for defining the "ticket" table used
	@@ -937,8 +937,8 @@
937	@ <input type="submit" name="submit" value="Apply Changes" />
938	@ <input type="submit" name="setup" value="Cancel" />
939	@ </p>
940	@ </div></form>
941	db_end_transaction(0);
942	style_finish_page("tktsetup");
943
944	}
945

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -54,11 +54,11 @@
54	setup_menu_entry("Report Template", "tktsetup_rpttplt",
55	"The default ticket report format.");
56	setup_menu_entry("Key Template", "tktsetup_keytplt",
57	"The default color key for reports.");
58	@ </table>
59	style_finish_page();
60	}
61
62	/*
63	** NOTE: When changing the table definition below, also change the
64	** equivalent definition found in schema.c.
	@@ -165,11 +165,11 @@
165	@ <hr />
166	@ <h2>Default %s(zTitle)</h2>
167	@ <blockquote><pre>
168	@ %h(zDfltValue)
169	@ </pre></blockquote>
170	style_finish_page();
171	}
172
173	/*
174	** WEBPAGE: tktsetup_tab
175	** Administrative page for defining the "ticket" table used
	@@ -937,8 +937,8 @@
937	@ <input type="submit" name="submit" value="Apply Changes" />
938	@ <input type="submit" name="setup" value="Cancel" />
939	@ </p>
940	@ </div></form>
941	db_end_transaction(0);
942	style_finish_page();
943
944	}
945

M src/unversioned.c

+2 -2

		--- src/unversioned.c
		+++ src/unversioned.c
		@@ -546,11 +546,11 @@
546	546	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
547	547	etag_check(ETAG_DATA,0);
548	548	style_header("Unversioned Files");
549	549	if( !db_table_exists("repository","unversioned") ){
550	550	@ No unversioned files on this server
551		- style_finish_page("uvlist");
	551	+ style_finish_page();
552	552	return;
553	553	}
554	554	if( PB("byage") ) zOrderBy = "mtime DESC";
555	555	if( PB("showdel") ) showDel = 1;
556	556	db_prepare(&q,
		@@ -632,11 +632,11 @@
632	632	@ </tfoot>
633	633	@ </table></div>
634	634	}else{
635	635	@ No unversioned files on this server.
636	636	}
637		- style_finish_page("uvlist");
	637	+ style_finish_page();
638	638	}
639	639
640	640	/*
641	641	** WEBPAGE: juvlist
642	642	**
643	643

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -546,11 +546,11 @@
546	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
547	etag_check(ETAG_DATA,0);
548	style_header("Unversioned Files");
549	if( !db_table_exists("repository","unversioned") ){
550	@ No unversioned files on this server
551	style_finish_page("uvlist");
552	return;
553	}
554	if( PB("byage") ) zOrderBy = "mtime DESC";
555	if( PB("showdel") ) showDel = 1;
556	db_prepare(&q,
	@@ -632,11 +632,11 @@
632	@ </tfoot>
633	@ </table></div>
634	}else{
635	@ No unversioned files on this server.
636	}
637	style_finish_page("uvlist");
638	}
639
640	/*
641	** WEBPAGE: juvlist
642	**
643

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -546,11 +546,11 @@
546	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
547	etag_check(ETAG_DATA,0);
548	style_header("Unversioned Files");
549	if( !db_table_exists("repository","unversioned") ){
550	@ No unversioned files on this server
551	style_finish_page();
552	return;
553	}
554	if( PB("byage") ) zOrderBy = "mtime DESC";
555	if( PB("showdel") ) showDel = 1;
556	db_prepare(&q,
	@@ -632,11 +632,11 @@
632	@ </tfoot>
633	@ </table></div>
634	}else{
635	@ No unversioned files on this server.
636	}
637	style_finish_page();
638	}
639
640	/*
641	** WEBPAGE: juvlist
642	**
643

M src/user.c

+1 -1

		--- src/user.c
		+++ src/user.c
		@@ -772,7 +772,7 @@
772	772	@ <label><input type="checkbox" name="delall">
773	773	@ Delete all entries</input></label>
774	774	@ <input type="submit" name="delallbtn" value="Delete"></input>
775	775	@ </form>
776	776	style_table_sorter();
777		- style_finish_page("access_log");
	777	+ style_finish_page();
778	778	}
779	779

	--- src/user.c
	+++ src/user.c
	@@ -772,7 +772,7 @@
772	@ <label><input type="checkbox" name="delall">
773	@ Delete all entries</input></label>
774	@ <input type="submit" name="delallbtn" value="Delete"></input>
775	@ </form>
776	style_table_sorter();
777	style_finish_page("access_log");
778	}
779

	--- src/user.c
	+++ src/user.c
	@@ -772,7 +772,7 @@
772	@ <label><input type="checkbox" name="delall">
773	@ Delete all entries</input></label>
774	@ <input type="submit" name="delallbtn" value="Delete"></input>
775	@ </form>
776	style_table_sorter();
777	style_finish_page();
778	}
779

M src/webmail.c

+5 -5

		--- src/webmail.c
		+++ src/webmail.c
		@@ -514,11 +514,11 @@
514	514	style_submenu_element("Delete", "%s",
515	515	url_render(pUrl,"trash","1",zENum,"1"));
516	516	}
517	517
518	518	db_end_transaction(0);
519		- style_finish_page("webmail");
	519	+ style_finish_page();
520	520	return;
521	521	}
522	522
523	523	/*
524	524	** Scan the query parameters looking for parameters with name of the
		@@ -615,11 +615,11 @@
615	615	}
616	616	style_set_current_feature("webmail");
617	617	if( !db_table_exists("repository","emailbox") ){
618	618	style_header("Webmail Not Available");
619	619	@ <p>This repository is not configured to provide webmail</p>
620		- style_finish_page("webmail");
	620	+ style_finish_page();
621	621	return;
622	622	}
623	623	add_content_sql_commands(g.db);
624	624	emailid = atoi(PD("id","0"));
625	625	url_initialize(&url, "webmail");
		@@ -759,11 +759,11 @@
759	759	@ for(i=0; i<x.length; i++){
760	760	@ x[i].checked = true;
761	761	@ }
762	762	@ }
763	763	@ </script>
764		- style_finish_page("webmail");
	764	+ style_finish_page();
765	765	db_end_transaction(0);
766	766	}
767	767
768	768	/*
769	769	** WEBPAGE: emailblob
		@@ -857,11 +857,11 @@
857	857	}
858	858	@ </tbody></table>
859	859	db_finalize(&q);
860	860	style_table_sorter();
861	861	}
862		- style_finish_page("webmail");
	862	+ style_finish_page();
863	863	}
864	864
865	865	/*
866	866	** WEBPAGE: emailoutq
867	867	**
		@@ -915,7 +915,7 @@
915	915	}
916	916	}
917	917	@ </tbody></table>
918	918	db_finalize(&q);
919	919	style_table_sorter();
920		- style_finish_page("webmail");
	920	+ style_finish_page();
921	921	}
922	922

	--- src/webmail.c
	+++ src/webmail.c
	@@ -514,11 +514,11 @@
514	style_submenu_element("Delete", "%s",
515	url_render(pUrl,"trash","1",zENum,"1"));
516	}
517
518	db_end_transaction(0);
519	style_finish_page("webmail");
520	return;
521	}
522
523	/*
524	** Scan the query parameters looking for parameters with name of the
	@@ -615,11 +615,11 @@
615	}
616	style_set_current_feature("webmail");
617	if( !db_table_exists("repository","emailbox") ){
618	style_header("Webmail Not Available");
619	@ <p>This repository is not configured to provide webmail</p>
620	style_finish_page("webmail");
621	return;
622	}
623	add_content_sql_commands(g.db);
624	emailid = atoi(PD("id","0"));
625	url_initialize(&url, "webmail");
	@@ -759,11 +759,11 @@
759	@ for(i=0; i<x.length; i++){
760	@ x[i].checked = true;
761	@ }
762	@ }
763	@ </script>
764	style_finish_page("webmail");
765	db_end_transaction(0);
766	}
767
768	/*
769	** WEBPAGE: emailblob
	@@ -857,11 +857,11 @@
857	}
858	@ </tbody></table>
859	db_finalize(&q);
860	style_table_sorter();
861	}
862	style_finish_page("webmail");
863	}
864
865	/*
866	** WEBPAGE: emailoutq
867	**
	@@ -915,7 +915,7 @@
915	}
916	}
917	@ </tbody></table>
918	db_finalize(&q);
919	style_table_sorter();
920	style_finish_page("webmail");
921	}
922

	--- src/webmail.c
	+++ src/webmail.c
	@@ -514,11 +514,11 @@
514	style_submenu_element("Delete", "%s",
515	url_render(pUrl,"trash","1",zENum,"1"));
516	}
517
518	db_end_transaction(0);
519	style_finish_page();
520	return;
521	}
522
523	/*
524	** Scan the query parameters looking for parameters with name of the
	@@ -615,11 +615,11 @@
615	}
616	style_set_current_feature("webmail");
617	if( !db_table_exists("repository","emailbox") ){
618	style_header("Webmail Not Available");
619	@ <p>This repository is not configured to provide webmail</p>
620	style_finish_page();
621	return;
622	}
623	add_content_sql_commands(g.db);
624	emailid = atoi(PD("id","0"));
625	url_initialize(&url, "webmail");
	@@ -759,11 +759,11 @@
759	@ for(i=0; i<x.length; i++){
760	@ x[i].checked = true;
761	@ }
762	@ }
763	@ </script>
764	style_finish_page();
765	db_end_transaction(0);
766	}
767
768	/*
769	** WEBPAGE: emailblob
	@@ -857,11 +857,11 @@
857	}
858	@ </tbody></table>
859	db_finalize(&q);
860	style_table_sorter();
861	}
862	style_finish_page();
863	}
864
865	/*
866	** WEBPAGE: emailoutq
867	**
	@@ -915,7 +915,7 @@
915	}
916	}
917	@ </tbody></table>
918	db_finalize(&q);
919	style_table_sorter();
920	style_finish_page();
921	}
922

M src/wiki.c

+15 -15

		--- src/wiki.c
		+++ src/wiki.c
		@@ -67,11 +67,11 @@
67	67	style_set_current_feature("wiki");
68	68	style_header("Wiki Page Name Error");
69	69	@ The wiki name "<span class="wikiError">%h(z)</span>" is not well-formed.
70	70	@ Rules for wiki page names:
71	71	well_formed_wiki_name_rules();
72		- style_finish_page("wiki");
	72	+ style_finish_page();
73	73	return 1;
74	74	}
75	75	return 0;
76	76	}
77	77
		@@ -143,11 +143,11 @@
143	143	@ To fill in this page, first go to
144	144	@ %z(href("%R/setup_config"))setup/config</a>
145	145	@ and establish a "Project Name". Then create a
146	146	@ wiki page with that name. The content of that wiki page
147	147	@ will be displayed in place of this message.</p>
148		- style_finish_page("wiki");
	148	+ style_finish_page();
149	149	}
150	150
151	151	/*
152	152	** Return true if the given pagename is the name of the sandbox
153	153	*/
		@@ -245,11 +245,11 @@
245	245	blob_materialize(&x);
246	246	interwiki_append_map_table(&x);
247	247	safe_html_context(DOCSRC_TRUSTED);
248	248	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-markdown");
249	249	blob_reset(&x);
250		- style_finish_page("wiki");
	250	+ style_finish_page();
251	251	}
252	252
253	253	/*
254	254	** WEBPAGE: wiki_rules
255	255	**
		@@ -270,11 +270,11 @@
270	270	blob_materialize(&x);
271	271	interwiki_append_map_table(&x);
272	272	safe_html_context(DOCSRC_TRUSTED);
273	273	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-fossil-wiki");
274	274	blob_reset(&x);
275		- style_finish_page("wiki");
	275	+ style_finish_page();
276	276	}
277	277
278	278	/*
279	279	** WEBPAGE: markup_help
280	280	**
		@@ -285,11 +285,11 @@
285	285	style_header("Fossil Markup Styles");
286	286	@ <ul>
287	287	@ <li><p>%z(href("%R/wiki_rules"))Fossil Wiki Formatting Rules</a></p></li>
288	288	@ <li><p>%z(href("%R/md_rules"))Markdown Formatting Rules</a></p></li>
289	289	@ </ul>
290		- style_finish_page("wiki");
	290	+ style_finish_page();
291	291	}
292	292
293	293	/*
294	294	** Returns non-zero if moderation is required for wiki changes and wiki
295	295	** attachments.
		@@ -375,11 +375,11 @@
375	375	if( search_restrict(SRCH_WIKI)!=0 ){
376	376	@ <li> %z(href("%R/wikisrch"))Search</a> for wiki pages containing key
377	377	@ words</li>
378	378	}
379	379	@ </ul>
380		- style_finish_page("wiki");
	380	+ style_finish_page();
381	381	return;
382	382	}
383	383
384	384	/*
385	385	** WEBPAGE: wikisrch
		@@ -391,11 +391,11 @@
391	391	login_check_credentials();
392	392	style_set_current_feature("wiki");
393	393	style_header("Wiki Search");
394	394	wiki_standard_submenu(W_HELP\|W_LIST\|W_SANDBOX);
395	395	search_screen(SRCH_WIKI, 0);
396		- style_finish_page("wiki");
	396	+ style_finish_page();
397	397	}
398	398
399	399	/* Return values from wiki_page_type() */
400	400	#if INTERFACE
401	401	# define WIKITYPE_UNKNOWN (-1)
		@@ -605,11 +605,11 @@
605	605	blob_reset(&wiki);
606	606	}
607	607	attachment_list(zPageName, "<hr /><h2>Attachments:</h2><ul>");
608	608	manifest_destroy(pWiki);
609	609	document_emit_js(/for optional pikchr support/);
610		- style_finish_page("wiki");
	610	+ style_finish_page();
611	611	}
612	612
613	613	/*
614	614	** Write a wiki artifact into the repository
615	615	*/
		@@ -1353,11 +1353,11 @@
1353	1353	CX("}catch(e){"
1354	1354	"fossil.error(e); console.error('Exception:',e);"
1355	1355	"}\n");
1356	1356	CX("});\n"/fossil.onPageLoad()/);
1357	1357	style_script_end();
1358		- style_finish_page("wiki");
	1358	+ style_finish_page();
1359	1359	}
1360	1360
1361	1361	/*
1362	1362	** WEBPAGE: wikinew
1363	1363	** URL /wikinew
		@@ -1392,11 +1392,11 @@
1392	1392	@ </p></form>
1393	1393	if( zName[0] ){
1394	1394	@ <p><span class="wikiError">
1395	1395	@ "%h(zName)" is not a valid wiki page name!</span></p>
1396	1396	}
1397		- style_finish_page("wiki");
	1397	+ style_finish_page();
1398	1398	}
1399	1399
1400	1400
1401	1401	/*
1402	1402	** Append the wiki text for an remark to the end of the given BLOB.
		@@ -1555,11 +1555,11 @@
1555	1555	@ <input type="submit" name="preview" value="Preview Your Comment" />
1556	1556	@ <input type="submit" name="submit" value="Append Your Changes" />
1557	1557	@ <input type="submit" name="cancel" value="Cancel" />
1558	1558	captcha_generate(0);
1559	1559	@ </form>
1560		- style_finish_page("wiki");
	1560	+ style_finish_page();
1561	1561	}
1562	1562
1563	1563	/*
1564	1564	** WEBPAGE: whistory
1565	1565	** URL: /whistory?name=PAGENAME
		@@ -1594,11 +1594,11 @@
1594	1594	www_print_timeline(&q,
1595	1595	TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_REFS,
1596	1596	0, 0, 0, 0, 0, 0);
1597	1597	db_finalize(&q);
1598	1598	blob_reset(&sql);
1599		- style_finish_page("wiki");
	1599	+ style_finish_page();
1600	1600	}
1601	1601
1602	1602	/*
1603	1603	** WEBPAGE: wdiff
1604	1604	**
		@@ -1667,11 +1667,11 @@
1667	1667	@ <pre class="udiff">
1668	1668	@ %s(blob_str(&d))
1669	1669	@ <pre>
1670	1670	manifest_destroy(pW1);
1671	1671	manifest_destroy(pW2);
1672		- style_finish_page("wiki");
	1672	+ style_finish_page();
1673	1673	}
1674	1674
1675	1675	/*
1676	1676	** A query that returns information about all wiki pages.
1677	1677	**
		@@ -1770,11 +1770,11 @@
1770	1770	fossil_free(zWDisplayName);
1771	1771	}
1772	1772	@ </tbody></table></div>
1773	1773	db_finalize(&q);
1774	1774	style_table_sorter();
1775		- style_finish_page("wiki");
	1775	+ style_finish_page();
1776	1776	}
1777	1777
1778	1778	/*
1779	1779	** WEBPAGE: wfind
1780	1780	**
		@@ -1798,11 +1798,11 @@
1798	1798	const char *zName = db_column_text(&q, 0);
1799	1799	@ <li>%z(href("%R/wiki?name=%T",zName))%h(zName)</a></li>
1800	1800	}
1801	1801	db_finalize(&q);
1802	1802	@ </ul>
1803		- style_finish_page("wiki");
	1803	+ style_finish_page();
1804	1804	}
1805	1805
1806	1806	/*
1807	1807	** Add a new wiki page to the repository. The page name is
1808	1808	** given by the zPageName parameter. rid must be zero to create
1809	1809

	--- src/wiki.c
	+++ src/wiki.c
	@@ -67,11 +67,11 @@
67	style_set_current_feature("wiki");
68	style_header("Wiki Page Name Error");
69	@ The wiki name "<span class="wikiError">%h(z)</span>" is not well-formed.
70	@ Rules for wiki page names:
71	well_formed_wiki_name_rules();
72	style_finish_page("wiki");
73	return 1;
74	}
75	return 0;
76	}
77
	@@ -143,11 +143,11 @@
143	@ To fill in this page, first go to
144	@ %z(href("%R/setup_config"))setup/config</a>
145	@ and establish a "Project Name". Then create a
146	@ wiki page with that name. The content of that wiki page
147	@ will be displayed in place of this message.</p>
148	style_finish_page("wiki");
149	}
150
151	/*
152	** Return true if the given pagename is the name of the sandbox
153	*/
	@@ -245,11 +245,11 @@
245	blob_materialize(&x);
246	interwiki_append_map_table(&x);
247	safe_html_context(DOCSRC_TRUSTED);
248	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-markdown");
249	blob_reset(&x);
250	style_finish_page("wiki");
251	}
252
253	/*
254	** WEBPAGE: wiki_rules
255	**
	@@ -270,11 +270,11 @@
270	blob_materialize(&x);
271	interwiki_append_map_table(&x);
272	safe_html_context(DOCSRC_TRUSTED);
273	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-fossil-wiki");
274	blob_reset(&x);
275	style_finish_page("wiki");
276	}
277
278	/*
279	** WEBPAGE: markup_help
280	**
	@@ -285,11 +285,11 @@
285	style_header("Fossil Markup Styles");
286	@ <ul>
287	@ <li><p>%z(href("%R/wiki_rules"))Fossil Wiki Formatting Rules</a></p></li>
288	@ <li><p>%z(href("%R/md_rules"))Markdown Formatting Rules</a></p></li>
289	@ </ul>
290	style_finish_page("wiki");
291	}
292
293	/*
294	** Returns non-zero if moderation is required for wiki changes and wiki
295	** attachments.
	@@ -375,11 +375,11 @@
375	if( search_restrict(SRCH_WIKI)!=0 ){
376	@ <li> %z(href("%R/wikisrch"))Search</a> for wiki pages containing key
377	@ words</li>
378	}
379	@ </ul>
380	style_finish_page("wiki");
381	return;
382	}
383
384	/*
385	** WEBPAGE: wikisrch
	@@ -391,11 +391,11 @@
391	login_check_credentials();
392	style_set_current_feature("wiki");
393	style_header("Wiki Search");
394	wiki_standard_submenu(W_HELP\|W_LIST\|W_SANDBOX);
395	search_screen(SRCH_WIKI, 0);
396	style_finish_page("wiki");
397	}
398
399	/* Return values from wiki_page_type() */
400	#if INTERFACE
401	# define WIKITYPE_UNKNOWN (-1)
	@@ -605,11 +605,11 @@
605	blob_reset(&wiki);
606	}
607	attachment_list(zPageName, "<hr /><h2>Attachments:</h2><ul>");
608	manifest_destroy(pWiki);
609	document_emit_js(/for optional pikchr support/);
610	style_finish_page("wiki");
611	}
612
613	/*
614	** Write a wiki artifact into the repository
615	*/
	@@ -1353,11 +1353,11 @@
1353	CX("}catch(e){"
1354	"fossil.error(e); console.error('Exception:',e);"
1355	"}\n");
1356	CX("});\n"/fossil.onPageLoad()/);
1357	style_script_end();
1358	style_finish_page("wiki");
1359	}
1360
1361	/*
1362	** WEBPAGE: wikinew
1363	** URL /wikinew
	@@ -1392,11 +1392,11 @@
1392	@ </p></form>
1393	if( zName[0] ){
1394	@ <p><span class="wikiError">
1395	@ "%h(zName)" is not a valid wiki page name!</span></p>
1396	}
1397	style_finish_page("wiki");
1398	}
1399
1400
1401	/*
1402	** Append the wiki text for an remark to the end of the given BLOB.
	@@ -1555,11 +1555,11 @@
1555	@ <input type="submit" name="preview" value="Preview Your Comment" />
1556	@ <input type="submit" name="submit" value="Append Your Changes" />
1557	@ <input type="submit" name="cancel" value="Cancel" />
1558	captcha_generate(0);
1559	@ </form>
1560	style_finish_page("wiki");
1561	}
1562
1563	/*
1564	** WEBPAGE: whistory
1565	** URL: /whistory?name=PAGENAME
	@@ -1594,11 +1594,11 @@
1594	www_print_timeline(&q,
1595	TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_REFS,
1596	0, 0, 0, 0, 0, 0);
1597	db_finalize(&q);
1598	blob_reset(&sql);
1599	style_finish_page("wiki");
1600	}
1601
1602	/*
1603	** WEBPAGE: wdiff
1604	**
	@@ -1667,11 +1667,11 @@
1667	@ <pre class="udiff">
1668	@ %s(blob_str(&d))
1669	@ <pre>
1670	manifest_destroy(pW1);
1671	manifest_destroy(pW2);
1672	style_finish_page("wiki");
1673	}
1674
1675	/*
1676	** A query that returns information about all wiki pages.
1677	**
	@@ -1770,11 +1770,11 @@
1770	fossil_free(zWDisplayName);
1771	}
1772	@ </tbody></table></div>
1773	db_finalize(&q);
1774	style_table_sorter();
1775	style_finish_page("wiki");
1776	}
1777
1778	/*
1779	** WEBPAGE: wfind
1780	**
	@@ -1798,11 +1798,11 @@
1798	const char *zName = db_column_text(&q, 0);
1799	@ <li>%z(href("%R/wiki?name=%T",zName))%h(zName)</a></li>
1800	}
1801	db_finalize(&q);
1802	@ </ul>
1803	style_finish_page("wiki");
1804	}
1805
1806	/*
1807	** Add a new wiki page to the repository. The page name is
1808	** given by the zPageName parameter. rid must be zero to create
1809

	--- src/wiki.c
	+++ src/wiki.c
	@@ -67,11 +67,11 @@
67	style_set_current_feature("wiki");
68	style_header("Wiki Page Name Error");
69	@ The wiki name "<span class="wikiError">%h(z)</span>" is not well-formed.
70	@ Rules for wiki page names:
71	well_formed_wiki_name_rules();
72	style_finish_page();
73	return 1;
74	}
75	return 0;
76	}
77
	@@ -143,11 +143,11 @@
143	@ To fill in this page, first go to
144	@ %z(href("%R/setup_config"))setup/config</a>
145	@ and establish a "Project Name". Then create a
146	@ wiki page with that name. The content of that wiki page
147	@ will be displayed in place of this message.</p>
148	style_finish_page();
149	}
150
151	/*
152	** Return true if the given pagename is the name of the sandbox
153	*/
	@@ -245,11 +245,11 @@
245	blob_materialize(&x);
246	interwiki_append_map_table(&x);
247	safe_html_context(DOCSRC_TRUSTED);
248	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-markdown");
249	blob_reset(&x);
250	style_finish_page();
251	}
252
253	/*
254	** WEBPAGE: wiki_rules
255	**
	@@ -270,11 +270,11 @@
270	blob_materialize(&x);
271	interwiki_append_map_table(&x);
272	safe_html_context(DOCSRC_TRUSTED);
273	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-fossil-wiki");
274	blob_reset(&x);
275	style_finish_page();
276	}
277
278	/*
279	** WEBPAGE: markup_help
280	**
	@@ -285,11 +285,11 @@
285	style_header("Fossil Markup Styles");
286	@ <ul>
287	@ <li><p>%z(href("%R/wiki_rules"))Fossil Wiki Formatting Rules</a></p></li>
288	@ <li><p>%z(href("%R/md_rules"))Markdown Formatting Rules</a></p></li>
289	@ </ul>
290	style_finish_page();
291	}
292
293	/*
294	** Returns non-zero if moderation is required for wiki changes and wiki
295	** attachments.
	@@ -375,11 +375,11 @@
375	if( search_restrict(SRCH_WIKI)!=0 ){
376	@ <li> %z(href("%R/wikisrch"))Search</a> for wiki pages containing key
377	@ words</li>
378	}
379	@ </ul>
380	style_finish_page();
381	return;
382	}
383
384	/*
385	** WEBPAGE: wikisrch
	@@ -391,11 +391,11 @@
391	login_check_credentials();
392	style_set_current_feature("wiki");
393	style_header("Wiki Search");
394	wiki_standard_submenu(W_HELP\|W_LIST\|W_SANDBOX);
395	search_screen(SRCH_WIKI, 0);
396	style_finish_page();
397	}
398
399	/* Return values from wiki_page_type() */
400	#if INTERFACE
401	# define WIKITYPE_UNKNOWN (-1)
	@@ -605,11 +605,11 @@
605	blob_reset(&wiki);
606	}
607	attachment_list(zPageName, "<hr /><h2>Attachments:</h2><ul>");
608	manifest_destroy(pWiki);
609	document_emit_js(/for optional pikchr support/);
610	style_finish_page();
611	}
612
613	/*
614	** Write a wiki artifact into the repository
615	*/
	@@ -1353,11 +1353,11 @@
1353	CX("}catch(e){"
1354	"fossil.error(e); console.error('Exception:',e);"
1355	"}\n");
1356	CX("});\n"/fossil.onPageLoad()/);
1357	style_script_end();
1358	style_finish_page();
1359	}
1360
1361	/*
1362	** WEBPAGE: wikinew
1363	** URL /wikinew
	@@ -1392,11 +1392,11 @@
1392	@ </p></form>
1393	if( zName[0] ){
1394	@ <p><span class="wikiError">
1395	@ "%h(zName)" is not a valid wiki page name!</span></p>
1396	}
1397	style_finish_page();
1398	}
1399
1400
1401	/*
1402	** Append the wiki text for an remark to the end of the given BLOB.
	@@ -1555,11 +1555,11 @@
1555	@ <input type="submit" name="preview" value="Preview Your Comment" />
1556	@ <input type="submit" name="submit" value="Append Your Changes" />
1557	@ <input type="submit" name="cancel" value="Cancel" />
1558	captcha_generate(0);
1559	@ </form>
1560	style_finish_page();
1561	}
1562
1563	/*
1564	** WEBPAGE: whistory
1565	** URL: /whistory?name=PAGENAME
	@@ -1594,11 +1594,11 @@
1594	www_print_timeline(&q,
1595	TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_REFS,
1596	0, 0, 0, 0, 0, 0);
1597	db_finalize(&q);
1598	blob_reset(&sql);
1599	style_finish_page();
1600	}
1601
1602	/*
1603	** WEBPAGE: wdiff
1604	**
	@@ -1667,11 +1667,11 @@
1667	@ <pre class="udiff">
1668	@ %s(blob_str(&d))
1669	@ <pre>
1670	manifest_destroy(pW1);
1671	manifest_destroy(pW2);
1672	style_finish_page();
1673	}
1674
1675	/*
1676	** A query that returns information about all wiki pages.
1677	**
	@@ -1770,11 +1770,11 @@
1770	fossil_free(zWDisplayName);
1771	}
1772	@ </tbody></table></div>
1773	db_finalize(&q);
1774	style_table_sorter();
1775	style_finish_page();
1776	}
1777
1778	/*
1779	** WEBPAGE: wfind
1780	**
	@@ -1798,11 +1798,11 @@
1798	const char *zName = db_column_text(&q, 0);
1799	@ <li>%z(href("%R/wiki?name=%T",zName))%h(zName)</a></li>
1800	}
1801	db_finalize(&q);
1802	@ </ul>
1803	style_finish_page();
1804	}
1805
1806	/*
1807	** Add a new wiki page to the repository. The page name is
1808	** given by the zPageName parameter. rid must be zero to create
1809

M src/xfersetup.c

+2 -2

		--- src/xfersetup.c
		+++ src/xfersetup.c
		@@ -85,11 +85,11 @@
85	85	client_sync(syncFlags, 0, 0, 0);
86	86	@ </pre>
87	87	}
88	88	}
89	89
90		- style_finish_page("xfersetup");
	90	+ style_finish_page();
91	91	}
92	92
93	93	/*
94	94	** Common implementation for the transfer setup editor pages.
95	95	*/
		@@ -151,11 +151,11 @@
151	151	@ <h2>Default %s(zTitle)</h2>
152	152	@ <blockquote><pre>
153	153	@ %h(zDfltValue)
154	154	@ </pre></blockquote>
155	155	}
156		- style_finish_page("xfersetup");
	156	+ style_finish_page();
157	157	}
158	158
159	159	static const char *zDefaultXferCommon = 0;
160	160
161	161	/*
162	162

	--- src/xfersetup.c
	+++ src/xfersetup.c
	@@ -85,11 +85,11 @@
85	client_sync(syncFlags, 0, 0, 0);
86	@ </pre>
87	}
88	}
89
90	style_finish_page("xfersetup");
91	}
92
93	/*
94	** Common implementation for the transfer setup editor pages.
95	*/
	@@ -151,11 +151,11 @@
151	@ <h2>Default %s(zTitle)</h2>
152	@ <blockquote><pre>
153	@ %h(zDfltValue)
154	@ </pre></blockquote>
155	}
156	style_finish_page("xfersetup");
157	}
158
159	static const char *zDefaultXferCommon = 0;
160
161	/*
162

	--- src/xfersetup.c
	+++ src/xfersetup.c
	@@ -85,11 +85,11 @@
85	client_sync(syncFlags, 0, 0, 0);
86	@ </pre>
87	}
88	}
89
90	style_finish_page();
91	}
92
93	/*
94	** Common implementation for the transfer setup editor pages.
95	*/
	@@ -151,11 +151,11 @@
151	@ <h2>Default %s(zTitle)</h2>
152	@ <blockquote><pre>
153	@ %h(zDfltValue)
154	@ </pre></blockquote>
155	}
156	style_finish_page();
157	}
158
159	static const char *zDefaultXferCommon = 0;
160
161	/*
162

M src/zip.c

+2 -2

		--- src/zip.c
		+++ src/zip.c
		@@ -956,11 +956,11 @@
956	956	}
957	957	if( zExclude ){
958	958	@ zExclude = "%h(zExclude)"<br />
959	959	}
960	960	@ zKey = "%h(zKey)"
961		- style_finish_page("zip");
	961	+ style_finish_page();
962	962	return;
963	963	}
964	964	if( referred_from_login() ){
965	965	style_header("%s Archive Download", zType);
966	966	@ <form action='%R/%s(g.zPath)/%h(zName).%s(g.zPath)'>
		@@ -967,11 +967,11 @@
967	967	cgi_query_parameters_to_hidden();
968	968	@ <p>%s(zType) Archive named <b>%h(zName).%s(g.zPath)</b>
969	969	@ holding the content of check-in <b>%h(zRid)</b>:
970	970	@ <input type="submit" value="Download" />
971	971	@ </form>
972		- style_finish_page("zip");
	972	+ style_finish_page();
973	973	return;
974	974	}
975	975	blob_zero(&zip);
976	976	if( cache_read(&zip, zKey)==0 ){
977	977	zip_of_checkin(eType, rid, &zip, zName, pInclude, pExclude);
978	978

	--- src/zip.c
	+++ src/zip.c
	@@ -956,11 +956,11 @@
956	}
957	if( zExclude ){
958	@ zExclude = "%h(zExclude)"<br />
959	}
960	@ zKey = "%h(zKey)"
961	style_finish_page("zip");
962	return;
963	}
964	if( referred_from_login() ){
965	style_header("%s Archive Download", zType);
966	@ <form action='%R/%s(g.zPath)/%h(zName).%s(g.zPath)'>
	@@ -967,11 +967,11 @@
967	cgi_query_parameters_to_hidden();
968	@ <p>%s(zType) Archive named <b>%h(zName).%s(g.zPath)</b>
969	@ holding the content of check-in <b>%h(zRid)</b>:
970	@ <input type="submit" value="Download" />
971	@ </form>
972	style_finish_page("zip");
973	return;
974	}
975	blob_zero(&zip);
976	if( cache_read(&zip, zKey)==0 ){
977	zip_of_checkin(eType, rid, &zip, zName, pInclude, pExclude);
978

	--- src/zip.c
	+++ src/zip.c
	@@ -956,11 +956,11 @@
956	}
957	if( zExclude ){
958	@ zExclude = "%h(zExclude)"<br />
959	}
960	@ zKey = "%h(zKey)"
961	style_finish_page();
962	return;
963	}
964	if( referred_from_login() ){
965	style_header("%s Archive Download", zType);
966	@ <form action='%R/%s(g.zPath)/%h(zName).%s(g.zPath)'>
	@@ -967,11 +967,11 @@
967	cgi_query_parameters_to_hidden();
968	@ <p>%s(zType) Archive named <b>%h(zName).%s(g.zPath)</b>
969	@ holding the content of check-in <b>%h(zRid)</b>:
970	@ <input type="submit" value="Download" />
971	@ </form>
972	style_finish_page();
973	return;
974	}
975	blob_zero(&zip);
976	if( cache_read(&zip, zKey)==0 ){
977	zip_of_checkin(eType, rid, &zip, zName, pInclude, pExclude);
978

Fossil SCM

Keyboard Shortcuts