942b2076c6a… — Fossil SCM

M src/alerts.c

+14 -14

		--- src/alerts.c
		+++ src/alerts.c
		@@ -173,11 +173,11 @@
173	173	*/
174	174	static int alert_webpages_disabled(void){
175	175	if( alert_tables_exist() ) return 0;
176	176	style_header("Email Alerts Are Disabled");
177	177	@ <p>Email alerts are disabled on this server</p>
178		- style_body_and_footer("alerts");
	178	+ style_finish_page("alerts");
179	179	return 1;
180	180	}
181	181
182	182	/*
183	183	** Insert a "Subscriber List" submenu link if the current user
		@@ -308,11 +308,11 @@
308	308	@ <hr>
309	309
310	310	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
311	311	@ </div></form>
312	312	db_end_transaction(0);
313		- style_body_and_footer("alerts");
	313	+ style_finish_page("alerts");
314	314	}
315	315
316	316	#if 0
317	317	/*
318	318	** Encode pMsg as MIME base64 and append it to pOut
		@@ -1435,11 +1435,11 @@
1435	1435	@ <p>An email has been sent to "%h(zEAddr)". That email contains a
1436	1436	@ hyperlink that you must click to activate your
1437	1437	@ subscription.</p>
1438	1438	}
1439	1439	alert_sender_free(pSender);
1440		- style_body_and_footer("alerts");
	1440	+ style_finish_page("alerts");
1441	1441	}
1442	1442	return;
1443	1443	}
1444	1444	style_header("Signup For Email Alerts");
1445	1445	if( P("submit")==0 ){
		@@ -1552,11 +1552,11 @@
1552	1552	@ Enter the 8 characters above in the "Security Code" box<br/>
1553	1553	@ </td></tr></table></div>
1554	1554	}
1555	1555	@ </form>
1556	1556	fossil_free(zErr);
1557		- style_body_and_footer("alerts");
	1557	+ style_finish_page("alerts");
1558	1558	}
1559	1559
1560	1560	/*
1561	1561	** Either shutdown or completely delete a subscription entry given
1562	1562	** by the hex value zName. Then paint a webpage that explains that
		@@ -1590,11 +1590,11 @@
1590	1590	@ <a href="%R/setup_uedit?id=%d(uid)">edit or delete
1591	1591	@ the corresponding user "%h(zLogin)"</a></p>
1592	1592	}
1593	1593	}
1594	1594	db_finalize(&q);
1595		- style_body_and_footer("alerts");
	1595	+ style_finish_page("alerts");
1596	1596	return;
1597	1597	}
1598	1598
1599	1599	/*
1600	1600	** WEBPAGE: alerts
		@@ -1914,11 +1914,11 @@
1914	1914	@ </tr>
1915	1915	@ </table>
1916	1916	@ </form>
1917	1917	fossil_free(zErr);
1918	1918	db_finalize(&q);
1919		- style_body_and_footer("alerts");
	1919	+ style_finish_page("alerts");
1920	1920	db_commit_transaction();
1921	1921	return;
1922	1922	}
1923	1923
1924	1924	/* This is the message that gets sent to describe how to change
		@@ -2021,11 +2021,11 @@
2021	2021	}else{
2022	2022	@ <p>An email has been sent to "%h(zEAddr)" that explains how to
2023	2023	@ unsubscribe and/or modify your subscription settings</p>
2024	2024	}
2025	2025	alert_sender_free(pSender);
2026		- style_body_and_footer("alerts");
	2026	+ style_finish_page("alerts");
2027	2027	return;
2028	2028	}
2029	2029
2030	2030	/* Non-logged-in users have to enter an email address to which is
2031	2031	** sent a message containing the unsubscribe link.
		@@ -2071,11 +2071,11 @@
2071	2071	@ </pre>
2072	2072	@ Enter the 8 characters above in the "Security Code" box<br/>
2073	2073	@ </td></tr></table></div>
2074	2074	@ </form>
2075	2075	fossil_free(zErr);
2076		- style_body_and_footer("alerts");
	2076	+ style_finish_page("alerts");
2077	2077	}
2078	2078
2079	2079	/*
2080	2080	** WEBPAGE: subscribers
2081	2081	**
		@@ -2182,11 +2182,11 @@
2182	2182	@ </tr>
2183	2183	}
2184	2184	@ </tbody></table>
2185	2185	db_finalize(&q);
2186	2186	style_table_sorter();
2187		- style_body_and_footer("alerts");
	2187	+ style_finish_page("alerts");
2188	2188	}
2189	2189
2190	2190	#if LOCAL_INTERFACE
2191	2191	/*
2192	2192	** A single event that might appear in an alert is recorded as an
		@@ -2802,11 +2802,11 @@
2802	2802
2803	2803	login_check_credentials();
2804	2804	if( zAdminEmail==0 \|\| zAdminEmail[0]==0 ){
2805	2805	style_header("Outbound Email Disabled");
2806	2806	@ <p>Outbound email is disabled on this repository
2807		- style_body_and_footer("alerts");
	2807	+ style_finish_page("alerts");
2808	2808	return;
2809	2809	}
2810	2810	if( P("submit")!=0
2811	2811	&& P("subject")!=0
2812	2812	&& P("msg")!=0
		@@ -2834,11 +2834,11 @@
2834	2834	}else{
2835	2835	@ <p>Your message has been sent to the repository administrator.
2836	2836	@ Thank you for your input.</p>
2837	2837	}
2838	2838	alert_sender_free(pSender);
2839		- style_body_and_footer("alerts");
	2839	+ style_finish_page("alerts");
2840	2840	return;
2841	2841	}
2842	2842	if( captcha_needed() ){
2843	2843	uSeed = captcha_seed();
2844	2844	zDecoded = captcha_decode(uSeed);
		@@ -2881,11 +2881,11 @@
2881	2881	@ </pre>
2882	2882	@ Enter the 8 characters above in the "Security Code" box<br/>
2883	2883	@ </td></tr></table></div>
2884	2884	}
2885	2885	@ </form>
2886		- style_body_and_footer("alerts");
	2886	+ style_finish_page("alerts");
2887	2887	}
2888	2888
2889	2889	/*
2890	2890	** Send an annoucement message described by query parameter.
2891	2891	** Permission to do this has already been verified.
		@@ -2989,11 +2989,11 @@
2989	2989	@ </pre></blockquote>
2990	2990	}else{
2991	2991	@ <p>The announcement has been sent.
2992	2992	@ <a href="%h(PD("REQUEST_URI","/"))">Send another</a></p>
2993	2993	}
2994		- style_body_and_footer("alerts");
	2994	+ style_finish_page("alerts");
2995	2995	return;
2996	2996	} else if( !alert_enabled() ){
2997	2997	style_header("Cannot Send Announcement");
2998	2998	@ <p>Either you have no subscribers yet, or email alerts are not yet
2999	2999	@ <a href="https://fossil-scm.org/fossil/doc/trunk/www/alerts.md">set up</a>
		@@ -3043,7 +3043,7 @@
3043	3043	@ <td><input type="submit" name="submit" value="Send Message">
3044	3044	}
3045	3045	@ </tr>
3046	3046	@ </table>
3047	3047	@ </form>
3048		- style_body_and_footer("alerts");
	3048	+ style_finish_page("alerts");
3049	3049	}
3050	3050

	--- src/alerts.c
	+++ src/alerts.c
	@@ -173,11 +173,11 @@
173	*/
174	static int alert_webpages_disabled(void){
175	if( alert_tables_exist() ) return 0;
176	style_header("Email Alerts Are Disabled");
177	@ <p>Email alerts are disabled on this server</p>
178	style_body_and_footer("alerts");
179	return 1;
180	}
181
182	/*
183	** Insert a "Subscriber List" submenu link if the current user
	@@ -308,11 +308,11 @@
308	@ <hr>
309
310	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
311	@ </div></form>
312	db_end_transaction(0);
313	style_body_and_footer("alerts");
314	}
315
316	#if 0
317	/*
318	** Encode pMsg as MIME base64 and append it to pOut
	@@ -1435,11 +1435,11 @@
1435	@ <p>An email has been sent to "%h(zEAddr)". That email contains a
1436	@ hyperlink that you must click to activate your
1437	@ subscription.</p>
1438	}
1439	alert_sender_free(pSender);
1440	style_body_and_footer("alerts");
1441	}
1442	return;
1443	}
1444	style_header("Signup For Email Alerts");
1445	if( P("submit")==0 ){
	@@ -1552,11 +1552,11 @@
1552	@ Enter the 8 characters above in the "Security Code" box<br/>
1553	@ </td></tr></table></div>
1554	}
1555	@ </form>
1556	fossil_free(zErr);
1557	style_body_and_footer("alerts");
1558	}
1559
1560	/*
1561	** Either shutdown or completely delete a subscription entry given
1562	** by the hex value zName. Then paint a webpage that explains that
	@@ -1590,11 +1590,11 @@
1590	@ <a href="%R/setup_uedit?id=%d(uid)">edit or delete
1591	@ the corresponding user "%h(zLogin)"</a></p>
1592	}
1593	}
1594	db_finalize(&q);
1595	style_body_and_footer("alerts");
1596	return;
1597	}
1598
1599	/*
1600	** WEBPAGE: alerts
	@@ -1914,11 +1914,11 @@
1914	@ </tr>
1915	@ </table>
1916	@ </form>
1917	fossil_free(zErr);
1918	db_finalize(&q);
1919	style_body_and_footer("alerts");
1920	db_commit_transaction();
1921	return;
1922	}
1923
1924	/* This is the message that gets sent to describe how to change
	@@ -2021,11 +2021,11 @@
2021	}else{
2022	@ <p>An email has been sent to "%h(zEAddr)" that explains how to
2023	@ unsubscribe and/or modify your subscription settings</p>
2024	}
2025	alert_sender_free(pSender);
2026	style_body_and_footer("alerts");
2027	return;
2028	}
2029
2030	/* Non-logged-in users have to enter an email address to which is
2031	** sent a message containing the unsubscribe link.
	@@ -2071,11 +2071,11 @@
2071	@ </pre>
2072	@ Enter the 8 characters above in the "Security Code" box<br/>
2073	@ </td></tr></table></div>
2074	@ </form>
2075	fossil_free(zErr);
2076	style_body_and_footer("alerts");
2077	}
2078
2079	/*
2080	** WEBPAGE: subscribers
2081	**
	@@ -2182,11 +2182,11 @@
2182	@ </tr>
2183	}
2184	@ </tbody></table>
2185	db_finalize(&q);
2186	style_table_sorter();
2187	style_body_and_footer("alerts");
2188	}
2189
2190	#if LOCAL_INTERFACE
2191	/*
2192	** A single event that might appear in an alert is recorded as an
	@@ -2802,11 +2802,11 @@
2802
2803	login_check_credentials();
2804	if( zAdminEmail==0 \|\| zAdminEmail[0]==0 ){
2805	style_header("Outbound Email Disabled");
2806	@ <p>Outbound email is disabled on this repository
2807	style_body_and_footer("alerts");
2808	return;
2809	}
2810	if( P("submit")!=0
2811	&& P("subject")!=0
2812	&& P("msg")!=0
	@@ -2834,11 +2834,11 @@
2834	}else{
2835	@ <p>Your message has been sent to the repository administrator.
2836	@ Thank you for your input.</p>
2837	}
2838	alert_sender_free(pSender);
2839	style_body_and_footer("alerts");
2840	return;
2841	}
2842	if( captcha_needed() ){
2843	uSeed = captcha_seed();
2844	zDecoded = captcha_decode(uSeed);
	@@ -2881,11 +2881,11 @@
2881	@ </pre>
2882	@ Enter the 8 characters above in the "Security Code" box<br/>
2883	@ </td></tr></table></div>
2884	}
2885	@ </form>
2886	style_body_and_footer("alerts");
2887	}
2888
2889	/*
2890	** Send an annoucement message described by query parameter.
2891	** Permission to do this has already been verified.
	@@ -2989,11 +2989,11 @@
2989	@ </pre></blockquote>
2990	}else{
2991	@ <p>The announcement has been sent.
2992	@ <a href="%h(PD("REQUEST_URI","/"))">Send another</a></p>
2993	}
2994	style_body_and_footer("alerts");
2995	return;
2996	} else if( !alert_enabled() ){
2997	style_header("Cannot Send Announcement");
2998	@ <p>Either you have no subscribers yet, or email alerts are not yet
2999	@ <a href="https://fossil-scm.org/fossil/doc/trunk/www/alerts.md">set up</a>
	@@ -3043,7 +3043,7 @@
3043	@ <td><input type="submit" name="submit" value="Send Message">
3044	}
3045	@ </tr>
3046	@ </table>
3047	@ </form>
3048	style_body_and_footer("alerts");
3049	}
3050

	--- src/alerts.c
	+++ src/alerts.c
	@@ -173,11 +173,11 @@
173	*/
174	static int alert_webpages_disabled(void){
175	if( alert_tables_exist() ) return 0;
176	style_header("Email Alerts Are Disabled");
177	@ <p>Email alerts are disabled on this server</p>
178	style_finish_page("alerts");
179	return 1;
180	}
181
182	/*
183	** Insert a "Subscriber List" submenu link if the current user
	@@ -308,11 +308,11 @@
308	@ <hr>
309
310	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
311	@ </div></form>
312	db_end_transaction(0);
313	style_finish_page("alerts");
314	}
315
316	#if 0
317	/*
318	** Encode pMsg as MIME base64 and append it to pOut
	@@ -1435,11 +1435,11 @@
1435	@ <p>An email has been sent to "%h(zEAddr)". That email contains a
1436	@ hyperlink that you must click to activate your
1437	@ subscription.</p>
1438	}
1439	alert_sender_free(pSender);
1440	style_finish_page("alerts");
1441	}
1442	return;
1443	}
1444	style_header("Signup For Email Alerts");
1445	if( P("submit")==0 ){
	@@ -1552,11 +1552,11 @@
1552	@ Enter the 8 characters above in the "Security Code" box<br/>
1553	@ </td></tr></table></div>
1554	}
1555	@ </form>
1556	fossil_free(zErr);
1557	style_finish_page("alerts");
1558	}
1559
1560	/*
1561	** Either shutdown or completely delete a subscription entry given
1562	** by the hex value zName. Then paint a webpage that explains that
	@@ -1590,11 +1590,11 @@
1590	@ <a href="%R/setup_uedit?id=%d(uid)">edit or delete
1591	@ the corresponding user "%h(zLogin)"</a></p>
1592	}
1593	}
1594	db_finalize(&q);
1595	style_finish_page("alerts");
1596	return;
1597	}
1598
1599	/*
1600	** WEBPAGE: alerts
	@@ -1914,11 +1914,11 @@
1914	@ </tr>
1915	@ </table>
1916	@ </form>
1917	fossil_free(zErr);
1918	db_finalize(&q);
1919	style_finish_page("alerts");
1920	db_commit_transaction();
1921	return;
1922	}
1923
1924	/* This is the message that gets sent to describe how to change
	@@ -2021,11 +2021,11 @@
2021	}else{
2022	@ <p>An email has been sent to "%h(zEAddr)" that explains how to
2023	@ unsubscribe and/or modify your subscription settings</p>
2024	}
2025	alert_sender_free(pSender);
2026	style_finish_page("alerts");
2027	return;
2028	}
2029
2030	/* Non-logged-in users have to enter an email address to which is
2031	** sent a message containing the unsubscribe link.
	@@ -2071,11 +2071,11 @@
2071	@ </pre>
2072	@ Enter the 8 characters above in the "Security Code" box<br/>
2073	@ </td></tr></table></div>
2074	@ </form>
2075	fossil_free(zErr);
2076	style_finish_page("alerts");
2077	}
2078
2079	/*
2080	** WEBPAGE: subscribers
2081	**
	@@ -2182,11 +2182,11 @@
2182	@ </tr>
2183	}
2184	@ </tbody></table>
2185	db_finalize(&q);
2186	style_table_sorter();
2187	style_finish_page("alerts");
2188	}
2189
2190	#if LOCAL_INTERFACE
2191	/*
2192	** A single event that might appear in an alert is recorded as an
	@@ -2802,11 +2802,11 @@
2802
2803	login_check_credentials();
2804	if( zAdminEmail==0 \|\| zAdminEmail[0]==0 ){
2805	style_header("Outbound Email Disabled");
2806	@ <p>Outbound email is disabled on this repository
2807	style_finish_page("alerts");
2808	return;
2809	}
2810	if( P("submit")!=0
2811	&& P("subject")!=0
2812	&& P("msg")!=0
	@@ -2834,11 +2834,11 @@
2834	}else{
2835	@ <p>Your message has been sent to the repository administrator.
2836	@ Thank you for your input.</p>
2837	}
2838	alert_sender_free(pSender);
2839	style_finish_page("alerts");
2840	return;
2841	}
2842	if( captcha_needed() ){
2843	uSeed = captcha_seed();
2844	zDecoded = captcha_decode(uSeed);
	@@ -2881,11 +2881,11 @@
2881	@ </pre>
2882	@ Enter the 8 characters above in the "Security Code" box<br/>
2883	@ </td></tr></table></div>
2884	}
2885	@ </form>
2886	style_finish_page("alerts");
2887	}
2888
2889	/*
2890	** Send an annoucement message described by query parameter.
2891	** Permission to do this has already been verified.
	@@ -2989,11 +2989,11 @@
2989	@ </pre></blockquote>
2990	}else{
2991	@ <p>The announcement has been sent.
2992	@ <a href="%h(PD("REQUEST_URI","/"))">Send another</a></p>
2993	}
2994	style_finish_page("alerts");
2995	return;
2996	} else if( !alert_enabled() ){
2997	style_header("Cannot Send Announcement");
2998	@ <p>Either you have no subscribers yet, or email alerts are not yet
2999	@ <a href="https://fossil-scm.org/fossil/doc/trunk/www/alerts.md">set up</a>
	@@ -3043,7 +3043,7 @@
3043	@ <td><input type="submit" name="submit" value="Send Message">
3044	}
3045	@ </tr>
3046	@ </table>
3047	@ </form>
3048	style_finish_page("alerts");
3049	}
3050

M src/attach.c

+5 -5

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

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

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

M src/backlink.c

+2 -2

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

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

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

M src/branch.c

+3 -3

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

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

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

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_body_and_footer("dir");
	341	+ style_finish_page("dir");
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_body_and_footer("dir");
	402	+ style_finish_page("dir");
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_body_and_footer("tree");
	918	+ style_finish_page("tree");
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_body_and_footer("fileage");
	1172	+ style_finish_page("fileage");
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_body_and_footer("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_body_and_footer("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_body_and_footer("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_body_and_footer("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("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

M src/builtin.c

+1 -1

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

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

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

M src/cache.c

+2 -2

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

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

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

M src/captcha.c

+2 -2

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

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

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

M src/clone.c

+1 -1

		--- src/clone.c
		+++ src/clone.c
		@@ -406,7 +406,7 @@
406	406	@ <p>Clone the repository using this command:
407	407	@ <blockquote><pre>
408	408	@ fossil clone %s(g.zBaseURL) %h(zNm).fossil
409	409	@ </pre></blockquote>
410	410	}
411		- style_body_and_footer("download");
	411	+ style_finish_page("download");
412	412	}
413	413

	--- src/clone.c
	+++ src/clone.c
	@@ -406,7 +406,7 @@
406	@ <p>Clone the repository using this command:
407	@ <blockquote><pre>
408	@ fossil clone %s(g.zBaseURL) %h(zNm).fossil
409	@ </pre></blockquote>
410	}
411	style_body_and_footer("download");
412	}
413

	--- src/clone.c
	+++ src/clone.c
	@@ -406,7 +406,7 @@
406	@ <p>Clone the repository using this command:
407	@ <blockquote><pre>
408	@ fossil clone %s(g.zBaseURL) %h(zNm).fossil
409	@ </pre></blockquote>
410	}
411	style_finish_page("download");
412	}
413

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_body_and_footer("cookies");
	230	+ style_finish_page("cookies");
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_body_and_footer("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("cookies");
231	}
232

M src/descendants.c

+1 -1

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

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

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

M src/diff.c

+1 -1

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

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

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

M src/dispatch.c

+2 -2

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

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

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

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_body_and_footer("mimetypes");
	560	+ style_finish_page("mimetypes");
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_body_and_footer("doc");
	775	+ style_finish_page("doc");
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_body_and_footer("doc");
	786	+ style_finish_page("doc");
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_body_and_footer("doc");
	793	+ style_finish_page("doc");
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_body_and_footer("doc");
	800	+ style_finish_page("doc");
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_body_and_footer("doc");
	805	+ style_finish_page("doc");
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_body_and_footer("doc");
	826	+ style_finish_page("doc");
827	827	}
828	828	#endif
829	829	}else{
830	830	fossil_free(style_csp(1));
831	831	cgi_set_content_type(zMime);
		@@ -1029,11 +1029,11 @@
1029	1029	style_header("Not Found");
1030	1030	@ <p>Document %h(zOrigName) not found
1031	1031	if( fossil_strcmp(zCheckin,"ckout")!=0 ){
1032	1032	@ in %z(href("%R/tree?ci=%T",zCheckin))%h(zCheckin)</a>
1033	1033	}
1034		- style_body_and_footer("doc");
	1034	+ style_finish_page("doc");
1035	1035	return;
1036	1036	}
1037	1037
1038	1038	/*
1039	1039	** The default logo.
		@@ -1202,7 +1202,7 @@
1202	1202	*/
1203	1203	void doc_search_page(void){
1204	1204	login_check_credentials();
1205	1205	style_header("Document Search");
1206	1206	search_screen(SRCH_DOC, 0);
1207		- style_body_and_footer("docsrch");
	1207	+ style_finish_page("docsrch");
1208	1208	}
1209	1209

	--- 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_body_and_footer("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_body_and_footer("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_body_and_footer("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_body_and_footer("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_body_and_footer("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_body_and_footer("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_body_and_footer("doc");
827	}
828	#endif
829	}else{
830	fossil_free(style_csp(1));
831	cgi_set_content_type(zMime);
	@@ -1029,11 +1029,11 @@
1029	style_header("Not Found");
1030	@ <p>Document %h(zOrigName) not found
1031	if( fossil_strcmp(zCheckin,"ckout")!=0 ){
1032	@ in %z(href("%R/tree?ci=%T",zCheckin))%h(zCheckin)</a>
1033	}
1034	style_body_and_footer("doc");
1035	return;
1036	}
1037
1038	/*
1039	** The default logo.
	@@ -1202,7 +1202,7 @@
1202	*/
1203	void doc_search_page(void){
1204	login_check_credentials();
1205	style_header("Document Search");
1206	search_screen(SRCH_DOC, 0);
1207	style_body_and_footer("docsrch");
1208	}
1209

	--- 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);
	@@ -1029,11 +1029,11 @@
1029	style_header("Not Found");
1030	@ <p>Document %h(zOrigName) not found
1031	if( fossil_strcmp(zCheckin,"ckout")!=0 ){
1032	@ in %z(href("%R/tree?ci=%T",zCheckin))%h(zCheckin)</a>
1033	}
1034	style_finish_page("doc");
1035	return;
1036	}
1037
1038	/*
1039	** The default logo.
	@@ -1202,7 +1202,7 @@
1202	*/
1203	void doc_search_page(void){
1204	login_check_credentials();
1205	style_header("Document Search");
1206	search_screen(SRCH_DOC, 0);
1207	style_finish_page("docsrch");
1208	}
1209

M src/event.c

+4 -4

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

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

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

M src/extcgi.c

+1 -1

		--- src/extcgi.c
		+++ src/extcgi.c
		@@ -416,7 +416,7 @@
416	416	@ </tr>
417	417	}
418	418	db_finalize(&q);
419	419	@ </tbody>
420	420	@ </table>
421		- style_body_and_footer("extcgi");
	421	+ style_finish_page("extcgi");
422	422	}
423	423

	--- src/extcgi.c
	+++ src/extcgi.c
	@@ -416,7 +416,7 @@
416	@ </tr>
417	}
418	db_finalize(&q);
419	@ </tbody>
420	@ </table>
421	style_body_and_footer("extcgi");
422	}
423

	--- src/extcgi.c
	+++ src/extcgi.c
	@@ -416,7 +416,7 @@
416	@ </tr>
417	}
418	db_finalize(&q);
419	@ </tbody>
420	@ </table>
421	style_finish_page("extcgi");
422	}
423

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_body_and_footer("fileedit");
	1611	+ style_finish_page("fileedit");
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_body_and_footer("fileedit");
	2066	+ style_finish_page("fileedit");
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_body_and_footer("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_body_and_footer("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("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

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_body_and_footer("finfo");
	372	+ style_finish_page("finfo");
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_body_and_footer("finfo");
	759	+ style_finish_page("finfo");
760	760	}
761	761
762	762	/*
763	763	** WEBPAGE: mlink
764	764	** URL: /mlink?name=FILENAME
		@@ -934,7 +934,7 @@
934	934	db_finalize(&q);
935	935	@ </tbody>
936	936	@ </table>
937	937	@ </div>
938	938	}
939		- style_body_and_footer("finfo");
	939	+ style_finish_page("finfo");
940	940	}
941	941

	--- 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_body_and_footer("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_body_and_footer("finfo");
760	}
761
762	/*
763	** WEBPAGE: mlink
764	** URL: /mlink?name=FILENAME
	@@ -934,7 +934,7 @@
934	db_finalize(&q);
935	@ </tbody>
936	@ </table>
937	@ </div>
938	}
939	style_body_and_footer("finfo");
940	}
941

	--- 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
	@@ -934,7 +934,7 @@
934	db_finalize(&q);
935	@ </tbody>
936	@ </table>
937	@ </div>
938	}
939	style_finish_page("finfo");
940	}
941

M src/forum.c

+6 -6

		--- src/forum.c
		+++ src/forum.c
		@@ -878,11 +878,11 @@
878	878	/* Emit Forum Javascript. */
879	879	builtin_request_js("forum.js");
880	880	forum_emit_js();
881	881
882	882	/* Emit the page style. */
883		- style_body_and_footer("forum");
	883	+ style_finish_page("forum");
884	884	}
885	885
886	886	/*
887	887	** Return true if a forum post should be moderated.
888	888	*/
		@@ -1074,11 +1074,11 @@
1074	1074	@ <input type="submit" value="Login">
1075	1075	@ </form>
1076	1076	@ <td>Log into an existing account
1077	1077	@ </table>
1078	1078	forum_emit_js();
1079		- style_body_and_footer("forum");
	1079	+ style_finish_page("forum");
1080	1080	fossil_free(zGoto);
1081	1081	}
1082	1082
1083	1083	/*
1084	1084	** Write the "From: USER" line on the webpage.
		@@ -1135,11 +1135,11 @@
1135	1135	@ Show query parameters</label>
1136	1136	@ </div>
1137	1137	}
1138	1138	@ </form>
1139	1139	forum_emit_js();
1140		- style_body_and_footer("forum");
	1140	+ style_finish_page("forum");
1141	1141	}
1142	1142
1143	1143	/*
1144	1144	** WEBPAGE: forume2
1145	1145	**
		@@ -1315,11 +1315,11 @@
1315	1315	@ Show query parameters</label>
1316	1316	@ </div>
1317	1317	}
1318	1318	@ </form>
1319	1319	forum_emit_js();
1320		- style_body_and_footer("forum");
	1320	+ style_finish_page("forum");
1321	1321	}
1322	1322
1323	1323	/*
1324	1324	** WEBPAGE: forummain
1325	1325	** WEBPAGE: forum
		@@ -1357,11 +1357,11 @@
1357	1357	style_submenu_element("Moderation Requests", "%R/modreq");
1358	1358	}
1359	1359	if( (srchFlags & SRCH_FORUM)!=0 ){
1360	1360	if( search_screen(SRCH_FORUM, 0) ){
1361	1361	style_submenu_element("Recent Threads","%R/forum");
1362		- style_body_and_footer("forum");
	1362	+ style_finish_page("forum");
1363	1363	return;
1364	1364	}
1365	1365	}
1366	1366	iLimit = atoi(PD("n","25"));
1367	1367	iOfst = atoi(PD("x","0"));
		@@ -1450,7 +1450,7 @@
1450	1450	if( iCnt>0 ){
1451	1451	@ </table></div>
1452	1452	}else{
1453	1453	@ <h1>No forum posts found</h1>
1454	1454	}
1455		- style_body_and_footer("forum");
	1455	+ style_finish_page("forum");
1456	1456	}
1457	1457

	--- src/forum.c
	+++ src/forum.c
	@@ -878,11 +878,11 @@
878	/* Emit Forum Javascript. */
879	builtin_request_js("forum.js");
880	forum_emit_js();
881
882	/* Emit the page style. */
883	style_body_and_footer("forum");
884	}
885
886	/*
887	** Return true if a forum post should be moderated.
888	*/
	@@ -1074,11 +1074,11 @@
1074	@ <input type="submit" value="Login">
1075	@ </form>
1076	@ <td>Log into an existing account
1077	@ </table>
1078	forum_emit_js();
1079	style_body_and_footer("forum");
1080	fossil_free(zGoto);
1081	}
1082
1083	/*
1084	** Write the "From: USER" line on the webpage.
	@@ -1135,11 +1135,11 @@
1135	@ Show query parameters</label>
1136	@ </div>
1137	}
1138	@ </form>
1139	forum_emit_js();
1140	style_body_and_footer("forum");
1141	}
1142
1143	/*
1144	** WEBPAGE: forume2
1145	**
	@@ -1315,11 +1315,11 @@
1315	@ Show query parameters</label>
1316	@ </div>
1317	}
1318	@ </form>
1319	forum_emit_js();
1320	style_body_and_footer("forum");
1321	}
1322
1323	/*
1324	** WEBPAGE: forummain
1325	** WEBPAGE: forum
	@@ -1357,11 +1357,11 @@
1357	style_submenu_element("Moderation Requests", "%R/modreq");
1358	}
1359	if( (srchFlags & SRCH_FORUM)!=0 ){
1360	if( search_screen(SRCH_FORUM, 0) ){
1361	style_submenu_element("Recent Threads","%R/forum");
1362	style_body_and_footer("forum");
1363	return;
1364	}
1365	}
1366	iLimit = atoi(PD("n","25"));
1367	iOfst = atoi(PD("x","0"));
	@@ -1450,7 +1450,7 @@
1450	if( iCnt>0 ){
1451	@ </table></div>
1452	}else{
1453	@ <h1>No forum posts found</h1>
1454	}
1455	style_body_and_footer("forum");
1456	}
1457

	--- src/forum.c
	+++ src/forum.c
	@@ -878,11 +878,11 @@
878	/* Emit Forum Javascript. */
879	builtin_request_js("forum.js");
880	forum_emit_js();
881
882	/* Emit the page style. */
883	style_finish_page("forum");
884	}
885
886	/*
887	** Return true if a forum post should be moderated.
888	*/
	@@ -1074,11 +1074,11 @@
1074	@ <input type="submit" value="Login">
1075	@ </form>
1076	@ <td>Log into an existing account
1077	@ </table>
1078	forum_emit_js();
1079	style_finish_page("forum");
1080	fossil_free(zGoto);
1081	}
1082
1083	/*
1084	** Write the "From: USER" line on the webpage.
	@@ -1135,11 +1135,11 @@
1135	@ Show query parameters</label>
1136	@ </div>
1137	}
1138	@ </form>
1139	forum_emit_js();
1140	style_finish_page("forum");
1141	}
1142
1143	/*
1144	** WEBPAGE: forume2
1145	**
	@@ -1315,11 +1315,11 @@
1315	@ Show query parameters</label>
1316	@ </div>
1317	}
1318	@ </form>
1319	forum_emit_js();
1320	style_finish_page("forum");
1321	}
1322
1323	/*
1324	** WEBPAGE: forummain
1325	** WEBPAGE: forum
	@@ -1357,11 +1357,11 @@
1357	style_submenu_element("Moderation Requests", "%R/modreq");
1358	}
1359	if( (srchFlags & SRCH_FORUM)!=0 ){
1360	if( search_screen(SRCH_FORUM, 0) ){
1361	style_submenu_element("Recent Threads","%R/forum");
1362	style_finish_page("forum");
1363	return;
1364	}
1365	}
1366	iLimit = atoi(PD("n","25"));
1367	iOfst = atoi(PD("x","0"));
	@@ -1450,7 +1450,7 @@
1450	if( iCnt>0 ){
1451	@ </table></div>
1452	}else{
1453	@ <h1>No forum posts found</h1>
1454	}
1455	style_finish_page("forum");
1456	}
1457

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_body_and_footer("ci_tags");
	508	+ style_finish_page("ci_tags");
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_body_and_footer("ci_tags");
	600	+ style_finish_page("ci_tags");
601	601	}
602	602
603	603	/*
604	604	** WEBPAGE: vinfo
605	605	** WEBPAGE: ci
		@@ -634,11 +634,11 @@
634	634	zName = P("name");
635	635	rid = name_to_rid_www("name");
636	636	if( rid==0 ){
637	637	style_header("Check-in Information Error");
638	638	@ No such object: %h(g.argv[2])
639		- style_body_and_footer("vinfo");
	639	+ style_finish_page("vinfo");
640	640	return;
641	641	}
642	642	zRe = P("regex");
643	643	if( zRe ) re_compile(&pRe, zRe, 0);
644	644	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
		@@ -940,11 +940,11 @@
940	940	diffFlags,pRe,mperm);
941	941	}
942	942	db_finalize(&q3);
943	943	append_diff_javascript(diffType==2);
944	944	cookie_render();
945		- style_body_and_footer("vinfo");
	945	+ style_finish_page("vinfo");
946	946	}
947	947
948	948	/*
949	949	** WEBPAGE: winfo
950	950	** URL: /winfo?name=HASH
		@@ -966,11 +966,11 @@
966	966	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
967	967	rid = name_to_rid_www("name");
968	968	if( rid==0 \|\| (pWiki = manifest_get(rid, CFTYPE_WIKI, 0))==0 ){
969	969	style_header("Wiki Page Information Error");
970	970	@ No such object: %h(P("name"))
971		- style_body_and_footer("winfo");
	971	+ style_finish_page("winfo");
972	972	return;
973	973	}
974	974	if( g.perm.ModWiki && (zModAction = P("modaction"))!=0 ){
975	975	if( strcmp(zModAction,"delete")==0 ){
976	976	moderation_disapprove(rid);
		@@ -1054,11 +1054,11 @@
1054	1054	safe_html_context(DOCSRC_WIKI);
1055	1055	wiki_render_by_mimetype(&wiki, pWiki->zMimetype);
1056	1056	blob_reset(&wiki);
1057	1057	manifest_destroy(pWiki);
1058	1058	document_emit_js();
1059		- style_body_and_footer("winfo");
	1059	+ style_finish_page("winfo");
1060	1060	}
1061	1061
1062	1062	/*
1063	1063	** Find an check-in based on query parameter zParam and parse its
1064	1064	** manifest. Return the number of errors.
		@@ -1327,11 +1327,11 @@
1327	1327	}
1328	1328	}
1329	1329	manifest_destroy(pFrom);
1330	1330	manifest_destroy(pTo);
1331	1331	append_diff_javascript(diffType==2);
1332		- style_body_and_footer("vdiff");
	1332	+ style_finish_page("vdiff");
1333	1333	}
1334	1334
1335	1335	#if INTERFACE
1336	1336	/*
1337	1337	** Possible return values from object_description()
		@@ -1761,11 +1761,11 @@
1761	1761	@ are shown.</b>
1762	1762	}
1763	1763	@ <hr />
1764	1764	append_diff(zV1, zV2, diffFlags, pRe);
1765	1765	append_diff_javascript(diffType);
1766		- style_body_and_footer("fdiff");
	1766	+ style_finish_page("fdiff");
1767	1767	}
1768	1768
1769	1769	/*
1770	1770	** WEBPAGE: raw
1771	1771	** URL: /raw/ARTIFACTID
		@@ -1965,11 +1965,11 @@
1965	1965	@ <hr />
1966	1966	content_get(rid, &content);
1967	1967	@ <blockquote><pre>
1968	1968	hexdump(&content);
1969	1969	@ </pre></blockquote>
1970		- style_body_and_footer("hexdump");
	1970	+ style_finish_page("hexdump");
1971	1971	}
1972	1972
1973	1973	/*
1974	1974	** Look for "ci" and "filename" query parameters. If found, try to
1975	1975	** use them to extract the record ID of an artifact for the file.
		@@ -2263,11 +2263,11 @@
2263	2263	page_tree();
2264	2264	return;
2265	2265	}
2266	2266	style_header("Missing name= query parameter");
2267	2267	@ The name= query parameter is missing
2268		- style_body_and_footer("artifact");
	2268	+ style_finish_page("artifact");
2269	2269	return;
2270	2270	}
2271	2271
2272	2272	url_initialize(&url, g.zPath);
2273	2273	url_add_parameter(&url, "name", zName);
		@@ -2324,11 +2324,11 @@
2324	2324	}else{
2325	2325	style_header("No such artifact");
2326	2326	@ Artifact '%h(zName)' does not exist in this repository.
2327	2327	}
2328	2328	if( rid==0 ){
2329		- style_body_and_footer("artifact");
	2329	+ style_finish_page("artifact");
2330	2330	return;
2331	2331	}
2332	2332	}
2333	2333
2334	2334	if( descOnly \|\| P("verbose")!=0 ){
		@@ -2529,11 +2529,11 @@
2529	2529	@ <i>(file is %d(blob_size(&content)) bytes of binary data)</i>
2530	2530	}
2531	2531	@ </blockquote>
2532	2532	}
2533	2533	}
2534		- style_body_and_footer("artifact");
	2534	+ style_finish_page("artifact");
2535	2535	}
2536	2536
2537	2537	/*
2538	2538	** WEBPAGE: tinfo
2539	2539	** URL: /tinfo?name=ARTIFACTID
		@@ -2636,11 +2636,11 @@
2636	2636
2637	2637	@ <div class="section">Changes</div>
2638	2638	@ <p>
2639	2639	ticket_output_change_artifact(pTktChng, 0, 1);
2640	2640	manifest_destroy(pTktChng);
2641		- style_body_and_footer("tinfo");
	2641	+ style_finish_page("tinfo");
2642	2642	}
2643	2643
2644	2644
2645	2645	/*
2646	2646	** WEBPAGE: info
		@@ -2687,11 +2687,11 @@
2687	2687	@ <p>No such object: %h(zName)</p>
2688	2688	if( nLen<4 ){
2689	2689	@ <p>Object name should be no less than 4 characters. Ten or more
2690	2690	@ characters are recommended.</p>
2691	2691	}
2692		- style_body_and_footer("info");
	2692	+ style_finish_page("info");
2693	2693	return;
2694	2694	}else if( rc==2 ){
2695	2695	cgi_set_parameter("src","info");
2696	2696	ambiguous_page();
2697	2697	return;
		@@ -2699,11 +2699,11 @@
2699	2699	zName = blob_str(&uuid);
2700	2700	rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", zName);
2701	2701	if( rid==0 ){
2702	2702	style_header("Broken Link");
2703	2703	@ <p>No such object: %h(zName)</p>
2704		- style_body_and_footer("info");
	2704	+ style_finish_page("info");
2705	2705	return;
2706	2706	}
2707	2707	if( db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
2708	2708	ci_page();
2709	2709	}else
		@@ -3224,11 +3224,11 @@
3224	3224	}
3225	3225	@ </td></tr>
3226	3226	@ </table>
3227	3227	@ </div></form>
3228	3228	builtin_request_js("ci_edit.js");
3229		- style_body_and_footer("ci_edit");
	3229	+ style_finish_page("ci_edit");
3230	3230	}
3231	3231
3232	3232	/*
3233	3233	** Prepare an ammended commit comment. Let the user modify it using the
3234	3234	** editor specified in the global_config table or either
3235	3235

	--- 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_body_and_footer("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_body_and_footer("ci_tags");
601	}
602
603	/*
604	** WEBPAGE: vinfo
605	** WEBPAGE: ci
	@@ -634,11 +634,11 @@
634	zName = P("name");
635	rid = name_to_rid_www("name");
636	if( rid==0 ){
637	style_header("Check-in Information Error");
638	@ No such object: %h(g.argv[2])
639	style_body_and_footer("vinfo");
640	return;
641	}
642	zRe = P("regex");
643	if( zRe ) re_compile(&pRe, zRe, 0);
644	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
	@@ -940,11 +940,11 @@
940	diffFlags,pRe,mperm);
941	}
942	db_finalize(&q3);
943	append_diff_javascript(diffType==2);
944	cookie_render();
945	style_body_and_footer("vinfo");
946	}
947
948	/*
949	** WEBPAGE: winfo
950	** URL: /winfo?name=HASH
	@@ -966,11 +966,11 @@
966	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
967	rid = name_to_rid_www("name");
968	if( rid==0 \|\| (pWiki = manifest_get(rid, CFTYPE_WIKI, 0))==0 ){
969	style_header("Wiki Page Information Error");
970	@ No such object: %h(P("name"))
971	style_body_and_footer("winfo");
972	return;
973	}
974	if( g.perm.ModWiki && (zModAction = P("modaction"))!=0 ){
975	if( strcmp(zModAction,"delete")==0 ){
976	moderation_disapprove(rid);
	@@ -1054,11 +1054,11 @@
1054	safe_html_context(DOCSRC_WIKI);
1055	wiki_render_by_mimetype(&wiki, pWiki->zMimetype);
1056	blob_reset(&wiki);
1057	manifest_destroy(pWiki);
1058	document_emit_js();
1059	style_body_and_footer("winfo");
1060	}
1061
1062	/*
1063	** Find an check-in based on query parameter zParam and parse its
1064	** manifest. Return the number of errors.
	@@ -1327,11 +1327,11 @@
1327	}
1328	}
1329	manifest_destroy(pFrom);
1330	manifest_destroy(pTo);
1331	append_diff_javascript(diffType==2);
1332	style_body_and_footer("vdiff");
1333	}
1334
1335	#if INTERFACE
1336	/*
1337	** Possible return values from object_description()
	@@ -1761,11 +1761,11 @@
1761	@ are shown.</b>
1762	}
1763	@ <hr />
1764	append_diff(zV1, zV2, diffFlags, pRe);
1765	append_diff_javascript(diffType);
1766	style_body_and_footer("fdiff");
1767	}
1768
1769	/*
1770	** WEBPAGE: raw
1771	** URL: /raw/ARTIFACTID
	@@ -1965,11 +1965,11 @@
1965	@ <hr />
1966	content_get(rid, &content);
1967	@ <blockquote><pre>
1968	hexdump(&content);
1969	@ </pre></blockquote>
1970	style_body_and_footer("hexdump");
1971	}
1972
1973	/*
1974	** Look for "ci" and "filename" query parameters. If found, try to
1975	** use them to extract the record ID of an artifact for the file.
	@@ -2263,11 +2263,11 @@
2263	page_tree();
2264	return;
2265	}
2266	style_header("Missing name= query parameter");
2267	@ The name= query parameter is missing
2268	style_body_and_footer("artifact");
2269	return;
2270	}
2271
2272	url_initialize(&url, g.zPath);
2273	url_add_parameter(&url, "name", zName);
	@@ -2324,11 +2324,11 @@
2324	}else{
2325	style_header("No such artifact");
2326	@ Artifact '%h(zName)' does not exist in this repository.
2327	}
2328	if( rid==0 ){
2329	style_body_and_footer("artifact");
2330	return;
2331	}
2332	}
2333
2334	if( descOnly \|\| P("verbose")!=0 ){
	@@ -2529,11 +2529,11 @@
2529	@ <i>(file is %d(blob_size(&content)) bytes of binary data)</i>
2530	}
2531	@ </blockquote>
2532	}
2533	}
2534	style_body_and_footer("artifact");
2535	}
2536
2537	/*
2538	** WEBPAGE: tinfo
2539	** URL: /tinfo?name=ARTIFACTID
	@@ -2636,11 +2636,11 @@
2636
2637	@ <div class="section">Changes</div>
2638	@ <p>
2639	ticket_output_change_artifact(pTktChng, 0, 1);
2640	manifest_destroy(pTktChng);
2641	style_body_and_footer("tinfo");
2642	}
2643
2644
2645	/*
2646	** WEBPAGE: info
	@@ -2687,11 +2687,11 @@
2687	@ <p>No such object: %h(zName)</p>
2688	if( nLen<4 ){
2689	@ <p>Object name should be no less than 4 characters. Ten or more
2690	@ characters are recommended.</p>
2691	}
2692	style_body_and_footer("info");
2693	return;
2694	}else if( rc==2 ){
2695	cgi_set_parameter("src","info");
2696	ambiguous_page();
2697	return;
	@@ -2699,11 +2699,11 @@
2699	zName = blob_str(&uuid);
2700	rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", zName);
2701	if( rid==0 ){
2702	style_header("Broken Link");
2703	@ <p>No such object: %h(zName)</p>
2704	style_body_and_footer("info");
2705	return;
2706	}
2707	if( db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
2708	ci_page();
2709	}else
	@@ -3224,11 +3224,11 @@
3224	}
3225	@ </td></tr>
3226	@ </table>
3227	@ </div></form>
3228	builtin_request_js("ci_edit.js");
3229	style_body_and_footer("ci_edit");
3230	}
3231
3232	/*
3233	** Prepare an ammended commit comment. Let the user modify it using the
3234	** editor specified in the global_config table or either
3235

	--- 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
	@@ -634,11 +634,11 @@
634	zName = P("name");
635	rid = name_to_rid_www("name");
636	if( rid==0 ){
637	style_header("Check-in Information Error");
638	@ No such object: %h(g.argv[2])
639	style_finish_page("vinfo");
640	return;
641	}
642	zRe = P("regex");
643	if( zRe ) re_compile(&pRe, zRe, 0);
644	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
	@@ -940,11 +940,11 @@
940	diffFlags,pRe,mperm);
941	}
942	db_finalize(&q3);
943	append_diff_javascript(diffType==2);
944	cookie_render();
945	style_finish_page("vinfo");
946	}
947
948	/*
949	** WEBPAGE: winfo
950	** URL: /winfo?name=HASH
	@@ -966,11 +966,11 @@
966	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
967	rid = name_to_rid_www("name");
968	if( rid==0 \|\| (pWiki = manifest_get(rid, CFTYPE_WIKI, 0))==0 ){
969	style_header("Wiki Page Information Error");
970	@ No such object: %h(P("name"))
971	style_finish_page("winfo");
972	return;
973	}
974	if( g.perm.ModWiki && (zModAction = P("modaction"))!=0 ){
975	if( strcmp(zModAction,"delete")==0 ){
976	moderation_disapprove(rid);
	@@ -1054,11 +1054,11 @@
1054	safe_html_context(DOCSRC_WIKI);
1055	wiki_render_by_mimetype(&wiki, pWiki->zMimetype);
1056	blob_reset(&wiki);
1057	manifest_destroy(pWiki);
1058	document_emit_js();
1059	style_finish_page("winfo");
1060	}
1061
1062	/*
1063	** Find an check-in based on query parameter zParam and parse its
1064	** manifest. Return the number of errors.
	@@ -1327,11 +1327,11 @@
1327	}
1328	}
1329	manifest_destroy(pFrom);
1330	manifest_destroy(pTo);
1331	append_diff_javascript(diffType==2);
1332	style_finish_page("vdiff");
1333	}
1334
1335	#if INTERFACE
1336	/*
1337	** Possible return values from object_description()
	@@ -1761,11 +1761,11 @@
1761	@ are shown.</b>
1762	}
1763	@ <hr />
1764	append_diff(zV1, zV2, diffFlags, pRe);
1765	append_diff_javascript(diffType);
1766	style_finish_page("fdiff");
1767	}
1768
1769	/*
1770	** WEBPAGE: raw
1771	** URL: /raw/ARTIFACTID
	@@ -1965,11 +1965,11 @@
1965	@ <hr />
1966	content_get(rid, &content);
1967	@ <blockquote><pre>
1968	hexdump(&content);
1969	@ </pre></blockquote>
1970	style_finish_page("hexdump");
1971	}
1972
1973	/*
1974	** Look for "ci" and "filename" query parameters. If found, try to
1975	** use them to extract the record ID of an artifact for the file.
	@@ -2263,11 +2263,11 @@
2263	page_tree();
2264	return;
2265	}
2266	style_header("Missing name= query parameter");
2267	@ The name= query parameter is missing
2268	style_finish_page("artifact");
2269	return;
2270	}
2271
2272	url_initialize(&url, g.zPath);
2273	url_add_parameter(&url, "name", zName);
	@@ -2324,11 +2324,11 @@
2324	}else{
2325	style_header("No such artifact");
2326	@ Artifact '%h(zName)' does not exist in this repository.
2327	}
2328	if( rid==0 ){
2329	style_finish_page("artifact");
2330	return;
2331	}
2332	}
2333
2334	if( descOnly \|\| P("verbose")!=0 ){
	@@ -2529,11 +2529,11 @@
2529	@ <i>(file is %d(blob_size(&content)) bytes of binary data)</i>
2530	}
2531	@ </blockquote>
2532	}
2533	}
2534	style_finish_page("artifact");
2535	}
2536
2537	/*
2538	** WEBPAGE: tinfo
2539	** URL: /tinfo?name=ARTIFACTID
	@@ -2636,11 +2636,11 @@
2636
2637	@ <div class="section">Changes</div>
2638	@ <p>
2639	ticket_output_change_artifact(pTktChng, 0, 1);
2640	manifest_destroy(pTktChng);
2641	style_finish_page("tinfo");
2642	}
2643
2644
2645	/*
2646	** WEBPAGE: info
	@@ -2687,11 +2687,11 @@
2687	@ <p>No such object: %h(zName)</p>
2688	if( nLen<4 ){
2689	@ <p>Object name should be no less than 4 characters. Ten or more
2690	@ characters are recommended.</p>
2691	}
2692	style_finish_page("info");
2693	return;
2694	}else if( rc==2 ){
2695	cgi_set_parameter("src","info");
2696	ambiguous_page();
2697	return;
	@@ -2699,11 +2699,11 @@
2699	zName = blob_str(&uuid);
2700	rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", zName);
2701	if( rid==0 ){
2702	style_header("Broken Link");
2703	@ <p>No such object: %h(zName)</p>
2704	style_finish_page("info");
2705	return;
2706	}
2707	if( db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
2708	ci_page();
2709	}else
	@@ -3224,11 +3224,11 @@
3224	}
3225	@ </td></tr>
3226	@ </table>
3227	@ </div></form>
3228	builtin_request_js("ci_edit.js");
3229	style_finish_page("ci_edit");
3230	}
3231
3232	/*
3233	** Prepare an ammended commit comment. Let the user modify it using the
3234	** editor specified in the global_config table or either
3235

M src/interwiki.c

+2 -2

		--- src/interwiki.c
		+++ src/interwiki.c
		@@ -384,11 +384,11 @@
384	384	@ No mappings are currently defined.
385	385	}
386	386
387	387	if( !g.perm.Setup ){
388	388	/* Do not show intermap editing fields to non-setup users */
389		- style_body_and_footer("interwiki");
	389	+ style_finish_page("interwiki");
390	390	return;
391	391	}
392	392
393	393	@ <p>To add a new mapping, fill out the form below providing a unique name
394	394	@ for the tag. To edit an exist mapping, fill out the form and use the
		@@ -417,7 +417,7 @@
417	417	@ <tr><td></td>
418	418	@ <td><input type="submit" name="submit" value="Apply Changes"></td></tr>
419	419	@ </table>
420	420	@ </form>
421	421
422		- style_body_and_footer("interwiki");
	422	+ style_finish_page("interwiki");
423	423	}
424	424

	--- src/interwiki.c
	+++ src/interwiki.c
	@@ -384,11 +384,11 @@
384	@ No mappings are currently defined.
385	}
386
387	if( !g.perm.Setup ){
388	/* Do not show intermap editing fields to non-setup users */
389	style_body_and_footer("interwiki");
390	return;
391	}
392
393	@ <p>To add a new mapping, fill out the form below providing a unique name
394	@ for the tag. To edit an exist mapping, fill out the form and use the
	@@ -417,7 +417,7 @@
417	@ <tr><td></td>
418	@ <td><input type="submit" name="submit" value="Apply Changes"></td></tr>
419	@ </table>
420	@ </form>
421
422	style_body_and_footer("interwiki");
423	}
424

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

M src/loadctrl.c

+1 -1

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

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

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

M src/login.c

+4 -4

		--- src/login.c
		+++ src/login.c
		@@ -794,11 +794,11 @@
794	794	@ <td><input type="submit" value="Change Password" /></td></tr>
795	795	@ </table>
796	796	@ </form>
797	797	}
798	798	}
799		- style_body_and_footer("login");
	799	+ style_finish_page("login");
800	800	}
801	801
802	802	/*
803	803	** Attempt to find login credentials for user zLogin on a peer repository
804	804	** with project code zCode. Transfer those credentials to the local
		@@ -1544,11 +1544,11 @@
1544	1544	int doAlerts = 0; /* True if subscription is wanted too */
1545	1545	if( !db_get_boolean("self-register", 0) ){
1546	1546	style_header("Registration not possible");
1547	1547	@ <p>This project does not allow user self-registration. Please contact the
1548	1548	@ project administrator to obtain an account.</p>
1549		- style_body_and_footer("register");
	1549	+ style_finish_page("register");
1550	1550	return;
1551	1551	}
1552	1552	zPerms = db_get("default-perms", "u");
1553	1553
1554	1554	/* Prompt the user for email alerts if this repository is configured for
		@@ -1703,11 +1703,11 @@
1703	1703	}
1704	1704	alert_sender_free(pSender);
1705	1705	if( zGoto ){
1706	1706	@ <p><a href='%h(zGoto)'>Continue</a>
1707	1707	}
1708		- style_body_and_footer("register");
	1708	+ style_finish_page("register");
1709	1709	return;
1710	1710	}
1711	1711	redirect_to_g();
1712	1712	}
1713	1713
		@@ -1795,11 +1795,11 @@
1795	1795	@ %h(zCaptcha)
1796	1796	@ </pre>
1797	1797	@ Enter this 8-letter code in the "Captcha" box above.
1798	1798	@ </td></tr></table></div>
1799	1799	@ </form>
1800		- style_body_and_footer("register");
	1800	+ style_finish_page("register");
1801	1801
1802	1802	free(zCaptcha);
1803	1803	}
1804	1804
1805	1805	/*
1806	1806

	--- src/login.c
	+++ src/login.c
	@@ -794,11 +794,11 @@
794	@ <td><input type="submit" value="Change Password" /></td></tr>
795	@ </table>
796	@ </form>
797	}
798	}
799	style_body_and_footer("login");
800	}
801
802	/*
803	** Attempt to find login credentials for user zLogin on a peer repository
804	** with project code zCode. Transfer those credentials to the local
	@@ -1544,11 +1544,11 @@
1544	int doAlerts = 0; /* True if subscription is wanted too */
1545	if( !db_get_boolean("self-register", 0) ){
1546	style_header("Registration not possible");
1547	@ <p>This project does not allow user self-registration. Please contact the
1548	@ project administrator to obtain an account.</p>
1549	style_body_and_footer("register");
1550	return;
1551	}
1552	zPerms = db_get("default-perms", "u");
1553
1554	/* Prompt the user for email alerts if this repository is configured for
	@@ -1703,11 +1703,11 @@
1703	}
1704	alert_sender_free(pSender);
1705	if( zGoto ){
1706	@ <p><a href='%h(zGoto)'>Continue</a>
1707	}
1708	style_body_and_footer("register");
1709	return;
1710	}
1711	redirect_to_g();
1712	}
1713
	@@ -1795,11 +1795,11 @@
1795	@ %h(zCaptcha)
1796	@ </pre>
1797	@ Enter this 8-letter code in the "Captcha" box above.
1798	@ </td></tr></table></div>
1799	@ </form>
1800	style_body_and_footer("register");
1801
1802	free(zCaptcha);
1803	}
1804
1805	/*
1806

	--- src/login.c
	+++ src/login.c
	@@ -794,11 +794,11 @@
794	@ <td><input type="submit" value="Change Password" /></td></tr>
795	@ </table>
796	@ </form>
797	}
798	}
799	style_finish_page("login");
800	}
801
802	/*
803	** Attempt to find login credentials for user zLogin on a peer repository
804	** with project code zCode. Transfer those credentials to the local
	@@ -1544,11 +1544,11 @@
1544	int doAlerts = 0; /* True if subscription is wanted too */
1545	if( !db_get_boolean("self-register", 0) ){
1546	style_header("Registration not possible");
1547	@ <p>This project does not allow user self-registration. Please contact the
1548	@ project administrator to obtain an account.</p>
1549	style_finish_page("register");
1550	return;
1551	}
1552	zPerms = db_get("default-perms", "u");
1553
1554	/* Prompt the user for email alerts if this repository is configured for
	@@ -1703,11 +1703,11 @@
1703	}
1704	alert_sender_free(pSender);
1705	if( zGoto ){
1706	@ <p><a href='%h(zGoto)'>Continue</a>
1707	}
1708	style_finish_page("register");
1709	return;
1710	}
1711	redirect_to_g();
1712	}
1713
	@@ -1795,11 +1795,11 @@
1795	@ %h(zCaptcha)
1796	@ </pre>
1797	@ Enter this 8-letter code in the "Captcha" box above.
1798	@ </td></tr></table></div>
1799	@ </form>
1800	style_finish_page("register");
1801
1802	free(zCaptcha);
1803	}
1804
1805	/*
1806

M src/main.c

+2 -2

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

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

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

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_body_and_footer("modreq");
	194	+ style_finish_page("modreq");
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_body_and_footer("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("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

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_body_and_footer("ambiguous");
	673	+ style_finish_page("ambiguous");
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_body_and_footer("bloblist");
	1333	+ style_finish_page("bloblist");
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_body_and_footer("bloblist");
	1412	+ style_finish_page("bloblist");
1413	1413	}
1414	1414
1415	1415	/*
1416	1416	** Output HTML that shows a table of all public phantoms.
1417	1417	*/
		@@ -1477,11 +1477,11 @@
1477	1477	}
1478	1478	if( g.perm.Write ){
1479	1479	style_submenu_element("Artifact Stats", "artifact_stats");
1480	1480	}
1481	1481	table_of_public_phantoms();
1482		- style_body_and_footer("phantoms");
	1482	+ style_finish_page("phantoms");
1483	1483	}
1484	1484
1485	1485	/*
1486	1486	** WEBPAGE: bigbloblist
1487	1487	**
		@@ -1541,11 +1541,11 @@
1541	1541	@ </tr>
1542	1542	}
1543	1543	@ </tbody></table>
1544	1544	db_finalize(&q);
1545	1545	style_table_sorter();
1546		- style_body_and_footer("bigbloblist");
	1546	+ style_finish_page("bigbloblist");
1547	1547	}
1548	1548
1549	1549	/*
1550	1550	** COMMAND: test-unsent
1551	1551	**
		@@ -1665,7 +1665,7 @@
1665	1665	collision_report("SELECT (SELECT uuid FROM blob WHERE rid=objid)"
1666	1666	" FROM event WHERE event.type='ci'"
1667	1667	" ORDER BY 1");
1668	1668	@ <h1>Hash Prefix Collisions on All Artifacts</h1>
1669	1669	collision_report("SELECT uuid FROM blob ORDER BY 1");
1670		- style_body_and_footer("hash-collisions");
	1670	+ style_finish_page("hash-collisions");
1671	1671	}
1672	1672

	--- 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_body_and_footer("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_body_and_footer("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_body_and_footer("bloblist");
1413	}
1414
1415	/*
1416	** Output HTML that shows a table of all public phantoms.
1417	*/
	@@ -1477,11 +1477,11 @@
1477	}
1478	if( g.perm.Write ){
1479	style_submenu_element("Artifact Stats", "artifact_stats");
1480	}
1481	table_of_public_phantoms();
1482	style_body_and_footer("phantoms");
1483	}
1484
1485	/*
1486	** WEBPAGE: bigbloblist
1487	**
	@@ -1541,11 +1541,11 @@
1541	@ </tr>
1542	}
1543	@ </tbody></table>
1544	db_finalize(&q);
1545	style_table_sorter();
1546	style_body_and_footer("bigbloblist");
1547	}
1548
1549	/*
1550	** COMMAND: test-unsent
1551	**
	@@ -1665,7 +1665,7 @@
1665	collision_report("SELECT (SELECT uuid FROM blob WHERE rid=objid)"
1666	" FROM event WHERE event.type='ci'"
1667	" ORDER BY 1");
1668	@ <h1>Hash Prefix Collisions on All Artifacts</h1>
1669	collision_report("SELECT uuid FROM blob ORDER BY 1");
1670	style_body_and_footer("hash-collisions");
1671	}
1672

	--- 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	*/
	@@ -1477,11 +1477,11 @@
1477	}
1478	if( g.perm.Write ){
1479	style_submenu_element("Artifact Stats", "artifact_stats");
1480	}
1481	table_of_public_phantoms();
1482	style_finish_page("phantoms");
1483	}
1484
1485	/*
1486	** WEBPAGE: bigbloblist
1487	**
	@@ -1541,11 +1541,11 @@
1541	@ </tr>
1542	}
1543	@ </tbody></table>
1544	db_finalize(&q);
1545	style_table_sorter();
1546	style_finish_page("bigbloblist");
1547	}
1548
1549	/*
1550	** COMMAND: test-unsent
1551	**
	@@ -1665,7 +1665,7 @@
1665	collision_report("SELECT (SELECT uuid FROM blob WHERE rid=objid)"
1666	" FROM event WHERE event.type='ci'"
1667	" ORDER BY 1");
1668	@ <h1>Hash Prefix Collisions on All Artifacts</h1>
1669	collision_report("SELECT uuid FROM blob ORDER BY 1");
1670	style_finish_page("hash-collisions");
1671	}
1672

M src/path.c

+1 -1

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

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

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

M src/piechart.c

+1 -1

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

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

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

M src/pikchrshow.c

+1 -1

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

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

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

M src/printf.c

+1 -1

		--- src/printf.c
		+++ src/printf.c
		@@ -1101,11 +1101,11 @@
1101	1101	cgi_set_content_type("text/html");
1102	1102	style_header("Bad Request");
1103	1103	etag_cancel();
1104	1104	@ <p class="generalError">%h(z)</p>
1105	1105	cgi_set_status(400, "Bad Request");
1106		- style_body_and_footer("error");
	1106	+ style_finish_page("error");
1107	1107	cgi_reply();
1108	1108	}else if( !g.fQuiet ){
1109	1109	fossil_force_newline();
1110	1110	fossil_trace("%s\n", z);
1111	1111	}
1112	1112

	--- src/printf.c
	+++ src/printf.c
	@@ -1101,11 +1101,11 @@
1101	cgi_set_content_type("text/html");
1102	style_header("Bad Request");
1103	etag_cancel();
1104	@ <p class="generalError">%h(z)</p>
1105	cgi_set_status(400, "Bad Request");
1106	style_body_and_footer("error");
1107	cgi_reply();
1108	}else if( !g.fQuiet ){
1109	fossil_force_newline();
1110	fossil_trace("%s\n", z);
1111	}
1112

	--- src/printf.c
	+++ src/printf.c
	@@ -1101,11 +1101,11 @@
1101	cgi_set_content_type("text/html");
1102	style_header("Bad Request");
1103	etag_cancel();
1104	@ <p class="generalError">%h(z)</p>
1105	cgi_set_status(400, "Bad Request");
1106	style_finish_page("error");
1107	cgi_reply();
1108	}else if( !g.fQuiet ){
1109	fossil_force_newline();
1110	fossil_trace("%s\n", z);
1111	}
1112

M src/repolist.c

+1 -1

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

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

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

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_body_and_footer("reportlist");
	102	+ style_finish_page("reportlist");
103	103	}
104	104
105	105	/*
106	106	** Remove whitespace from both ends of a string.
107	107	*/
		@@ -319,11 +319,11 @@
319	319	db_prepare(&q, "SELECT title, sqlcode, owner, cols "
320	320	"FROM reportfmt WHERE rn=%d",rn);
321	321	style_header("SQL For Report Format Number %d", rn);
322	322	if( db_step(&q)!=SQLITE_ROW ){
323	323	@ <p>Unknown report number: %d(rn)</p>
324		- style_body_and_footer("report");
	324	+ style_finish_page("report");
325	325	db_finalize(&q);
326	326	return;
327	327	}
328	328	zTitle = db_column_text(&q, 0);
329	329	zSQL = db_column_text(&q, 1);
		@@ -341,11 +341,11 @@
341	341	@ <td width=15></td><td valign="top">
342	342	output_color_key(zClrKey, 0, "border=0 cellspacing=0 cellpadding=3");
343	343	@ </td>
344	344	@ </tr></table>
345	345	report_format_hints();
346		- style_body_and_footer("report");
	346	+ style_finish_page("report");
347	347	db_finalize(&q);
348	348	}
349	349
350	350	/*
351	351	** WEBPAGE: rptnew
		@@ -401,11 +401,11 @@
401	401	@ <input type="hidden" name="rn" value="%d(rn)">
402	402	login_insert_csrf_secret();
403	403	@ <input type="submit" name="del2" value="Delete The Report">
404	404	@ <input type="submit" name="can" value="Cancel">
405	405	@ </form>
406		- style_body_and_footer("report");
	406	+ style_finish_page("report");
407	407	return;
408	408	}else if( P("can") ){
409	409	/* user cancelled */
410	410	cgi_redirect("reportlist");
411	411	return;
		@@ -493,20 +493,20 @@
493	493	if( !g.perm.Admin && fossil_strcmp(zOwner,g.zLogin)!=0 ){
494	494	@ <p>This report format is owned by %h(zOwner). You are not allowed
495	495	@ to change it.</p>
496	496	@ </form>
497	497	report_format_hints();
498		- style_body_and_footer("report");
	498	+ style_finish_page("report");
499	499	return;
500	500	}
501	501	@ <input type="submit" value="Apply Changes" />
502	502	if( rn>0 ){
503	503	@ <input type="submit" value="Delete This Report" name="del1" />
504	504	}
505	505	@ </div></form>
506	506	report_format_hints();
507		- style_body_and_footer("report");
	507	+ style_finish_page("report");
508	508	}
509	509
510	510	/*
511	511	** Output a bunch of text that provides information about report
512	512	** formats
		@@ -1048,11 +1048,11 @@
1048	1048	@ <p class="reportError">Error: %h(zErr1)</p>
1049	1049	}else if( zErr2 ){
1050	1050	@ <p class="reportError">Error: %h(zErr2)</p>
1051	1051	}
1052	1052	style_table_sorter();
1053		- style_body_and_footer("report");
	1053	+ style_finish_page("report");
1054	1054	}else{
1055	1055	report_restrict_sql(&zErr1);
1056	1056	db_exec_readonly(g.db, zSql, output_tab_separated, &count, &zErr2);
1057	1057	report_unrestrict_sql();
1058	1058	cgi_set_content_type("text/plain");
1059	1059

	--- 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_body_and_footer("reportlist");
103	}
104
105	/*
106	** Remove whitespace from both ends of a string.
107	*/
	@@ -319,11 +319,11 @@
319	db_prepare(&q, "SELECT title, sqlcode, owner, cols "
320	"FROM reportfmt WHERE rn=%d",rn);
321	style_header("SQL For Report Format Number %d", rn);
322	if( db_step(&q)!=SQLITE_ROW ){
323	@ <p>Unknown report number: %d(rn)</p>
324	style_body_and_footer("report");
325	db_finalize(&q);
326	return;
327	}
328	zTitle = db_column_text(&q, 0);
329	zSQL = db_column_text(&q, 1);
	@@ -341,11 +341,11 @@
341	@ <td width=15></td><td valign="top">
342	output_color_key(zClrKey, 0, "border=0 cellspacing=0 cellpadding=3");
343	@ </td>
344	@ </tr></table>
345	report_format_hints();
346	style_body_and_footer("report");
347	db_finalize(&q);
348	}
349
350	/*
351	** WEBPAGE: rptnew
	@@ -401,11 +401,11 @@
401	@ <input type="hidden" name="rn" value="%d(rn)">
402	login_insert_csrf_secret();
403	@ <input type="submit" name="del2" value="Delete The Report">
404	@ <input type="submit" name="can" value="Cancel">
405	@ </form>
406	style_body_and_footer("report");
407	return;
408	}else if( P("can") ){
409	/* user cancelled */
410	cgi_redirect("reportlist");
411	return;
	@@ -493,20 +493,20 @@
493	if( !g.perm.Admin && fossil_strcmp(zOwner,g.zLogin)!=0 ){
494	@ <p>This report format is owned by %h(zOwner). You are not allowed
495	@ to change it.</p>
496	@ </form>
497	report_format_hints();
498	style_body_and_footer("report");
499	return;
500	}
501	@ <input type="submit" value="Apply Changes" />
502	if( rn>0 ){
503	@ <input type="submit" value="Delete This Report" name="del1" />
504	}
505	@ </div></form>
506	report_format_hints();
507	style_body_and_footer("report");
508	}
509
510	/*
511	** Output a bunch of text that provides information about report
512	** formats
	@@ -1048,11 +1048,11 @@
1048	@ <p class="reportError">Error: %h(zErr1)</p>
1049	}else if( zErr2 ){
1050	@ <p class="reportError">Error: %h(zErr2)</p>
1051	}
1052	style_table_sorter();
1053	style_body_and_footer("report");
1054	}else{
1055	report_restrict_sql(&zErr1);
1056	db_exec_readonly(g.db, zSql, output_tab_separated, &count, &zErr2);
1057	report_unrestrict_sql();
1058	cgi_set_content_type("text/plain");
1059

	--- 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	*/
	@@ -319,11 +319,11 @@
319	db_prepare(&q, "SELECT title, sqlcode, owner, cols "
320	"FROM reportfmt WHERE rn=%d",rn);
321	style_header("SQL For Report Format Number %d", rn);
322	if( db_step(&q)!=SQLITE_ROW ){
323	@ <p>Unknown report number: %d(rn)</p>
324	style_finish_page("report");
325	db_finalize(&q);
326	return;
327	}
328	zTitle = db_column_text(&q, 0);
329	zSQL = db_column_text(&q, 1);
	@@ -341,11 +341,11 @@
341	@ <td width=15></td><td valign="top">
342	output_color_key(zClrKey, 0, "border=0 cellspacing=0 cellpadding=3");
343	@ </td>
344	@ </tr></table>
345	report_format_hints();
346	style_finish_page("report");
347	db_finalize(&q);
348	}
349
350	/*
351	** WEBPAGE: rptnew
	@@ -401,11 +401,11 @@
401	@ <input type="hidden" name="rn" value="%d(rn)">
402	login_insert_csrf_secret();
403	@ <input type="submit" name="del2" value="Delete The Report">
404	@ <input type="submit" name="can" value="Cancel">
405	@ </form>
406	style_finish_page("report");
407	return;
408	}else if( P("can") ){
409	/* user cancelled */
410	cgi_redirect("reportlist");
411	return;
	@@ -493,20 +493,20 @@
493	if( !g.perm.Admin && fossil_strcmp(zOwner,g.zLogin)!=0 ){
494	@ <p>This report format is owned by %h(zOwner). You are not allowed
495	@ to change it.</p>
496	@ </form>
497	report_format_hints();
498	style_finish_page("report");
499	return;
500	}
501	@ <input type="submit" value="Apply Changes" />
502	if( rn>0 ){
503	@ <input type="submit" value="Delete This Report" name="del1" />
504	}
505	@ </div></form>
506	report_format_hints();
507	style_finish_page("report");
508	}
509
510	/*
511	** Output a bunch of text that provides information about report
512	** formats
	@@ -1048,11 +1048,11 @@
1048	@ <p class="reportError">Error: %h(zErr1)</p>
1049	}else if( zErr2 ){
1050	@ <p class="reportError">Error: %h(zErr2)</p>
1051	}
1052	style_table_sorter();
1053	style_finish_page("report");
1054	}else{
1055	report_restrict_sql(&zErr1);
1056	db_exec_readonly(g.db, zSql, output_tab_separated, &count, &zErr2);
1057	report_unrestrict_sql();
1058	cgi_set_content_type("text/plain");
1059

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

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

	--- 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
	@@ -1981,11 +1981,11 @@
1981	int cnt1 = 0, cnt2 = 0, cnt3 = 0;
1982	login_check_credentials();
1983	if( !g.perm.Admin ){ login_needed(0); return; }
1984	if( !search_index_exists() ){
1985	@ <p>Indexed search is disabled
1986	style_finish_page("report");
1987	return;
1988	}
1989	search_sql_setup(g.db);
1990	style_submenu_element("Setup","%R/srchsetup");
1991	if( zId!=0 && (id = atoi(zId))>0 ){
	@@ -2025,11 +2025,11 @@
2025	style_submenu_element(zName,"%R/test-ftsdocs?y=%c&ixed=1",zDocId[0]);
2026	zName = mprintf("Unindexed '%c' docs",zDocId[0]);
2027	style_submenu_element(zName,"%R/test-ftsdocs?y=%c&ixed=0",zDocId[0]);
2028	}
2029	db_finalize(&q);
2030	style_finish_page("test");
2031	return;
2032	}
2033	if( zType!=0 && zType[0]!=0 && zType[1]==0 &&
2034	zIdxed!=0 && (zIdxed[0]=='1' \|\| zIdxed[0]=='0') && zIdxed[1]==0
2035	){
	@@ -2055,11 +2055,11 @@
2055	@ <li> <a href='test-ftsdocs?id=%d(db_column_int(&q,0))'>
2056	@ %h(db_column_text(&q,1))</a>
2057	}
2058	@ </ul>
2059	db_finalize(&q);
2060	style_finish_page("test");
2061	return;
2062	}
2063	style_header("Summary of ftsdocs");
2064	db_prepare(&q,
2065	"SELECT type, sum(idxed IS TRUE), sum(idxed IS FALSE), count(*)"
	@@ -2099,7 +2099,7 @@
2099	@ </tbody><tfooter>
2100	@ <tr><th>Total<th align="right">%d(cnt1)<th align="right">%d(cnt2)
2101	@ <th align="right">%d(cnt3)
2102	@ </tfooter>
2103	@ </table>
2104	style_finish_page("test");
2105	}
2106

M src/security_audit.c

+6 -6

		--- src/security_audit.c
		+++ src/security_audit.c
		@@ -585,11 +585,11 @@
585	585	table_of_public_phantoms();
586	586	@ </li>
587	587	}
588	588
589	589	@ </ol>
590		- style_body_and_footer("secaudit");
	590	+ style_finish_page("secaudit");
591	591	}
592	592
593	593	/*
594	594	** WEBPAGE: takeitprivate
595	595	**
		@@ -627,11 +627,11 @@
627	627	@ <form action="%s(g.zPath)" method="post">
628	628	@ <input type="submit" name="apply" value="Make It Private">
629	629	@ <input type="submit" name="cancel" value="Cancel">
630	630	@ </form>
631	631
632		- style_body_and_footer("takeitprivate");
	632	+ style_finish_page("takeitprivate");
633	633	}
634	634
635	635	/*
636	636	** The maximum number of bytes of log to show
637	637	*/
		@@ -668,11 +668,11 @@
668	668	@ If the server is running using one of
669	669	@ the "fossil http" or "fossil server" commands then add
670	670	@ a command-line option "--errorlog <i>FILENAME</i>" to that
671	671	@ command.
672	672	@ </ol>
673		- style_body_and_footer("errorlog");
	673	+ style_finish_page("errorlog");
674	674	return;
675	675	}
676	676	if( P("truncate1") && cgi_csrf_safe(1) ){
677	677	fclose(fopen(g.zErrlog,"w"));
678	678	}
		@@ -688,20 +688,20 @@
688	688	@ <form action="%R/errorlog" method="POST">
689	689	@ <p>Confirm that you want to truncate the %,lld(szFile)-byte error log:
690	690	@ <input type="submit" name="truncate1" value="Confirm">
691	691	@ <input type="submit" name="cancel" value="Cancel">
692	692	@ </form>
693		- style_body_and_footer("errorlog");
	693	+ style_finish_page("errorlog");
694	694	return;
695	695	}
696	696	@ <p>The server error log at "%h(g.zErrlog)" is %,lld(szFile) bytes in size.
697	697	style_submenu_element("Download", "%R/errorlog?download");
698	698	style_submenu_element("Truncate", "%R/errorlog?truncate");
699	699	in = fossil_fopen(g.zErrlog, "rb");
700	700	if( in==0 ){
701	701	@ <p class='generalError'>Unable to open that file for reading!</p>
702		- style_body_and_footer("errorlog");
	702	+ style_finish_page("errorlog");
703	703	return;
704	704	}
705	705	if( szFile>MXSHOWLOG && P("all")==0 ){
706	706	@ <form action="%R/errorlog" method="POST">
707	707	@ <p>Only the last %,d(MXSHOWLOG) bytes are shown.
		@@ -714,7 +714,7 @@
714	714	while( fgets(z, sizeof(z), in) ){
715	715	@ %h(z)\
716	716	}
717	717	fclose(in);
718	718	@ </pre>
719		- style_body_and_footer("errorlog");
	719	+ style_finish_page("errorlog");
720	720	}
721	721

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -585,11 +585,11 @@
585	table_of_public_phantoms();
586	@ </li>
587	}
588
589	@ </ol>
590	style_body_and_footer("secaudit");
591	}
592
593	/*
594	** WEBPAGE: takeitprivate
595	**
	@@ -627,11 +627,11 @@
627	@ <form action="%s(g.zPath)" method="post">
628	@ <input type="submit" name="apply" value="Make It Private">
629	@ <input type="submit" name="cancel" value="Cancel">
630	@ </form>
631
632	style_body_and_footer("takeitprivate");
633	}
634
635	/*
636	** The maximum number of bytes of log to show
637	*/
	@@ -668,11 +668,11 @@
668	@ If the server is running using one of
669	@ the "fossil http" or "fossil server" commands then add
670	@ a command-line option "--errorlog <i>FILENAME</i>" to that
671	@ command.
672	@ </ol>
673	style_body_and_footer("errorlog");
674	return;
675	}
676	if( P("truncate1") && cgi_csrf_safe(1) ){
677	fclose(fopen(g.zErrlog,"w"));
678	}
	@@ -688,20 +688,20 @@
688	@ <form action="%R/errorlog" method="POST">
689	@ <p>Confirm that you want to truncate the %,lld(szFile)-byte error log:
690	@ <input type="submit" name="truncate1" value="Confirm">
691	@ <input type="submit" name="cancel" value="Cancel">
692	@ </form>
693	style_body_and_footer("errorlog");
694	return;
695	}
696	@ <p>The server error log at "%h(g.zErrlog)" is %,lld(szFile) bytes in size.
697	style_submenu_element("Download", "%R/errorlog?download");
698	style_submenu_element("Truncate", "%R/errorlog?truncate");
699	in = fossil_fopen(g.zErrlog, "rb");
700	if( in==0 ){
701	@ <p class='generalError'>Unable to open that file for reading!</p>
702	style_body_and_footer("errorlog");
703	return;
704	}
705	if( szFile>MXSHOWLOG && P("all")==0 ){
706	@ <form action="%R/errorlog" method="POST">
707	@ <p>Only the last %,d(MXSHOWLOG) bytes are shown.
	@@ -714,7 +714,7 @@
714	while( fgets(z, sizeof(z), in) ){
715	@ %h(z)\
716	}
717	fclose(in);
718	@ </pre>
719	style_body_and_footer("errorlog");
720	}
721

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -585,11 +585,11 @@
585	table_of_public_phantoms();
586	@ </li>
587	}
588
589	@ </ol>
590	style_finish_page("secaudit");
591	}
592
593	/*
594	** WEBPAGE: takeitprivate
595	**
	@@ -627,11 +627,11 @@
627	@ <form action="%s(g.zPath)" method="post">
628	@ <input type="submit" name="apply" value="Make It Private">
629	@ <input type="submit" name="cancel" value="Cancel">
630	@ </form>
631
632	style_finish_page("takeitprivate");
633	}
634
635	/*
636	** The maximum number of bytes of log to show
637	*/
	@@ -668,11 +668,11 @@
668	@ If the server is running using one of
669	@ the "fossil http" or "fossil server" commands then add
670	@ a command-line option "--errorlog <i>FILENAME</i>" to that
671	@ command.
672	@ </ol>
673	style_finish_page("errorlog");
674	return;
675	}
676	if( P("truncate1") && cgi_csrf_safe(1) ){
677	fclose(fopen(g.zErrlog,"w"));
678	}
	@@ -688,20 +688,20 @@
688	@ <form action="%R/errorlog" method="POST">
689	@ <p>Confirm that you want to truncate the %,lld(szFile)-byte error log:
690	@ <input type="submit" name="truncate1" value="Confirm">
691	@ <input type="submit" name="cancel" value="Cancel">
692	@ </form>
693	style_finish_page("errorlog");
694	return;
695	}
696	@ <p>The server error log at "%h(g.zErrlog)" is %,lld(szFile) bytes in size.
697	style_submenu_element("Download", "%R/errorlog?download");
698	style_submenu_element("Truncate", "%R/errorlog?truncate");
699	in = fossil_fopen(g.zErrlog, "rb");
700	if( in==0 ){
701	@ <p class='generalError'>Unable to open that file for reading!</p>
702	style_finish_page("errorlog");
703	return;
704	}
705	if( szFile>MXSHOWLOG && P("all")==0 ){
706	@ <form action="%R/errorlog" method="POST">
707	@ <p>Only the last %,d(MXSHOWLOG) bytes are shown.
	@@ -714,7 +714,7 @@
714	while( fgets(z, sizeof(z), in) ){
715	@ %h(z)\
716	}
717	fclose(in);
718	@ </pre>
719	style_finish_page("errorlog");
720	}
721

M src/setup.c

+15 -15

		--- src/setup.c
		+++ src/setup.c
		@@ -175,11 +175,11 @@
175	175	setup_menu_entry("TH1", "admin_th1",
176	176	"Enter raw TH1 commands");
177	177	}
178	178	@ </table>
179	179
180		- style_body_and_footer("setup");
	180	+ style_finish_page("setup");
181	181	}
182	182
183	183	/*
184	184	** Generate a checkbox for an attribute.
185	185	*/
		@@ -576,11 +576,11 @@
576	576
577	577	@ <hr />
578	578	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
579	579	@ </div></form>
580	580	db_end_transaction(0);
581		- style_body_and_footer("setup");
	581	+ style_finish_page("setup");
582	582	}
583	583
584	584	/*
585	585	** WEBPAGE: setup_login_group
586	586	**
		@@ -704,11 +704,11 @@
704	704	}
705	705	db_finalize(&q);
706	706	@ </tbody></table>
707	707	style_table_sorter();
708	708	}
709		- style_body_and_footer("setup");
	709	+ style_finish_page("setup");
710	710	}
711	711
712	712	/*
713	713	** WEBPAGE: setup_timeline
714	714	**
		@@ -843,11 +843,11 @@
843	843
844	844	@ <hr />
845	845	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
846	846	@ </div></form>
847	847	db_end_transaction(0);
848		- style_body_and_footer("setup");
	848	+ style_finish_page("setup");
849	849	}
850	850
851	851	/*
852	852	** WEBPAGE: setup_settings
853	853	**
		@@ -936,11 +936,11 @@
936	936	}
937	937	}
938	938	@ </td></tr></table>
939	939	@ </div></form>
940	940	db_end_transaction(0);
941		- style_body_and_footer("setup");
	941	+ style_finish_page("setup");
942	942	}
943	943
944	944	/*
945	945	** WEBPAGE: setup_config
946	946	**
		@@ -1032,11 +1032,11 @@
1032	1032	@ (Property: sitemap-contact)
1033	1033	@ <hr />
1034	1034	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1035	1035	@ </div></form>
1036	1036	db_end_transaction(0);
1037		- style_body_and_footer("setup");
	1037	+ style_finish_page("setup");
1038	1038	}
1039	1039
1040	1040	/*
1041	1041	** WEBPAGE: setup_wiki
1042	1042	**
		@@ -1108,11 +1108,11 @@
1108	1108	@ (Property: "wiki-use-html")
1109	1109	@ <hr />
1110	1110	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1111	1111	@ </div></form>
1112	1112	db_end_transaction(0);
1113		- style_body_and_footer("setup");
	1113	+ style_finish_page("setup");
1114	1114	}
1115	1115
1116	1116	/*
1117	1117	** WEBPAGE: setup_modreq
1118	1118	**
		@@ -1154,11 +1154,11 @@
1154	1154
1155	1155	@ <hr />
1156	1156	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1157	1157	@ </div></form>
1158	1158	db_end_transaction(0);
1159		- style_body_and_footer("setup");
	1159	+ style_finish_page("setup");
1160	1160
1161	1161	}
1162	1162
1163	1163	/*
1164	1164	** WEBPAGE: setup_adunit
		@@ -1235,11 +1235,11 @@
1235	1235	@ border: 1px solid #f11;
1236	1236	@ background-color: #fcc;
1237	1237	@ '>Demo Ad</div>
1238	1238	@ </pre></blockquote>
1239	1239	@ </li>
1240		- style_body_and_footer("setup");
	1240	+ style_finish_page("setup");
1241	1241	db_end_transaction(0);
1242	1242	}
1243	1243
1244	1244	/*
1245	1245	** WEBPAGE: setup_logo
		@@ -1437,11 +1437,11 @@
1437	1437	@ <hr />
1438	1438	@
1439	1439	@ <p><span class="note">Note:</span> Your browser has probably cached these
1440	1440	@ images, so you may need to press the Reload button before changes will
1441	1441	@ take effect. </p>
1442		- style_body_and_footer("setup");
	1442	+ style_finish_page("setup");
1443	1443	db_end_transaction(0);
1444	1444	}
1445	1445
1446	1446	/*
1447	1447	** Prevent the RAW SQL feature from being used to ATTACH a different
		@@ -1599,11 +1599,11 @@
1599	1599	}
1600	1600	sqlite3_finalize(pStmt);
1601	1601	@ </table>
1602	1602	}
1603	1603	}
1604		- style_body_and_footer("setup");
	1604	+ style_finish_page("setup");
1605	1605	}
1606	1606
1607	1607
1608	1608	/*
1609	1609	** WEBPAGE: admin_th1
		@@ -1643,11 +1643,11 @@
1643	1643	@ <pre class="th1result">%h(zR)</pre>
1644	1644	}else{
1645	1645	@ <pre class="th1error">%h(zR)</pre>
1646	1646	}
1647	1647	}
1648		- style_body_and_footer("setup");
	1648	+ style_finish_page("setup");
1649	1649	}
1650	1650
1651	1651	/*
1652	1652	** WEBPAGE: admin_log
1653	1653	**
		@@ -1710,11 +1710,11 @@
1710	1710	db_finalize(&stLog);
1711	1711	@ </tbody></table>
1712	1712	if( counter>ofst+limit ){
1713	1713	@ <p><a href="admin_log?n=%d(limit)&x=%d(limit+ofst)">[Older]</a></p>
1714	1714	}
1715		- style_body_and_footer("setup");
	1715	+ style_finish_page("setup");
1716	1716	}
1717	1717
1718	1718	/*
1719	1719	** WEBPAGE: srchsetup
1720	1720	**
		@@ -1790,11 +1790,11 @@
1790	1790	@ larger repositories.</p>
1791	1791	onoff_attribute("Use Porter Stemmer","search-stemmer","ss",0,0);
1792	1792	@ <p><input type="submit" name="fts1" value="Create A Full-Text Index">
1793	1793	}
1794	1794	@ </div></form>
1795		- style_body_and_footer("setup");
	1795	+ style_finish_page("setup");
1796	1796	}
1797	1797
1798	1798	/*
1799	1799	** A URL Alias originally called zOldName is now zNewName/zValue.
1800	1800	** Write SQL to make this change into pSql.
		@@ -1948,7 +1948,7 @@
1948	1948	@ <p>To delete an entry from the alias table, change its name or value to an
1949	1949	@ empty string and press "Apply Changes".
1950	1950	@
1951	1951	@ <p>To add a new alias, fill in the name and value in the bottom row
1952	1952	@ of the table above and press "Apply Changes".
1953		- style_body_and_footer("setup");
	1953	+ style_finish_page("setup");
1954	1954	}
1955	1955

	--- src/setup.c
	+++ src/setup.c
	@@ -175,11 +175,11 @@
175	setup_menu_entry("TH1", "admin_th1",
176	"Enter raw TH1 commands");
177	}
178	@ </table>
179
180	style_body_and_footer("setup");
181	}
182
183	/*
184	** Generate a checkbox for an attribute.
185	*/
	@@ -576,11 +576,11 @@
576
577	@ <hr />
578	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
579	@ </div></form>
580	db_end_transaction(0);
581	style_body_and_footer("setup");
582	}
583
584	/*
585	** WEBPAGE: setup_login_group
586	**
	@@ -704,11 +704,11 @@
704	}
705	db_finalize(&q);
706	@ </tbody></table>
707	style_table_sorter();
708	}
709	style_body_and_footer("setup");
710	}
711
712	/*
713	** WEBPAGE: setup_timeline
714	**
	@@ -843,11 +843,11 @@
843
844	@ <hr />
845	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
846	@ </div></form>
847	db_end_transaction(0);
848	style_body_and_footer("setup");
849	}
850
851	/*
852	** WEBPAGE: setup_settings
853	**
	@@ -936,11 +936,11 @@
936	}
937	}
938	@ </td></tr></table>
939	@ </div></form>
940	db_end_transaction(0);
941	style_body_and_footer("setup");
942	}
943
944	/*
945	** WEBPAGE: setup_config
946	**
	@@ -1032,11 +1032,11 @@
1032	@ (Property: sitemap-contact)
1033	@ <hr />
1034	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1035	@ </div></form>
1036	db_end_transaction(0);
1037	style_body_and_footer("setup");
1038	}
1039
1040	/*
1041	** WEBPAGE: setup_wiki
1042	**
	@@ -1108,11 +1108,11 @@
1108	@ (Property: "wiki-use-html")
1109	@ <hr />
1110	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1111	@ </div></form>
1112	db_end_transaction(0);
1113	style_body_and_footer("setup");
1114	}
1115
1116	/*
1117	** WEBPAGE: setup_modreq
1118	**
	@@ -1154,11 +1154,11 @@
1154
1155	@ <hr />
1156	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1157	@ </div></form>
1158	db_end_transaction(0);
1159	style_body_and_footer("setup");
1160
1161	}
1162
1163	/*
1164	** WEBPAGE: setup_adunit
	@@ -1235,11 +1235,11 @@
1235	@ border: 1px solid #f11;
1236	@ background-color: #fcc;
1237	@ '>Demo Ad</div>
1238	@ </pre></blockquote>
1239	@ </li>
1240	style_body_and_footer("setup");
1241	db_end_transaction(0);
1242	}
1243
1244	/*
1245	** WEBPAGE: setup_logo
	@@ -1437,11 +1437,11 @@
1437	@ <hr />
1438	@
1439	@ <p><span class="note">Note:</span> Your browser has probably cached these
1440	@ images, so you may need to press the Reload button before changes will
1441	@ take effect. </p>
1442	style_body_and_footer("setup");
1443	db_end_transaction(0);
1444	}
1445
1446	/*
1447	** Prevent the RAW SQL feature from being used to ATTACH a different
	@@ -1599,11 +1599,11 @@
1599	}
1600	sqlite3_finalize(pStmt);
1601	@ </table>
1602	}
1603	}
1604	style_body_and_footer("setup");
1605	}
1606
1607
1608	/*
1609	** WEBPAGE: admin_th1
	@@ -1643,11 +1643,11 @@
1643	@ <pre class="th1result">%h(zR)</pre>
1644	}else{
1645	@ <pre class="th1error">%h(zR)</pre>
1646	}
1647	}
1648	style_body_and_footer("setup");
1649	}
1650
1651	/*
1652	** WEBPAGE: admin_log
1653	**
	@@ -1710,11 +1710,11 @@
1710	db_finalize(&stLog);
1711	@ </tbody></table>
1712	if( counter>ofst+limit ){
1713	@ <p><a href="admin_log?n=%d(limit)&x=%d(limit+ofst)">[Older]</a></p>
1714	}
1715	style_body_and_footer("setup");
1716	}
1717
1718	/*
1719	** WEBPAGE: srchsetup
1720	**
	@@ -1790,11 +1790,11 @@
1790	@ larger repositories.</p>
1791	onoff_attribute("Use Porter Stemmer","search-stemmer","ss",0,0);
1792	@ <p><input type="submit" name="fts1" value="Create A Full-Text Index">
1793	}
1794	@ </div></form>
1795	style_body_and_footer("setup");
1796	}
1797
1798	/*
1799	** A URL Alias originally called zOldName is now zNewName/zValue.
1800	** Write SQL to make this change into pSql.
	@@ -1948,7 +1948,7 @@
1948	@ <p>To delete an entry from the alias table, change its name or value to an
1949	@ empty string and press "Apply Changes".
1950	@
1951	@ <p>To add a new alias, fill in the name and value in the bottom row
1952	@ of the table above and press "Apply Changes".
1953	style_body_and_footer("setup");
1954	}
1955

	--- src/setup.c
	+++ src/setup.c
	@@ -175,11 +175,11 @@
175	setup_menu_entry("TH1", "admin_th1",
176	"Enter raw TH1 commands");
177	}
178	@ </table>
179
180	style_finish_page("setup");
181	}
182
183	/*
184	** Generate a checkbox for an attribute.
185	*/
	@@ -576,11 +576,11 @@
576
577	@ <hr />
578	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
579	@ </div></form>
580	db_end_transaction(0);
581	style_finish_page("setup");
582	}
583
584	/*
585	** WEBPAGE: setup_login_group
586	**
	@@ -704,11 +704,11 @@
704	}
705	db_finalize(&q);
706	@ </tbody></table>
707	style_table_sorter();
708	}
709	style_finish_page("setup");
710	}
711
712	/*
713	** WEBPAGE: setup_timeline
714	**
	@@ -843,11 +843,11 @@
843
844	@ <hr />
845	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
846	@ </div></form>
847	db_end_transaction(0);
848	style_finish_page("setup");
849	}
850
851	/*
852	** WEBPAGE: setup_settings
853	**
	@@ -936,11 +936,11 @@
936	}
937	}
938	@ </td></tr></table>
939	@ </div></form>
940	db_end_transaction(0);
941	style_finish_page("setup");
942	}
943
944	/*
945	** WEBPAGE: setup_config
946	**
	@@ -1032,11 +1032,11 @@
1032	@ (Property: sitemap-contact)
1033	@ <hr />
1034	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1035	@ </div></form>
1036	db_end_transaction(0);
1037	style_finish_page("setup");
1038	}
1039
1040	/*
1041	** WEBPAGE: setup_wiki
1042	**
	@@ -1108,11 +1108,11 @@
1108	@ (Property: "wiki-use-html")
1109	@ <hr />
1110	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1111	@ </div></form>
1112	db_end_transaction(0);
1113	style_finish_page("setup");
1114	}
1115
1116	/*
1117	** WEBPAGE: setup_modreq
1118	**
	@@ -1154,11 +1154,11 @@
1154
1155	@ <hr />
1156	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1157	@ </div></form>
1158	db_end_transaction(0);
1159	style_finish_page("setup");
1160
1161	}
1162
1163	/*
1164	** WEBPAGE: setup_adunit
	@@ -1235,11 +1235,11 @@
1235	@ border: 1px solid #f11;
1236	@ background-color: #fcc;
1237	@ '>Demo Ad</div>
1238	@ </pre></blockquote>
1239	@ </li>
1240	style_finish_page("setup");
1241	db_end_transaction(0);
1242	}
1243
1244	/*
1245	** WEBPAGE: setup_logo
	@@ -1437,11 +1437,11 @@
1437	@ <hr />
1438	@
1439	@ <p><span class="note">Note:</span> Your browser has probably cached these
1440	@ images, so you may need to press the Reload button before changes will
1441	@ take effect. </p>
1442	style_finish_page("setup");
1443	db_end_transaction(0);
1444	}
1445
1446	/*
1447	** Prevent the RAW SQL feature from being used to ATTACH a different
	@@ -1599,11 +1599,11 @@
1599	}
1600	sqlite3_finalize(pStmt);
1601	@ </table>
1602	}
1603	}
1604	style_finish_page("setup");
1605	}
1606
1607
1608	/*
1609	** WEBPAGE: admin_th1
	@@ -1643,11 +1643,11 @@
1643	@ <pre class="th1result">%h(zR)</pre>
1644	}else{
1645	@ <pre class="th1error">%h(zR)</pre>
1646	}
1647	}
1648	style_finish_page("setup");
1649	}
1650
1651	/*
1652	** WEBPAGE: admin_log
1653	**
	@@ -1710,11 +1710,11 @@
1710	db_finalize(&stLog);
1711	@ </tbody></table>
1712	if( counter>ofst+limit ){
1713	@ <p><a href="admin_log?n=%d(limit)&x=%d(limit+ofst)">[Older]</a></p>
1714	}
1715	style_finish_page("setup");
1716	}
1717
1718	/*
1719	** WEBPAGE: srchsetup
1720	**
	@@ -1790,11 +1790,11 @@
1790	@ larger repositories.</p>
1791	onoff_attribute("Use Porter Stemmer","search-stemmer","ss",0,0);
1792	@ <p><input type="submit" name="fts1" value="Create A Full-Text Index">
1793	}
1794	@ </div></form>
1795	style_finish_page("setup");
1796	}
1797
1798	/*
1799	** A URL Alias originally called zOldName is now zNewName/zValue.
1800	** Write SQL to make this change into pSql.
	@@ -1948,7 +1948,7 @@
1948	@ <p>To delete an entry from the alias table, change its name or value to an
1949	@ empty string and press "Apply Changes".
1950	@
1951	@ <p>To add a new alias, fill in the name and value in the bottom row
1952	@ of the table above and press "Apply Changes".
1953	style_finish_page("setup");
1954	}
1955

M src/setupuser.c

+7 -7

		--- src/setupuser.c
		+++ src/setupuser.c
		@@ -180,11 +180,11 @@
180	180	fossil_free(zAge);
181	181	}
182	182	@ </tbody></table>
183	183	db_finalize(&s);
184	184	style_table_sorter();
185		- style_body_and_footer("setupuser");
	185	+ style_finish_page("setupuser");
186	186	}
187	187
188	188	/*
189	189	** WEBPAGE: setup_ulist_notes
190	190	**
		@@ -226,11 +226,11 @@
226	226	@
227	227	@ <li><p>The permission flags are as follows:</p>
228	228	capabilities_table(CAPCLASS_ALL);
229	229	@ </li>
230	230	@ </ol>
231		- style_body_and_footer("setupuser");
	231	+ style_finish_page("setupuser");
232	232	}
233	233
234	234	/*
235	235	** WEBPAGE: setup_ucap_list
236	236	**
		@@ -253,11 +253,11 @@
253	253	capabilities_table(CAPCLASS_WIKI);
254	254	@ <h1>Administrative capabilities</h1>
255	255	capabilities_table(CAPCLASS_SUPER);
256	256	@ <h1>Miscellaneous capabilities</h1>
257	257	capabilities_table(CAPCLASS_OTHER);
258		- style_body_and_footer("setupuser");
	258	+ style_finish_page("setupuser");
259	259	}
260	260
261	261	/*
262	262	** Return true if zPw is a valid password string. A valid
263	263	** password string is:
		@@ -387,11 +387,11 @@
387	387	style_header("User Creation Error");
388	388	@ <span class="loginError">Empty login not allowed.</span>
389	389	@
390	390	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
391	391	@ [Bummer]</a></p>
392		- style_body_and_footer("setupuser");
	392	+ style_finish_page("setupuser");
393	393	return;
394	394	}
395	395	if( isValidPwString(zPw) ){
396	396	zPw = sha1_shared_secret(zPw, zLogin, 0);
397	397	}else{
		@@ -404,11 +404,11 @@
404	404	@ <span class="loginError">Login "%h(zLogin)" is already used by
405	405	@ a different user.</span>
406	406	@
407	407	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
408	408	@ [Bummer]</a></p>
409		- style_body_and_footer("setupuser");
	409	+ style_finish_page("setupuser");
410	410	return;
411	411	}
412	412	login_verify_csrf_secret();
413	413	db_unprotect(PROTECT_USER);
414	414	db_multi_exec(
		@@ -456,11 +456,11 @@
456	456	admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
457	457	@ <span class="loginError">%h(zErr)</span>
458	458	@
459	459	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
460	460	@ [Bummer]</a></p>
461		- style_body_and_footer("setupuser");
	461	+ style_finish_page("setupuser");
462	462	return;
463	463	}
464	464	}
465	465	cgi_redirect(cgi_referer("setup_ulist"));
466	466	return;
		@@ -874,7 +874,7 @@
874	874	@ template for users who are allowed more access than
875	875	@ <span class="usertype">anonymous</span>,
876	876	@ but less than a <span class="usertype">developer</span>.
877	877	@ </p></li>
878	878	@ </ul>
879		- style_body_and_footer("setupuser");
	879	+ style_finish_page("setupuser");
880	880	}
881	881

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -180,11 +180,11 @@
180	fossil_free(zAge);
181	}
182	@ </tbody></table>
183	db_finalize(&s);
184	style_table_sorter();
185	style_body_and_footer("setupuser");
186	}
187
188	/*
189	** WEBPAGE: setup_ulist_notes
190	**
	@@ -226,11 +226,11 @@
226	@
227	@ <li><p>The permission flags are as follows:</p>
228	capabilities_table(CAPCLASS_ALL);
229	@ </li>
230	@ </ol>
231	style_body_and_footer("setupuser");
232	}
233
234	/*
235	** WEBPAGE: setup_ucap_list
236	**
	@@ -253,11 +253,11 @@
253	capabilities_table(CAPCLASS_WIKI);
254	@ <h1>Administrative capabilities</h1>
255	capabilities_table(CAPCLASS_SUPER);
256	@ <h1>Miscellaneous capabilities</h1>
257	capabilities_table(CAPCLASS_OTHER);
258	style_body_and_footer("setupuser");
259	}
260
261	/*
262	** Return true if zPw is a valid password string. A valid
263	** password string is:
	@@ -387,11 +387,11 @@
387	style_header("User Creation Error");
388	@ <span class="loginError">Empty login not allowed.</span>
389	@
390	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
391	@ [Bummer]</a></p>
392	style_body_and_footer("setupuser");
393	return;
394	}
395	if( isValidPwString(zPw) ){
396	zPw = sha1_shared_secret(zPw, zLogin, 0);
397	}else{
	@@ -404,11 +404,11 @@
404	@ <span class="loginError">Login "%h(zLogin)" is already used by
405	@ a different user.</span>
406	@
407	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
408	@ [Bummer]</a></p>
409	style_body_and_footer("setupuser");
410	return;
411	}
412	login_verify_csrf_secret();
413	db_unprotect(PROTECT_USER);
414	db_multi_exec(
	@@ -456,11 +456,11 @@
456	admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
457	@ <span class="loginError">%h(zErr)</span>
458	@
459	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
460	@ [Bummer]</a></p>
461	style_body_and_footer("setupuser");
462	return;
463	}
464	}
465	cgi_redirect(cgi_referer("setup_ulist"));
466	return;
	@@ -874,7 +874,7 @@
874	@ template for users who are allowed more access than
875	@ <span class="usertype">anonymous</span>,
876	@ but less than a <span class="usertype">developer</span>.
877	@ </p></li>
878	@ </ul>
879	style_body_and_footer("setupuser");
880	}
881

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -180,11 +180,11 @@
180	fossil_free(zAge);
181	}
182	@ </tbody></table>
183	db_finalize(&s);
184	style_table_sorter();
185	style_finish_page("setupuser");
186	}
187
188	/*
189	** WEBPAGE: setup_ulist_notes
190	**
	@@ -226,11 +226,11 @@
226	@
227	@ <li><p>The permission flags are as follows:</p>
228	capabilities_table(CAPCLASS_ALL);
229	@ </li>
230	@ </ol>
231	style_finish_page("setupuser");
232	}
233
234	/*
235	** WEBPAGE: setup_ucap_list
236	**
	@@ -253,11 +253,11 @@
253	capabilities_table(CAPCLASS_WIKI);
254	@ <h1>Administrative capabilities</h1>
255	capabilities_table(CAPCLASS_SUPER);
256	@ <h1>Miscellaneous capabilities</h1>
257	capabilities_table(CAPCLASS_OTHER);
258	style_finish_page("setupuser");
259	}
260
261	/*
262	** Return true if zPw is a valid password string. A valid
263	** password string is:
	@@ -387,11 +387,11 @@
387	style_header("User Creation Error");
388	@ <span class="loginError">Empty login not allowed.</span>
389	@
390	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
391	@ [Bummer]</a></p>
392	style_finish_page("setupuser");
393	return;
394	}
395	if( isValidPwString(zPw) ){
396	zPw = sha1_shared_secret(zPw, zLogin, 0);
397	}else{
	@@ -404,11 +404,11 @@
404	@ <span class="loginError">Login "%h(zLogin)" is already used by
405	@ a different user.</span>
406	@
407	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
408	@ [Bummer]</a></p>
409	style_finish_page("setupuser");
410	return;
411	}
412	login_verify_csrf_secret();
413	db_unprotect(PROTECT_USER);
414	db_multi_exec(
	@@ -456,11 +456,11 @@
456	admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
457	@ <span class="loginError">%h(zErr)</span>
458	@
459	@ <p><a href="setup_uedit?id=%d(uid)&referer=%T(zRef)">
460	@ [Bummer]</a></p>
461	style_finish_page("setupuser");
462	return;
463	}
464	}
465	cgi_redirect(cgi_referer("setup_ulist"));
466	return;
	@@ -874,7 +874,7 @@
874	@ template for users who are allowed more access than
875	@ <span class="usertype">anonymous</span>,
876	@ but less than a <span class="usertype">developer</span>.
877	@ </p></li>
878	@ </ul>
879	style_finish_page("setupuser");
880	}
881

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_body_and_footer("shun");
	268	+ style_finish_page("shun");
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_body_and_footer("rcvfromlist");
	408	+ style_finish_page("rcvfromlist");
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_body_and_footer("rcvfrom");
	554	+ style_finish_page("rcvfrom");
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_body_and_footer("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_body_and_footer("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_body_and_footer("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("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

M src/sitemap.c

+1 -1

		--- src/sitemap.c
		+++ src/sitemap.c
		@@ -233,8 +233,8 @@
233	233	@ colors assigned to branch names</a>
234	234	@ <li>%z(href("%R/test-captcha"))Random ASCII-art Captcha image</a></li>
235	235	@ </ul></li>
236	236	@ </ul>
237	237	if( !isPopup ){
238		- style_body_and_footer("sitemap");
	238	+ style_finish_page("sitemap");
239	239	}
240	240	}
241	241

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -233,8 +233,8 @@
233	@ colors assigned to branch names</a>
234	@ <li>%z(href("%R/test-captcha"))Random ASCII-art Captcha image</a></li>
235	@ </ul></li>
236	@ </ul>
237	if( !isPopup ){
238	style_body_and_footer("sitemap");
239	}
240	}
241

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -233,8 +233,8 @@
233	@ colors assigned to branch names</a>
234	@ <li>%z(href("%R/test-captcha"))Random ASCII-art Captcha image</a></li>
235	@ </ul></li>
236	@ </ul>
237	if( !isPopup ){
238	style_finish_page("sitemap");
239	}
240	}
241

M src/skins.c

+6 -6

		--- src/skins.c
		+++ src/skins.c
		@@ -401,11 +401,11 @@
401	401	@ <input type="submit" name="rename" value="Rename">
402	402	@ <input type="submit" name="canren" value="Cancel">
403	403	@ </table>
404	404	login_insert_csrf_secret();
405	405	@ </div></form>
406		- style_body_and_footer("skins");
	406	+ style_finish_page("skins");
407	407	return 1;
408	408	}
409	409	db_unprotect(PROTECT_CONFIG);
410	410	db_multi_exec(
411	411	"UPDATE config SET name='skin:%q' WHERE name='skin:%q';",
		@@ -441,11 +441,11 @@
441	441	@ <input type="submit" name="save" value="Save">
442	442	@ <input type="submit" name="cansave" value="Cancel">
443	443	@ </table>
444	444	login_insert_csrf_secret();
445	445	@ </div></form>
446		- style_body_and_footer("skins");
	446	+ style_finish_page("skins");
447	447	return 1;
448	448	}
449	449	db_unprotect(PROTECT_CONFIG);
450	450	db_multi_exec(
451	451	"INSERT OR IGNORE INTO config(name, value, mtime)"
		@@ -492,11 +492,11 @@
492	492	@ <input type="hidden" name="sn" value="%h(P("sn"))" />
493	493	@ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
494	494	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
495	495	login_insert_csrf_secret();
496	496	@ </div></form>
497		- style_body_and_footer("skins");
	497	+ style_finish_page("skins");
498	498	db_end_transaction(1);
499	499	return;
500	500	}
501	501	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
502	502	db_unprotect(PROTECT_CONFIG);
		@@ -645,11 +645,11 @@
645	645	@ </form></tr>
646	646	}
647	647	db_finalize(&q);
648	648
649	649	@ </table>
650		- style_body_and_footer("skins");
	650	+ style_finish_page("skins");
651	651	db_end_transaction(0);
652	652	}
653	653
654	654	/*
655	655	** Generate HTML for a <select> that lists all the available skin names,
		@@ -842,11 +842,11 @@
842	842	blob_reset(&from);
843	843	blob_reset(&to);
844	844	blob_reset(&out);
845	845	}
846	846	@ </div></form>
847		- style_body_and_footer("skins");
	847	+ style_finish_page("skins");
848	848	db_end_transaction(0);
849	849	}
850	850
851	851	/*
852	852	** Try to initialize draft skin iSkin to the built-in or preexisting
		@@ -1120,7 +1120,7 @@
1120	1120	}else{
1121	1121	@ <p>Visit the <a href='%R/setup_skin_admin'>Skin Admin</a> page
1122	1122	@ for cleanup and recovery actions.
1123	1123	}
1124	1124	builtin_request_js("skin.js");
1125		- style_body_and_footer("skins");
	1125	+ style_finish_page("skins");
1126	1126	}
1127	1127

	--- src/skins.c
	+++ src/skins.c
	@@ -401,11 +401,11 @@
401	@ <input type="submit" name="rename" value="Rename">
402	@ <input type="submit" name="canren" value="Cancel">
403	@ </table>
404	login_insert_csrf_secret();
405	@ </div></form>
406	style_body_and_footer("skins");
407	return 1;
408	}
409	db_unprotect(PROTECT_CONFIG);
410	db_multi_exec(
411	"UPDATE config SET name='skin:%q' WHERE name='skin:%q';",
	@@ -441,11 +441,11 @@
441	@ <input type="submit" name="save" value="Save">
442	@ <input type="submit" name="cansave" value="Cancel">
443	@ </table>
444	login_insert_csrf_secret();
445	@ </div></form>
446	style_body_and_footer("skins");
447	return 1;
448	}
449	db_unprotect(PROTECT_CONFIG);
450	db_multi_exec(
451	"INSERT OR IGNORE INTO config(name, value, mtime)"
	@@ -492,11 +492,11 @@
492	@ <input type="hidden" name="sn" value="%h(P("sn"))" />
493	@ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
494	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
495	login_insert_csrf_secret();
496	@ </div></form>
497	style_body_and_footer("skins");
498	db_end_transaction(1);
499	return;
500	}
501	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
502	db_unprotect(PROTECT_CONFIG);
	@@ -645,11 +645,11 @@
645	@ </form></tr>
646	}
647	db_finalize(&q);
648
649	@ </table>
650	style_body_and_footer("skins");
651	db_end_transaction(0);
652	}
653
654	/*
655	** Generate HTML for a <select> that lists all the available skin names,
	@@ -842,11 +842,11 @@
842	blob_reset(&from);
843	blob_reset(&to);
844	blob_reset(&out);
845	}
846	@ </div></form>
847	style_body_and_footer("skins");
848	db_end_transaction(0);
849	}
850
851	/*
852	** Try to initialize draft skin iSkin to the built-in or preexisting
	@@ -1120,7 +1120,7 @@
1120	}else{
1121	@ <p>Visit the <a href='%R/setup_skin_admin'>Skin Admin</a> page
1122	@ for cleanup and recovery actions.
1123	}
1124	builtin_request_js("skin.js");
1125	style_body_and_footer("skins");
1126	}
1127

	--- src/skins.c
	+++ src/skins.c
	@@ -401,11 +401,11 @@
401	@ <input type="submit" name="rename" value="Rename">
402	@ <input type="submit" name="canren" value="Cancel">
403	@ </table>
404	login_insert_csrf_secret();
405	@ </div></form>
406	style_finish_page("skins");
407	return 1;
408	}
409	db_unprotect(PROTECT_CONFIG);
410	db_multi_exec(
411	"UPDATE config SET name='skin:%q' WHERE name='skin:%q';",
	@@ -441,11 +441,11 @@
441	@ <input type="submit" name="save" value="Save">
442	@ <input type="submit" name="cansave" value="Cancel">
443	@ </table>
444	login_insert_csrf_secret();
445	@ </div></form>
446	style_finish_page("skins");
447	return 1;
448	}
449	db_unprotect(PROTECT_CONFIG);
450	db_multi_exec(
451	"INSERT OR IGNORE INTO config(name, value, mtime)"
	@@ -492,11 +492,11 @@
492	@ <input type="hidden" name="sn" value="%h(P("sn"))" />
493	@ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
494	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
495	login_insert_csrf_secret();
496	@ </div></form>
497	style_finish_page("skins");
498	db_end_transaction(1);
499	return;
500	}
501	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
502	db_unprotect(PROTECT_CONFIG);
	@@ -645,11 +645,11 @@
645	@ </form></tr>
646	}
647	db_finalize(&q);
648
649	@ </table>
650	style_finish_page("skins");
651	db_end_transaction(0);
652	}
653
654	/*
655	** Generate HTML for a <select> that lists all the available skin names,
	@@ -842,11 +842,11 @@
842	blob_reset(&from);
843	blob_reset(&to);
844	blob_reset(&out);
845	}
846	@ </div></form>
847	style_finish_page("skins");
848	db_end_transaction(0);
849	}
850
851	/*
852	** Try to initialize draft skin iSkin to the built-in or preexisting
	@@ -1120,7 +1120,7 @@
1120	}else{
1121	@ <p>Visit the <a href='%R/setup_skin_admin'>Skin Admin</a> page
1122	@ for cleanup and recovery actions.
1123	}
1124	builtin_request_js("skin.js");
1125	style_finish_page("skins");
1126	}
1127

M src/smtp.c

+2 -2

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

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

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

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_body_and_footer("stat");
	293	+ style_finish_page("stat");
294	294	}
295	295
296	296	/*
297	297	** COMMAND: dbstat
298	298	**
		@@ -507,11 +507,11 @@
507	507	}else{
508	508	@ <p>%h(zRemote)</p>
509	509	}
510	510	@ </div>
511	511	}
512		- style_body_and_footer("stat");
	512	+ style_finish_page("stat");
513	513	}
514	514
515	515	/*
516	516	** WEBPAGE: repo_schema
517	517	**
		@@ -565,11 +565,11 @@
565	565	db_finalize(&q);
566	566	}else{
567	567	style_submenu_element("Stat1","repo_stat1");
568	568	}
569	569	}
570		- style_body_and_footer("stat");
	570	+ style_finish_page("stat");
571	571	}
572	572
573	573	/*
574	574	** WEBPAGE: repo_stat1
575	575	**
		@@ -597,11 +597,11 @@
597	597	@ INSERT INTO sqlite_stat1 VALUES('%z(zUrl)%h(zTab)</a>','%h(zIdx)','%h(zStat)');
598	598	}
599	599	@ </pre>
600	600	db_finalize(&q);
601	601	}
602		- style_body_and_footer("stat");
	602	+ style_finish_page("stat");
603	603	}
604	604
605	605	/*
606	606	** WEBPAGE: repo-tabsize
607	607	**
		@@ -669,11 +669,11 @@
669	669	@ <h2>%h(file_tail(g.zLocalDbName)) Size: %s(zBuf)</h2>
670	670	@ <center><svg width='800' height='500'>
671	671	piechart_render(800,500,PIE_OTHER\|PIE_PERCENT);
672	672	@ </svg></center>
673	673	}
674		- style_body_and_footer("stat");
	674	+ style_finish_page("stat");
675	675	}
676	676
677	677	/*
678	678	** Gather statistics on artifact types, counts, and sizes.
679	679	**
		@@ -810,11 +810,11 @@
810	810	sumCmpr = db_column_int64(&q, 4);
811	811	sumExp = db_column_int64(&q, 5);
812	812	db_finalize(&q);
813	813	if( nTotal==0 ){
814	814	@ No artifacts in this repository!
815		- style_body_and_footer("stat");
	815	+ style_finish_page("stat");
816	816	return;
817	817	}
818	818	avgCmpr = (double)sumCmpr/nTotal;
819	819	avgExp = (double)sumExp/nTotal;
820	820
		@@ -955,7 +955,7 @@
955	955	}
956	956	@ </tbody></table></div>
957	957	db_finalize(&q);
958	958	}
959	959	style_table_sorter();
960		- style_body_and_footer("stat");
	960	+ style_finish_page("stat");
961	961	}
962	962

	--- 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_body_and_footer("stat");
294	}
295
296	/*
297	** COMMAND: dbstat
298	**
	@@ -507,11 +507,11 @@
507	}else{
508	@ <p>%h(zRemote)</p>
509	}
510	@ </div>
511	}
512	style_body_and_footer("stat");
513	}
514
515	/*
516	** WEBPAGE: repo_schema
517	**
	@@ -565,11 +565,11 @@
565	db_finalize(&q);
566	}else{
567	style_submenu_element("Stat1","repo_stat1");
568	}
569	}
570	style_body_and_footer("stat");
571	}
572
573	/*
574	** WEBPAGE: repo_stat1
575	**
	@@ -597,11 +597,11 @@
597	@ INSERT INTO sqlite_stat1 VALUES('%z(zUrl)%h(zTab)</a>','%h(zIdx)','%h(zStat)');
598	}
599	@ </pre>
600	db_finalize(&q);
601	}
602	style_body_and_footer("stat");
603	}
604
605	/*
606	** WEBPAGE: repo-tabsize
607	**
	@@ -669,11 +669,11 @@
669	@ <h2>%h(file_tail(g.zLocalDbName)) Size: %s(zBuf)</h2>
670	@ <center><svg width='800' height='500'>
671	piechart_render(800,500,PIE_OTHER\|PIE_PERCENT);
672	@ </svg></center>
673	}
674	style_body_and_footer("stat");
675	}
676
677	/*
678	** Gather statistics on artifact types, counts, and sizes.
679	**
	@@ -810,11 +810,11 @@
810	sumCmpr = db_column_int64(&q, 4);
811	sumExp = db_column_int64(&q, 5);
812	db_finalize(&q);
813	if( nTotal==0 ){
814	@ No artifacts in this repository!
815	style_body_and_footer("stat");
816	return;
817	}
818	avgCmpr = (double)sumCmpr/nTotal;
819	avgExp = (double)sumExp/nTotal;
820
	@@ -955,7 +955,7 @@
955	}
956	@ </tbody></table></div>
957	db_finalize(&q);
958	}
959	style_table_sorter();
960	style_body_and_footer("stat");
961	}
962

	--- 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	**
	@@ -507,11 +507,11 @@
507	}else{
508	@ <p>%h(zRemote)</p>
509	}
510	@ </div>
511	}
512	style_finish_page("stat");
513	}
514
515	/*
516	** WEBPAGE: repo_schema
517	**
	@@ -565,11 +565,11 @@
565	db_finalize(&q);
566	}else{
567	style_submenu_element("Stat1","repo_stat1");
568	}
569	}
570	style_finish_page("stat");
571	}
572
573	/*
574	** WEBPAGE: repo_stat1
575	**
	@@ -597,11 +597,11 @@
597	@ INSERT INTO sqlite_stat1 VALUES('%z(zUrl)%h(zTab)</a>','%h(zIdx)','%h(zStat)');
598	}
599	@ </pre>
600	db_finalize(&q);
601	}
602	style_finish_page("stat");
603	}
604
605	/*
606	** WEBPAGE: repo-tabsize
607	**
	@@ -669,11 +669,11 @@
669	@ <h2>%h(file_tail(g.zLocalDbName)) Size: %s(zBuf)</h2>
670	@ <center><svg width='800' height='500'>
671	piechart_render(800,500,PIE_OTHER\|PIE_PERCENT);
672	@ </svg></center>
673	}
674	style_finish_page("stat");
675	}
676
677	/*
678	** Gather statistics on artifact types, counts, and sizes.
679	**
	@@ -810,11 +810,11 @@
810	sumCmpr = db_column_int64(&q, 4);
811	sumExp = db_column_int64(&q, 5);
812	db_finalize(&q);
813	if( nTotal==0 ){
814	@ No artifacts in this repository!
815	style_finish_page("stat");
816	return;
817	}
818	avgCmpr = (double)sumCmpr/nTotal;
819	avgExp = (double)sumExp/nTotal;
820
	@@ -955,7 +955,7 @@
955	}
956	@ </tbody></table></div>
957	db_finalize(&q);
958	}
959	style_table_sorter();
960	style_finish_page("stat");
961	}
962

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_body_and_footer("reports");
	830	+ style_finish_page("reports");
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_body_and_footer("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("reports");
831	}
832

M src/style.c

+18 -3

		--- src/style.c
		+++ src/style.c
		@@ -736,13 +736,28 @@
736	736	@ </script>
737	737	builtin_fulfill_js_requests();
738	738	}
739	739
740	740	/*
741		-** Emit the page body and footer HTML.
	741	+** Invoke this routine after all of the content for a webpage has been
	742	+** generated. This routine should be called once for every webpage, at
	743	+** or near the end of page generation. This routine does the following:
	744	+**
	745	+** * Populates the header of the page, including setting up appropriate
	746	+** submenu elements. The header generation is deferred until this point
	747	+** so that we know that all style_submenu_element() and similar have
	748	+** been received.
	749	+**
	750	+** * Finalizes the page content.
	751	+**
	752	+** * Appends the footer.
	753	+**
	754	+** The zPageType argument is a class name inserted in the <div> that
	755	+** surrounds the page content. CSS can use this to have different styles
	756	+** according to the page type.
742	757	*/
743		-void style_body_and_footer(const char* zPageType){
	758	+void style_finish_page(const char* zPageType){
744	759	const char *zFooter;
745	760	const char *zAd = 0;
746	761	unsigned int mAdFlags = 0;
747	762
748	763	if( !headerHasBeenGenerated ) return;
		@@ -1189,11 +1204,11 @@
1189	1204	@ <pre>
1190	1205	@ %h(blob_str(&g.httpHeader))
1191	1206	@ </pre>
1192	1207	}
1193	1208	}
1194		- style_body_and_footer("error");
	1209	+ style_finish_page("error");
1195	1210	if( zErr ){
1196	1211	cgi_reply();
1197	1212	fossil_exit(1);
1198	1213	}
1199	1214	}
1200	1215

	--- src/style.c
	+++ src/style.c
	@@ -736,13 +736,28 @@
736	@ </script>
737	builtin_fulfill_js_requests();
738	}
739
740	/*
741	** Emit the page body and footer HTML.















742	*/
743	void style_body_and_footer(const char* zPageType){
744	const char *zFooter;
745	const char *zAd = 0;
746	unsigned int mAdFlags = 0;
747
748	if( !headerHasBeenGenerated ) return;
	@@ -1189,11 +1204,11 @@
1189	@ <pre>
1190	@ %h(blob_str(&g.httpHeader))
1191	@ </pre>
1192	}
1193	}
1194	style_body_and_footer("error");
1195	if( zErr ){
1196	cgi_reply();
1197	fossil_exit(1);
1198	}
1199	}
1200

	--- src/style.c
	+++ src/style.c
	@@ -736,13 +736,28 @@
736	@ </script>
737	builtin_fulfill_js_requests();
738	}
739
740	/*
741	** Invoke this routine after all of the content for a webpage has been
742	** generated. This routine should be called once for every webpage, at
743	** or near the end of page generation. This routine does the following:
744	**
745	** * Populates the header of the page, including setting up appropriate
746	** submenu elements. The header generation is deferred until this point
747	** so that we know that all style_submenu_element() and similar have
748	** been received.
749	**
750	** * Finalizes the page content.
751	**
752	** * Appends the footer.
753	**
754	** The zPageType argument is a class name inserted in the <div> that
755	** surrounds the page content. CSS can use this to have different styles
756	** according to the page type.
757	*/
758	void style_finish_page(const char* zPageType){
759	const char *zFooter;
760	const char *zAd = 0;
761	unsigned int mAdFlags = 0;
762
763	if( !headerHasBeenGenerated ) return;
	@@ -1189,11 +1204,11 @@
1204	@ <pre>
1205	@ %h(blob_str(&g.httpHeader))
1206	@ </pre>
1207	}
1208	}
1209	style_finish_page("error");
1210	if( zErr ){
1211	cgi_reply();
1212	fossil_exit(1);
1213	}
1214	}
1215

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_body_and_footer("taglist");
	729	+ style_finish_page("taglist");
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_body_and_footer("tagtimeline");
	786	+ style_finish_page("tagtimeline");
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_body_and_footer("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_body_and_footer("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("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

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_body_and_footer("tarball");
	790	+ style_finish_page("tarball");
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_body_and_footer("tarball");
	801	+ style_finish_page("tarball");
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_body_and_footer("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_body_and_footer("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("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

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_body_and_footer("th1"); /* TODO: add optional parameter to pass along? */
	1483	+ style_finish_page("th1"); /* TODO: add optional parameter to pass along? */
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_body_and_footer("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("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

M src/timeline.c

+4 -4

		--- src/timeline.c
		+++ src/timeline.c
		@@ -214,11 +214,11 @@
214	214	zBr = P(zNm);
215	215	@ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br />
216	216	}
217	217	@ <input type="submit">
218	218	@ </form>
219		- style_body_and_footer("test");
	219	+ style_finish_page("test");
220	220	}
221	221
222	222	/*
223	223	** Return a new timelineTable id.
224	224	*/
		@@ -2625,11 +2625,11 @@
2625	2625	db_finalize(&q);
2626	2626	if( zOlderButton ){
2627	2627	@ %z(chref("button","%z",zOlderButton))More ↓</a>
2628	2628	}
2629	2629	document_emit_js(/handles pikchrs rendered above/);
2630		- style_body_and_footer("timeline");
	2630	+ style_finish_page("timeline");
2631	2631	}
2632	2632
2633	2633	/*
2634	2634	** The input query q selects various records. Print a human-readable
2635	2635	** summary of those records.
		@@ -3117,11 +3117,11 @@
3117	3117	@ <small>%z(href("%R/timeline?c=%t",zId))(more context)</a>\
3118	3118	@ </small></h2>
3119	3119	www_print_timeline(&q, TIMELINE_GRAPH, 0, 0, 0, 0, 0, 0);
3120	3120	}
3121	3121	db_finalize(&q);
3122		- style_body_and_footer("timeline");
	3122	+ style_finish_page("timeline");
3123	3123	}
3124	3124
3125	3125
3126	3126	/*
3127	3127	** COMMAND: test-timewarp-list
		@@ -3223,7 +3223,7 @@
3223	3223	if( cnt==0 ){
3224	3224	@ <p>No timewarps in this repository</p>
3225	3225	}else{
3226	3226	@ </tbody></table></div>
3227	3227	}
3228		- style_body_and_footer("timewarps");
	3228	+ style_finish_page("timewarps");
3229	3229	}
3230	3230

	--- src/timeline.c
	+++ src/timeline.c
	@@ -214,11 +214,11 @@
214	zBr = P(zNm);
215	@ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br />
216	}
217	@ <input type="submit">
218	@ </form>
219	style_body_and_footer("test");
220	}
221
222	/*
223	** Return a new timelineTable id.
224	*/
	@@ -2625,11 +2625,11 @@
2625	db_finalize(&q);
2626	if( zOlderButton ){
2627	@ %z(chref("button","%z",zOlderButton))More ↓</a>
2628	}
2629	document_emit_js(/handles pikchrs rendered above/);
2630	style_body_and_footer("timeline");
2631	}
2632
2633	/*
2634	** The input query q selects various records. Print a human-readable
2635	** summary of those records.
	@@ -3117,11 +3117,11 @@
3117	@ <small>%z(href("%R/timeline?c=%t",zId))(more context)</a>\
3118	@ </small></h2>
3119	www_print_timeline(&q, TIMELINE_GRAPH, 0, 0, 0, 0, 0, 0);
3120	}
3121	db_finalize(&q);
3122	style_body_and_footer("timeline");
3123	}
3124
3125
3126	/*
3127	** COMMAND: test-timewarp-list
	@@ -3223,7 +3223,7 @@
3223	if( cnt==0 ){
3224	@ <p>No timewarps in this repository</p>
3225	}else{
3226	@ </tbody></table></div>
3227	}
3228	style_body_and_footer("timewarps");
3229	}
3230

	--- src/timeline.c
	+++ src/timeline.c
	@@ -214,11 +214,11 @@
214	zBr = P(zNm);
215	@ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br />
216	}
217	@ <input type="submit">
218	@ </form>
219	style_finish_page("test");
220	}
221
222	/*
223	** Return a new timelineTable id.
224	*/
	@@ -2625,11 +2625,11 @@
2625	db_finalize(&q);
2626	if( zOlderButton ){
2627	@ %z(chref("button","%z",zOlderButton))More ↓</a>
2628	}
2629	document_emit_js(/handles pikchrs rendered above/);
2630	style_finish_page("timeline");
2631	}
2632
2633	/*
2634	** The input query q selects various records. Print a human-readable
2635	** summary of those records.
	@@ -3117,11 +3117,11 @@
3117	@ <small>%z(href("%R/timeline?c=%t",zId))(more context)</a>\
3118	@ </small></h2>
3119	www_print_timeline(&q, TIMELINE_GRAPH, 0, 0, 0, 0, 0, 0);
3120	}
3121	db_finalize(&q);
3122	style_finish_page("timeline");
3123	}
3124
3125
3126	/*
3127	** COMMAND: test-timewarp-list
	@@ -3223,7 +3223,7 @@
3223	if( cnt==0 ){
3224	@ <p>No timewarps in this repository</p>
3225	}else{
3226	@ </tbody></table></div>
3227	}
3228	style_finish_page("timewarps");
3229	}
3230

M src/tkt.c

+11 -11

		--- src/tkt.c
		+++ src/tkt.c
		@@ -617,11 +617,11 @@
617	617	" WHERE tkt_uuid GLOB '%q*'", zUuid);
618	618	if( zFullName ){
619	619	attachment_list(zFullName, "<hr /><h2>Attachments:</h2><ul>");
620	620	}
621	621
622		- style_body_and_footer("tkt");
	622	+ style_finish_page("tkt");
623	623	}
624	624
625	625	/*
626	626	** TH1 command: append_field FIELD STRING
627	627	**
		@@ -840,11 +840,11 @@
840	840	return;
841	841	}
842	842	captcha_generate(0);
843	843	@ </form>
844	844	if( g.thTrace ) Th_Trace("END_TKTVIEW<br />\n", -1);
845		- style_body_and_footer("tkt");
	845	+ style_finish_page("tkt");
846	846	}
847	847
848	848	/*
849	849	** WEBPAGE: tktedit
850	850	** WEBPAGE: debug_tktedit
		@@ -873,24 +873,24 @@
873	873	}
874	874	style_header("Edit Ticket");
875	875	if( zName==0 \|\| (nName = strlen(zName))<4 \|\| nName>HNAME_LEN_SHA1
876	876	\|\| !validate16(zName,nName) ){
877	877	@ <span class="tktError">Not a valid ticket id: "%h(zName)"</span>
878		- style_body_and_footer("tkt");
	878	+ style_finish_page("tkt");
879	879	return;
880	880	}
881	881	nRec = db_int(0, "SELECT count() FROM ticket WHERE tkt_uuid GLOB '%q'",
882	882	zName);
883	883	if( nRec==0 ){
884	884	@ <span class="tktError">No such ticket: "%h(zName)"</span>
885		- style_body_and_footer("tkt");
	885	+ style_finish_page("tkt");
886	886	return;
887	887	}
888	888	if( nRec>1 ){
889	889	@ <span class="tktError">%d(nRec) tickets begin with:
890	890	@ "%h(zName)"</span>
891		- style_body_and_footer("tkt");
	891	+ style_finish_page("tkt");
892	892	return;
893	893	}
894	894	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
895	895	ticket_init();
896	896	getAllTicketFields();
		@@ -911,11 +911,11 @@
911	911	return;
912	912	}
913	913	captcha_generate(0);
914	914	@ </form>
915	915	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
916		- style_body_and_footer("tkt");
	916	+ style_finish_page("tkt");
917	917	}
918	918
919	919	/*
920	920	** Check the ticket table schema in zSchema to see if it appears to
921	921	** be well-formed. If everything is OK, return NULL. If something is
		@@ -1041,15 +1041,15 @@
1041	1041	sqlite3_snprintf(6, zGlobPattern, "%s", zUuid);
1042	1042	canonical16(zGlobPattern, strlen(zGlobPattern));
1043	1043	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1044	1044	if( tagid==0 ){
1045	1045	@ No such ticket: %h(zUuid)
1046		- style_body_and_footer("tkt");
	1046	+ style_finish_page("tkt");
1047	1047	return;
1048	1048	}
1049	1049	tkt_draw_timeline(tagid, zType);
1050		- style_body_and_footer("tkt");
	1050	+ style_finish_page("tkt");
1051	1051	}
1052	1052
1053	1053	/*
1054	1054	** WEBPAGE: tkthistory
1055	1055	** URL: /tkthistory?name=TICKETUUID
		@@ -1088,11 +1088,11 @@
1088	1088	style_header("%z", zTitle);
1089	1089
1090	1090	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1091	1091	if( tagid==0 ){
1092	1092	@ No such ticket: %h(zUuid)
1093		- style_body_and_footer("tkt");
	1093	+ style_finish_page("tkt");
1094	1094	return;
1095	1095	}
1096	1096	if( P("raw")!=0 ){
1097	1097	@ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2>
1098	1098	}else{
		@@ -1161,11 +1161,11 @@
1161	1161	}
1162	1162	db_finalize(&q);
1163	1163	if( nChng ){
1164	1164	@ </ol>
1165	1165	}
1166		- style_body_and_footer("tkt");
	1166	+ style_finish_page("tkt");
1167	1167	}
1168	1168
1169	1169	/*
1170	1170	** Return TRUE if the given BLOB contains a newline character.
1171	1171	*/
		@@ -1613,7 +1613,7 @@
1613	1613	void tkt_srchpage(void){
1614	1614	login_check_credentials();
1615	1615	style_header("Ticket Search");
1616	1616	ticket_standard_submenu(T_ALL_BUT(T_SRCH));
1617	1617	search_screen(SRCH_TKT, 0);
1618		- style_body_and_footer("tkt");
	1618	+ style_finish_page("tkt");
1619	1619	}
1620	1620

	--- src/tkt.c
	+++ src/tkt.c
	@@ -617,11 +617,11 @@
617	" WHERE tkt_uuid GLOB '%q*'", zUuid);
618	if( zFullName ){
619	attachment_list(zFullName, "<hr /><h2>Attachments:</h2><ul>");
620	}
621
622	style_body_and_footer("tkt");
623	}
624
625	/*
626	** TH1 command: append_field FIELD STRING
627	**
	@@ -840,11 +840,11 @@
840	return;
841	}
842	captcha_generate(0);
843	@ </form>
844	if( g.thTrace ) Th_Trace("END_TKTVIEW<br />\n", -1);
845	style_body_and_footer("tkt");
846	}
847
848	/*
849	** WEBPAGE: tktedit
850	** WEBPAGE: debug_tktedit
	@@ -873,24 +873,24 @@
873	}
874	style_header("Edit Ticket");
875	if( zName==0 \|\| (nName = strlen(zName))<4 \|\| nName>HNAME_LEN_SHA1
876	\|\| !validate16(zName,nName) ){
877	@ <span class="tktError">Not a valid ticket id: "%h(zName)"</span>
878	style_body_and_footer("tkt");
879	return;
880	}
881	nRec = db_int(0, "SELECT count() FROM ticket WHERE tkt_uuid GLOB '%q'",
882	zName);
883	if( nRec==0 ){
884	@ <span class="tktError">No such ticket: "%h(zName)"</span>
885	style_body_and_footer("tkt");
886	return;
887	}
888	if( nRec>1 ){
889	@ <span class="tktError">%d(nRec) tickets begin with:
890	@ "%h(zName)"</span>
891	style_body_and_footer("tkt");
892	return;
893	}
894	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
895	ticket_init();
896	getAllTicketFields();
	@@ -911,11 +911,11 @@
911	return;
912	}
913	captcha_generate(0);
914	@ </form>
915	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
916	style_body_and_footer("tkt");
917	}
918
919	/*
920	** Check the ticket table schema in zSchema to see if it appears to
921	** be well-formed. If everything is OK, return NULL. If something is
	@@ -1041,15 +1041,15 @@
1041	sqlite3_snprintf(6, zGlobPattern, "%s", zUuid);
1042	canonical16(zGlobPattern, strlen(zGlobPattern));
1043	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1044	if( tagid==0 ){
1045	@ No such ticket: %h(zUuid)
1046	style_body_and_footer("tkt");
1047	return;
1048	}
1049	tkt_draw_timeline(tagid, zType);
1050	style_body_and_footer("tkt");
1051	}
1052
1053	/*
1054	** WEBPAGE: tkthistory
1055	** URL: /tkthistory?name=TICKETUUID
	@@ -1088,11 +1088,11 @@
1088	style_header("%z", zTitle);
1089
1090	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1091	if( tagid==0 ){
1092	@ No such ticket: %h(zUuid)
1093	style_body_and_footer("tkt");
1094	return;
1095	}
1096	if( P("raw")!=0 ){
1097	@ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2>
1098	}else{
	@@ -1161,11 +1161,11 @@
1161	}
1162	db_finalize(&q);
1163	if( nChng ){
1164	@ </ol>
1165	}
1166	style_body_and_footer("tkt");
1167	}
1168
1169	/*
1170	** Return TRUE if the given BLOB contains a newline character.
1171	*/
	@@ -1613,7 +1613,7 @@
1613	void tkt_srchpage(void){
1614	login_check_credentials();
1615	style_header("Ticket Search");
1616	ticket_standard_submenu(T_ALL_BUT(T_SRCH));
1617	search_screen(SRCH_TKT, 0);
1618	style_body_and_footer("tkt");
1619	}
1620

	--- src/tkt.c
	+++ src/tkt.c
	@@ -617,11 +617,11 @@
617	" WHERE tkt_uuid GLOB '%q*'", zUuid);
618	if( zFullName ){
619	attachment_list(zFullName, "<hr /><h2>Attachments:</h2><ul>");
620	}
621
622	style_finish_page("tkt");
623	}
624
625	/*
626	** TH1 command: append_field FIELD STRING
627	**
	@@ -840,11 +840,11 @@
840	return;
841	}
842	captcha_generate(0);
843	@ </form>
844	if( g.thTrace ) Th_Trace("END_TKTVIEW<br />\n", -1);
845	style_finish_page("tkt");
846	}
847
848	/*
849	** WEBPAGE: tktedit
850	** WEBPAGE: debug_tktedit
	@@ -873,24 +873,24 @@
873	}
874	style_header("Edit Ticket");
875	if( zName==0 \|\| (nName = strlen(zName))<4 \|\| nName>HNAME_LEN_SHA1
876	\|\| !validate16(zName,nName) ){
877	@ <span class="tktError">Not a valid ticket id: "%h(zName)"</span>
878	style_finish_page("tkt");
879	return;
880	}
881	nRec = db_int(0, "SELECT count() FROM ticket WHERE tkt_uuid GLOB '%q'",
882	zName);
883	if( nRec==0 ){
884	@ <span class="tktError">No such ticket: "%h(zName)"</span>
885	style_finish_page("tkt");
886	return;
887	}
888	if( nRec>1 ){
889	@ <span class="tktError">%d(nRec) tickets begin with:
890	@ "%h(zName)"</span>
891	style_finish_page("tkt");
892	return;
893	}
894	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
895	ticket_init();
896	getAllTicketFields();
	@@ -911,11 +911,11 @@
911	return;
912	}
913	captcha_generate(0);
914	@ </form>
915	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
916	style_finish_page("tkt");
917	}
918
919	/*
920	** Check the ticket table schema in zSchema to see if it appears to
921	** be well-formed. If everything is OK, return NULL. If something is
	@@ -1041,15 +1041,15 @@
1041	sqlite3_snprintf(6, zGlobPattern, "%s", zUuid);
1042	canonical16(zGlobPattern, strlen(zGlobPattern));
1043	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1044	if( tagid==0 ){
1045	@ No such ticket: %h(zUuid)
1046	style_finish_page("tkt");
1047	return;
1048	}
1049	tkt_draw_timeline(tagid, zType);
1050	style_finish_page("tkt");
1051	}
1052
1053	/*
1054	** WEBPAGE: tkthistory
1055	** URL: /tkthistory?name=TICKETUUID
	@@ -1088,11 +1088,11 @@
1088	style_header("%z", zTitle);
1089
1090	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
1091	if( tagid==0 ){
1092	@ No such ticket: %h(zUuid)
1093	style_finish_page("tkt");
1094	return;
1095	}
1096	if( P("raw")!=0 ){
1097	@ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2>
1098	}else{
	@@ -1161,11 +1161,11 @@
1161	}
1162	db_finalize(&q);
1163	if( nChng ){
1164	@ </ol>
1165	}
1166	style_finish_page("tkt");
1167	}
1168
1169	/*
1170	** Return TRUE if the given BLOB contains a newline character.
1171	*/
	@@ -1613,7 +1613,7 @@
1613	void tkt_srchpage(void){
1614	login_check_credentials();
1615	style_header("Ticket Search");
1616	ticket_standard_submenu(T_ALL_BUT(T_SRCH));
1617	search_screen(SRCH_TKT, 0);
1618	style_finish_page("tkt");
1619	}
1620

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_body_and_footer("tktsetup");
	59	+ style_finish_page("tktsetup");
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.
		@@ -163,11 +163,11 @@
163	163	@ <hr />
164	164	@ <h2>Default %s(zTitle)</h2>
165	165	@ <blockquote><pre>
166	166	@ %h(zDfltValue)
167	167	@ </pre></blockquote>
168		- style_body_and_footer("tktsetup");
	168	+ style_finish_page("tktsetup");
169	169	}
170	170
171	171	/*
172	172	** WEBPAGE: tktsetup_tab
173	173	** Administrative page for defining the "ticket" table used
		@@ -934,8 +934,8 @@
934	934	@ <input type="submit" name="submit" value="Apply Changes" />
935	935	@ <input type="submit" name="setup" value="Cancel" />
936	936	@ </p>
937	937	@ </div></form>
938	938	db_end_transaction(0);
939		- style_body_and_footer("tktsetup");
	939	+ style_finish_page("tktsetup");
940	940
941	941	}
942	942

	--- 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_body_and_footer("tktsetup");
60	}
61
62	/*
63	** NOTE: When changing the table definition below, also change the
64	** equivalent definition found in schema.c.
	@@ -163,11 +163,11 @@
163	@ <hr />
164	@ <h2>Default %s(zTitle)</h2>
165	@ <blockquote><pre>
166	@ %h(zDfltValue)
167	@ </pre></blockquote>
168	style_body_and_footer("tktsetup");
169	}
170
171	/*
172	** WEBPAGE: tktsetup_tab
173	** Administrative page for defining the "ticket" table used
	@@ -934,8 +934,8 @@
934	@ <input type="submit" name="submit" value="Apply Changes" />
935	@ <input type="submit" name="setup" value="Cancel" />
936	@ </p>
937	@ </div></form>
938	db_end_transaction(0);
939	style_body_and_footer("tktsetup");
940
941	}
942

	--- 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.
	@@ -163,11 +163,11 @@
163	@ <hr />
164	@ <h2>Default %s(zTitle)</h2>
165	@ <blockquote><pre>
166	@ %h(zDfltValue)
167	@ </pre></blockquote>
168	style_finish_page("tktsetup");
169	}
170
171	/*
172	** WEBPAGE: tktsetup_tab
173	** Administrative page for defining the "ticket" table used
	@@ -934,8 +934,8 @@
934	@ <input type="submit" name="submit" value="Apply Changes" />
935	@ <input type="submit" name="setup" value="Cancel" />
936	@ </p>
937	@ </div></form>
938	db_end_transaction(0);
939	style_finish_page("tktsetup");
940
941	}
942

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_body_and_footer("uvlist");
	551	+ style_finish_page("uvlist");
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_body_and_footer("uvlist");
	637	+ style_finish_page("uvlist");
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_body_and_footer("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_body_and_footer("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("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

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_body_and_footer("access_log");
	777	+ style_finish_page("access_log");
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_body_and_footer("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("access_log");
778	}
779

M src/webmail.c

+5 -5

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

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

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

M src/wiki.c

+15 -15

		--- src/wiki.c
		+++ src/wiki.c
		@@ -66,11 +66,11 @@
66	66	if( !wiki_name_is_wellformed((const unsigned char *)z) ){
67	67	style_header("Wiki Page Name Error");
68	68	@ The wiki name "<span class="wikiError">%h(z)</span>" is not well-formed.
69	69	@ Rules for wiki page names:
70	70	well_formed_wiki_name_rules();
71		- style_body_and_footer("wiki");
	71	+ style_finish_page("wiki");
72	72	return 1;
73	73	}
74	74	return 0;
75	75	}
76	76
		@@ -141,11 +141,11 @@
141	141	@ To fill in this page, first go to
142	142	@ %z(href("%R/setup_config"))setup/config</a>
143	143	@ and establish a "Project Name". Then create a
144	144	@ wiki page with that name. The content of that wiki page
145	145	@ will be displayed in place of this message.</p>
146		- style_body_and_footer("wiki");
	146	+ style_finish_page("wiki");
147	147	}
148	148
149	149	/*
150	150	** Return true if the given pagename is the name of the sandbox
151	151	*/
		@@ -242,11 +242,11 @@
242	242	blob_materialize(&x);
243	243	interwiki_append_map_table(&x);
244	244	safe_html_context(DOCSRC_TRUSTED);
245	245	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-markdown");
246	246	blob_reset(&x);
247		- style_body_and_footer("wiki");
	247	+ style_finish_page("wiki");
248	248	}
249	249
250	250	/*
251	251	** WEBPAGE: wiki_rules
252	252	**
		@@ -266,11 +266,11 @@
266	266	blob_materialize(&x);
267	267	interwiki_append_map_table(&x);
268	268	safe_html_context(DOCSRC_TRUSTED);
269	269	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-fossil-wiki");
270	270	blob_reset(&x);
271		- style_body_and_footer("wiki");
	271	+ style_finish_page("wiki");
272	272	}
273	273
274	274	/*
275	275	** WEBPAGE: markup_help
276	276	**
		@@ -280,11 +280,11 @@
280	280	style_header("Fossil Markup Styles");
281	281	@ <ul>
282	282	@ <li><p>%z(href("%R/wiki_rules"))Fossil Wiki Formatting Rules</a></p></li>
283	283	@ <li><p>%z(href("%R/md_rules"))Markdown Formatting Rules</a></p></li>
284	284	@ </ul>
285		- style_body_and_footer("wiki");
	285	+ style_finish_page("wiki");
286	286	}
287	287
288	288	/*
289	289	** Returns non-zero if moderation is required for wiki changes and wiki
290	290	** attachments.
		@@ -369,11 +369,11 @@
369	369	if( search_restrict(SRCH_WIKI)!=0 ){
370	370	@ <li> %z(href("%R/wikisrch"))Search</a> for wiki pages containing key
371	371	@ words</li>
372	372	}
373	373	@ </ul>
374		- style_body_and_footer("wiki");
	374	+ style_finish_page("wiki");
375	375	return;
376	376	}
377	377
378	378	/*
379	379	** WEBPAGE: wikisrch
		@@ -384,11 +384,11 @@
384	384	void wiki_srchpage(void){
385	385	login_check_credentials();
386	386	style_header("Wiki Search");
387	387	wiki_standard_submenu(W_HELP\|W_LIST\|W_SANDBOX);
388	388	search_screen(SRCH_WIKI, 0);
389		- style_body_and_footer("wiki");
	389	+ style_finish_page("wiki");
390	390	}
391	391
392	392	/* Return values from wiki_page_type() */
393	393	#if INTERFACE
394	394	# define WIKITYPE_UNKNOWN (-1)
		@@ -597,11 +597,11 @@
597	597	blob_reset(&wiki);
598	598	}
599	599	attachment_list(zPageName, "<hr /><h2>Attachments:</h2><ul>");
600	600	manifest_destroy(pWiki);
601	601	document_emit_js(/for optional pikchr support/);
602		- style_body_and_footer("wiki");
	602	+ style_finish_page("wiki");
603	603	}
604	604
605	605	/*
606	606	** Write a wiki artifact into the repository
607	607	*/
		@@ -1344,11 +1344,11 @@
1344	1344	CX("}catch(e){"
1345	1345	"fossil.error(e); console.error('Exception:',e);"
1346	1346	"}\n");
1347	1347	CX("});\n"/fossil.onPageLoad()/);
1348	1348	style_script_end();
1349		- style_body_and_footer("wiki");
	1349	+ style_finish_page("wiki");
1350	1350	}
1351	1351
1352	1352	/*
1353	1353	** WEBPAGE: wikinew
1354	1354	** URL /wikinew
		@@ -1382,11 +1382,11 @@
1382	1382	@ </p></form>
1383	1383	if( zName[0] ){
1384	1384	@ <p><span class="wikiError">
1385	1385	@ "%h(zName)" is not a valid wiki page name!</span></p>
1386	1386	}
1387		- style_body_and_footer("wiki");
	1387	+ style_finish_page("wiki");
1388	1388	}
1389	1389
1390	1390
1391	1391	/*
1392	1392	** Append the wiki text for an remark to the end of the given BLOB.
		@@ -1544,11 +1544,11 @@
1544	1544	@ <input type="submit" name="preview" value="Preview Your Comment" />
1545	1545	@ <input type="submit" name="submit" value="Append Your Changes" />
1546	1546	@ <input type="submit" name="cancel" value="Cancel" />
1547	1547	captcha_generate(0);
1548	1548	@ </form>
1549		- style_body_and_footer("wiki");
	1549	+ style_finish_page("wiki");
1550	1550	}
1551	1551
1552	1552	/*
1553	1553	** WEBPAGE: whistory
1554	1554	** URL: /whistory?name=PAGENAME
		@@ -1582,11 +1582,11 @@
1582	1582	www_print_timeline(&q,
1583	1583	TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_REFS,
1584	1584	0, 0, 0, 0, 0, 0);
1585	1585	db_finalize(&q);
1586	1586	blob_reset(&sql);
1587		- style_body_and_footer("wiki");
	1587	+ style_finish_page("wiki");
1588	1588	}
1589	1589
1590	1590	/*
1591	1591	** WEBPAGE: wdiff
1592	1592	**
		@@ -1654,11 +1654,11 @@
1654	1654	@ <pre class="udiff">
1655	1655	@ %s(blob_str(&d))
1656	1656	@ <pre>
1657	1657	manifest_destroy(pW1);
1658	1658	manifest_destroy(pW2);
1659		- style_body_and_footer("wiki");
	1659	+ style_finish_page("wiki");
1660	1660	}
1661	1661
1662	1662	/*
1663	1663	** A query that returns information about all wiki pages.
1664	1664	**
		@@ -1756,11 +1756,11 @@
1756	1756	fossil_free(zWDisplayName);
1757	1757	}
1758	1758	@ </tbody></table></div>
1759	1759	db_finalize(&q);
1760	1760	style_table_sorter();
1761		- style_body_and_footer("wiki");
	1761	+ style_finish_page("wiki");
1762	1762	}
1763	1763
1764	1764	/*
1765	1765	** WEBPAGE: wfind
1766	1766	**
		@@ -1783,11 +1783,11 @@
1783	1783	const char *zName = db_column_text(&q, 0);
1784	1784	@ <li>%z(href("%R/wiki?name=%T",zName))%h(zName)</a></li>
1785	1785	}
1786	1786	db_finalize(&q);
1787	1787	@ </ul>
1788		- style_body_and_footer("wiki");
	1788	+ style_finish_page("wiki");
1789	1789	}
1790	1790
1791	1791	/*
1792	1792	** Add a new wiki page to the repository. The page name is
1793	1793	** given by the zPageName parameter. rid must be zero to create
1794	1794

	--- src/wiki.c
	+++ src/wiki.c
	@@ -66,11 +66,11 @@
66	if( !wiki_name_is_wellformed((const unsigned char *)z) ){
67	style_header("Wiki Page Name Error");
68	@ The wiki name "<span class="wikiError">%h(z)</span>" is not well-formed.
69	@ Rules for wiki page names:
70	well_formed_wiki_name_rules();
71	style_body_and_footer("wiki");
72	return 1;
73	}
74	return 0;
75	}
76
	@@ -141,11 +141,11 @@
141	@ To fill in this page, first go to
142	@ %z(href("%R/setup_config"))setup/config</a>
143	@ and establish a "Project Name". Then create a
144	@ wiki page with that name. The content of that wiki page
145	@ will be displayed in place of this message.</p>
146	style_body_and_footer("wiki");
147	}
148
149	/*
150	** Return true if the given pagename is the name of the sandbox
151	*/
	@@ -242,11 +242,11 @@
242	blob_materialize(&x);
243	interwiki_append_map_table(&x);
244	safe_html_context(DOCSRC_TRUSTED);
245	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-markdown");
246	blob_reset(&x);
247	style_body_and_footer("wiki");
248	}
249
250	/*
251	** WEBPAGE: wiki_rules
252	**
	@@ -266,11 +266,11 @@
266	blob_materialize(&x);
267	interwiki_append_map_table(&x);
268	safe_html_context(DOCSRC_TRUSTED);
269	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-fossil-wiki");
270	blob_reset(&x);
271	style_body_and_footer("wiki");
272	}
273
274	/*
275	** WEBPAGE: markup_help
276	**
	@@ -280,11 +280,11 @@
280	style_header("Fossil Markup Styles");
281	@ <ul>
282	@ <li><p>%z(href("%R/wiki_rules"))Fossil Wiki Formatting Rules</a></p></li>
283	@ <li><p>%z(href("%R/md_rules"))Markdown Formatting Rules</a></p></li>
284	@ </ul>
285	style_body_and_footer("wiki");
286	}
287
288	/*
289	** Returns non-zero if moderation is required for wiki changes and wiki
290	** attachments.
	@@ -369,11 +369,11 @@
369	if( search_restrict(SRCH_WIKI)!=0 ){
370	@ <li> %z(href("%R/wikisrch"))Search</a> for wiki pages containing key
371	@ words</li>
372	}
373	@ </ul>
374	style_body_and_footer("wiki");
375	return;
376	}
377
378	/*
379	** WEBPAGE: wikisrch
	@@ -384,11 +384,11 @@
384	void wiki_srchpage(void){
385	login_check_credentials();
386	style_header("Wiki Search");
387	wiki_standard_submenu(W_HELP\|W_LIST\|W_SANDBOX);
388	search_screen(SRCH_WIKI, 0);
389	style_body_and_footer("wiki");
390	}
391
392	/* Return values from wiki_page_type() */
393	#if INTERFACE
394	# define WIKITYPE_UNKNOWN (-1)
	@@ -597,11 +597,11 @@
597	blob_reset(&wiki);
598	}
599	attachment_list(zPageName, "<hr /><h2>Attachments:</h2><ul>");
600	manifest_destroy(pWiki);
601	document_emit_js(/for optional pikchr support/);
602	style_body_and_footer("wiki");
603	}
604
605	/*
606	** Write a wiki artifact into the repository
607	*/
	@@ -1344,11 +1344,11 @@
1344	CX("}catch(e){"
1345	"fossil.error(e); console.error('Exception:',e);"
1346	"}\n");
1347	CX("});\n"/fossil.onPageLoad()/);
1348	style_script_end();
1349	style_body_and_footer("wiki");
1350	}
1351
1352	/*
1353	** WEBPAGE: wikinew
1354	** URL /wikinew
	@@ -1382,11 +1382,11 @@
1382	@ </p></form>
1383	if( zName[0] ){
1384	@ <p><span class="wikiError">
1385	@ "%h(zName)" is not a valid wiki page name!</span></p>
1386	}
1387	style_body_and_footer("wiki");
1388	}
1389
1390
1391	/*
1392	** Append the wiki text for an remark to the end of the given BLOB.
	@@ -1544,11 +1544,11 @@
1544	@ <input type="submit" name="preview" value="Preview Your Comment" />
1545	@ <input type="submit" name="submit" value="Append Your Changes" />
1546	@ <input type="submit" name="cancel" value="Cancel" />
1547	captcha_generate(0);
1548	@ </form>
1549	style_body_and_footer("wiki");
1550	}
1551
1552	/*
1553	** WEBPAGE: whistory
1554	** URL: /whistory?name=PAGENAME
	@@ -1582,11 +1582,11 @@
1582	www_print_timeline(&q,
1583	TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_REFS,
1584	0, 0, 0, 0, 0, 0);
1585	db_finalize(&q);
1586	blob_reset(&sql);
1587	style_body_and_footer("wiki");
1588	}
1589
1590	/*
1591	** WEBPAGE: wdiff
1592	**
	@@ -1654,11 +1654,11 @@
1654	@ <pre class="udiff">
1655	@ %s(blob_str(&d))
1656	@ <pre>
1657	manifest_destroy(pW1);
1658	manifest_destroy(pW2);
1659	style_body_and_footer("wiki");
1660	}
1661
1662	/*
1663	** A query that returns information about all wiki pages.
1664	**
	@@ -1756,11 +1756,11 @@
1756	fossil_free(zWDisplayName);
1757	}
1758	@ </tbody></table></div>
1759	db_finalize(&q);
1760	style_table_sorter();
1761	style_body_and_footer("wiki");
1762	}
1763
1764	/*
1765	** WEBPAGE: wfind
1766	**
	@@ -1783,11 +1783,11 @@
1783	const char *zName = db_column_text(&q, 0);
1784	@ <li>%z(href("%R/wiki?name=%T",zName))%h(zName)</a></li>
1785	}
1786	db_finalize(&q);
1787	@ </ul>
1788	style_body_and_footer("wiki");
1789	}
1790
1791	/*
1792	** Add a new wiki page to the repository. The page name is
1793	** given by the zPageName parameter. rid must be zero to create
1794

	--- src/wiki.c
	+++ src/wiki.c
	@@ -66,11 +66,11 @@
66	if( !wiki_name_is_wellformed((const unsigned char *)z) ){
67	style_header("Wiki Page Name Error");
68	@ The wiki name "<span class="wikiError">%h(z)</span>" is not well-formed.
69	@ Rules for wiki page names:
70	well_formed_wiki_name_rules();
71	style_finish_page("wiki");
72	return 1;
73	}
74	return 0;
75	}
76
	@@ -141,11 +141,11 @@
141	@ To fill in this page, first go to
142	@ %z(href("%R/setup_config"))setup/config</a>
143	@ and establish a "Project Name". Then create a
144	@ wiki page with that name. The content of that wiki page
145	@ will be displayed in place of this message.</p>
146	style_finish_page("wiki");
147	}
148
149	/*
150	** Return true if the given pagename is the name of the sandbox
151	*/
	@@ -242,11 +242,11 @@
242	blob_materialize(&x);
243	interwiki_append_map_table(&x);
244	safe_html_context(DOCSRC_TRUSTED);
245	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-markdown");
246	blob_reset(&x);
247	style_finish_page("wiki");
248	}
249
250	/*
251	** WEBPAGE: wiki_rules
252	**
	@@ -266,11 +266,11 @@
266	blob_materialize(&x);
267	interwiki_append_map_table(&x);
268	safe_html_context(DOCSRC_TRUSTED);
269	wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-fossil-wiki");
270	blob_reset(&x);
271	style_finish_page("wiki");
272	}
273
274	/*
275	** WEBPAGE: markup_help
276	**
	@@ -280,11 +280,11 @@
280	style_header("Fossil Markup Styles");
281	@ <ul>
282	@ <li><p>%z(href("%R/wiki_rules"))Fossil Wiki Formatting Rules</a></p></li>
283	@ <li><p>%z(href("%R/md_rules"))Markdown Formatting Rules</a></p></li>
284	@ </ul>
285	style_finish_page("wiki");
286	}
287
288	/*
289	** Returns non-zero if moderation is required for wiki changes and wiki
290	** attachments.
	@@ -369,11 +369,11 @@
369	if( search_restrict(SRCH_WIKI)!=0 ){
370	@ <li> %z(href("%R/wikisrch"))Search</a> for wiki pages containing key
371	@ words</li>
372	}
373	@ </ul>
374	style_finish_page("wiki");
375	return;
376	}
377
378	/*
379	** WEBPAGE: wikisrch
	@@ -384,11 +384,11 @@
384	void wiki_srchpage(void){
385	login_check_credentials();
386	style_header("Wiki Search");
387	wiki_standard_submenu(W_HELP\|W_LIST\|W_SANDBOX);
388	search_screen(SRCH_WIKI, 0);
389	style_finish_page("wiki");
390	}
391
392	/* Return values from wiki_page_type() */
393	#if INTERFACE
394	# define WIKITYPE_UNKNOWN (-1)
	@@ -597,11 +597,11 @@
597	blob_reset(&wiki);
598	}
599	attachment_list(zPageName, "<hr /><h2>Attachments:</h2><ul>");
600	manifest_destroy(pWiki);
601	document_emit_js(/for optional pikchr support/);
602	style_finish_page("wiki");
603	}
604
605	/*
606	** Write a wiki artifact into the repository
607	*/
	@@ -1344,11 +1344,11 @@
1344	CX("}catch(e){"
1345	"fossil.error(e); console.error('Exception:',e);"
1346	"}\n");
1347	CX("});\n"/fossil.onPageLoad()/);
1348	style_script_end();
1349	style_finish_page("wiki");
1350	}
1351
1352	/*
1353	** WEBPAGE: wikinew
1354	** URL /wikinew
	@@ -1382,11 +1382,11 @@
1382	@ </p></form>
1383	if( zName[0] ){
1384	@ <p><span class="wikiError">
1385	@ "%h(zName)" is not a valid wiki page name!</span></p>
1386	}
1387	style_finish_page("wiki");
1388	}
1389
1390
1391	/*
1392	** Append the wiki text for an remark to the end of the given BLOB.
	@@ -1544,11 +1544,11 @@
1544	@ <input type="submit" name="preview" value="Preview Your Comment" />
1545	@ <input type="submit" name="submit" value="Append Your Changes" />
1546	@ <input type="submit" name="cancel" value="Cancel" />
1547	captcha_generate(0);
1548	@ </form>
1549	style_finish_page("wiki");
1550	}
1551
1552	/*
1553	** WEBPAGE: whistory
1554	** URL: /whistory?name=PAGENAME
	@@ -1582,11 +1582,11 @@
1582	www_print_timeline(&q,
1583	TIMELINE_DISJOINT\|TIMELINE_GRAPH\|TIMELINE_REFS,
1584	0, 0, 0, 0, 0, 0);
1585	db_finalize(&q);
1586	blob_reset(&sql);
1587	style_finish_page("wiki");
1588	}
1589
1590	/*
1591	** WEBPAGE: wdiff
1592	**
	@@ -1654,11 +1654,11 @@
1654	@ <pre class="udiff">
1655	@ %s(blob_str(&d))
1656	@ <pre>
1657	manifest_destroy(pW1);
1658	manifest_destroy(pW2);
1659	style_finish_page("wiki");
1660	}
1661
1662	/*
1663	** A query that returns information about all wiki pages.
1664	**
	@@ -1756,11 +1756,11 @@
1756	fossil_free(zWDisplayName);
1757	}
1758	@ </tbody></table></div>
1759	db_finalize(&q);
1760	style_table_sorter();
1761	style_finish_page("wiki");
1762	}
1763
1764	/*
1765	** WEBPAGE: wfind
1766	**
	@@ -1783,11 +1783,11 @@
1783	const char *zName = db_column_text(&q, 0);
1784	@ <li>%z(href("%R/wiki?name=%T",zName))%h(zName)</a></li>
1785	}
1786	db_finalize(&q);
1787	@ </ul>
1788	style_finish_page("wiki");
1789	}
1790
1791	/*
1792	** Add a new wiki page to the repository. The page name is
1793	** given by the zPageName parameter. rid must be zero to create
1794

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_body_and_footer("xfersetup");
	90	+ style_finish_page("xfersetup");
91	91	}
92	92
93	93	/*
94	94	** Common implementation for the transfer setup editor pages.
95	95	*/
		@@ -150,11 +150,11 @@
150	150	@ <h2>Default %s(zTitle)</h2>
151	151	@ <blockquote><pre>
152	152	@ %h(zDfltValue)
153	153	@ </pre></blockquote>
154	154	}
155		- style_body_and_footer("xfersetup");
	155	+ style_finish_page("xfersetup");
156	156	}
157	157
158	158	static const char *zDefaultXferCommon = 0;
159	159
160	160	/*
161	161

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

	--- 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	*/
	@@ -150,11 +150,11 @@
150	@ <h2>Default %s(zTitle)</h2>
151	@ <blockquote><pre>
152	@ %h(zDfltValue)
153	@ </pre></blockquote>
154	}
155	style_finish_page("xfersetup");
156	}
157
158	static const char *zDefaultXferCommon = 0;
159
160	/*
161

M src/zip.c

+2 -2

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

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

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

Fossil SCM

Keyboard Shortcuts