a3328c00b74… — Fossil SCM

M src/attach.c

+6 -6

		--- src/attach.c
		+++ src/attach.c
		@@ -26,11 +26,11 @@
26	26	** List attachments.
27	27	**
28	28	** tkt=TICKETUUID
29	29	** page=WIKIPAGE
30	30	**
31		-** At most one of technote=, tkt= or page= are supplied.
	31	+** At most one of technote=, tkt= or page= are supplied.
32	32	** If none is given, all attachments are listed. If one is given,
33	33	** only attachments for the designated technote, ticket or wiki page
34	34	** are shown. TECHNOTEUUID and TICKETUUID may be just a prefix of the
35	35	** relevant technical note or ticket, in which case all attachments
36	36	** of all technical notes or tickets with the prefix will be listed.
		@@ -109,11 +109,11 @@
109	109	@ <li><p>
110	110	@ Attachment %z(href("%R/ainfo/%!S",zUuid))%S(zUuid)</a>
111	111	if( moderation_pending(attachid) ){
112	112	@ <span class="modpending">* Awaiting Moderator Approval *</span>
113	113	}
114		- @ <br><a href="%R/attachview?%s(zUrlTail)">%h(zFilename)</a>
	114	+ @ <br /><a href="%R/attachview?%s(zUrlTail)">%h(zFilename)</a>
115	115	@ [<a href="%R/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
116	116	if( zComment ) while( fossil_isspace(zComment[0]) ) zComment++;
117	117	if( zComment && zComment[0] ){
118	118	@ %!W(zComment)<br />
119	119	}
		@@ -358,11 +358,11 @@
358	358	if( zTechNote==0) fossil_redirect_home();
359	359	}
360	360	zTarget = zTechNote;
361	361	zTargetType = mprintf("Tech Note <a href=\"%R/technote/%s\">%S</a>",
362	362	zTechNote, zTechNote);
363		-
	363	+
364	364	}else{
365	365	if( g.perm.ApndTkt==0 \|\| g.perm.Attach==0 ){
366	366	login_needed(g.anon.ApndTkt && g.anon.Attach);
367	367	return;
368	368	}
		@@ -493,11 +493,11 @@
493	493	}
494	494	}
495	495	zDate = db_text(0, "SELECT datetime(%.12f)", pAttach->rDate);
496	496
497	497	if( P("confirm")
498		- && ((zTktUuid && g.perm.WrTkt) \|\|
	498	+ && ((zTktUuid && g.perm.WrTkt) \|\|
499	499	(zWikiName && g.perm.WrWiki) \|\|
500	500	(zTNUuid && g.perm.Write && g.perm.WrWiki))
501	501	){
502	502	int i, n, rid;
503	503	char *zDate;
		@@ -627,11 +627,11 @@
627	627	@ %h(z)
628	628	@ </pre>
629	629	}
630	630	}else if( strncmp(zMime, "image/", 6)==0 ){
631	631	int sz = db_int(0, "SELECT size FROM blob WHERE rid=%d", ridSrc);
632		- @ <i>(file is %d(sz) bytes of image data)</i><br>
	632	+ @ <i>(file is %d(sz) bytes of image data)</i><br />
633	633	@ <img src="%R/raw/%s(zSrc)?m=%s(zMime)"></img>
634	634	style_submenu_element("Image", "Image", "%R/raw/%s?m=%s", zSrc, zMime);
635	635	}else{
636	636	int sz = db_int(0, "SELECT size FROM blob WHERE rid=%d", ridSrc);
637	637	@ <i>(file is %d(sz) bytes of binary data)</i>
		@@ -730,11 +730,11 @@
730	730	zPageName = g.argv[3];
731	731	rid = db_int(0, "SELECT x.rid FROM tag t, tagxref x"
732	732	" WHERE x.tagid=t.tagid AND t.tagname='wiki-%q'"
733	733	" ORDER BY x.mtime DESC LIMIT 1",
734	734	zPageName
735		- );
	735	+ );
736	736	if( (pWiki = manifest_get(rid, CFTYPE_WIKI, 0))!=0 ){
737	737	zBody = pWiki->zWiki;
738	738	}
739	739	if( zBody==0 ){
740	740	fossil_fatal("wiki page [%s] not found",zPageName);
741	741

	--- src/attach.c
	+++ src/attach.c
	@@ -26,11 +26,11 @@
26	** List attachments.
27	**
28	** tkt=TICKETUUID
29	** page=WIKIPAGE
30	**
31	** At most one of technote=, tkt= or page= are supplied.
32	** If none is given, all attachments are listed. If one is given,
33	** only attachments for the designated technote, ticket or wiki page
34	** are shown. TECHNOTEUUID and TICKETUUID may be just a prefix of the
35	** relevant technical note or ticket, in which case all attachments
36	** of all technical notes or tickets with the prefix will be listed.
	@@ -109,11 +109,11 @@
109	@ <li><p>
110	@ Attachment %z(href("%R/ainfo/%!S",zUuid))%S(zUuid)</a>
111	if( moderation_pending(attachid) ){
112	@ <span class="modpending">* Awaiting Moderator Approval *</span>
113	}
114	@ <br><a href="%R/attachview?%s(zUrlTail)">%h(zFilename)</a>
115	@ [<a href="%R/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
116	if( zComment ) while( fossil_isspace(zComment[0]) ) zComment++;
117	if( zComment && zComment[0] ){
118	@ %!W(zComment)<br />
119	}
	@@ -358,11 +358,11 @@
358	if( zTechNote==0) fossil_redirect_home();
359	}
360	zTarget = zTechNote;
361	zTargetType = mprintf("Tech Note <a href=\"%R/technote/%s\">%S</a>",
362	zTechNote, zTechNote);
363
364	}else{
365	if( g.perm.ApndTkt==0 \|\| g.perm.Attach==0 ){
366	login_needed(g.anon.ApndTkt && g.anon.Attach);
367	return;
368	}
	@@ -493,11 +493,11 @@
493	}
494	}
495	zDate = db_text(0, "SELECT datetime(%.12f)", pAttach->rDate);
496
497	if( P("confirm")
498	&& ((zTktUuid && g.perm.WrTkt) \|\|
499	(zWikiName && g.perm.WrWiki) \|\|
500	(zTNUuid && g.perm.Write && g.perm.WrWiki))
501	){
502	int i, n, rid;
503	char *zDate;
	@@ -627,11 +627,11 @@
627	@ %h(z)
628	@ </pre>
629	}
630	}else if( strncmp(zMime, "image/", 6)==0 ){
631	int sz = db_int(0, "SELECT size FROM blob WHERE rid=%d", ridSrc);
632	@ <i>(file is %d(sz) bytes of image data)</i><br>
633	@ <img src="%R/raw/%s(zSrc)?m=%s(zMime)"></img>
634	style_submenu_element("Image", "Image", "%R/raw/%s?m=%s", zSrc, zMime);
635	}else{
636	int sz = db_int(0, "SELECT size FROM blob WHERE rid=%d", ridSrc);
637	@ <i>(file is %d(sz) bytes of binary data)</i>
	@@ -730,11 +730,11 @@
730	zPageName = g.argv[3];
731	rid = db_int(0, "SELECT x.rid FROM tag t, tagxref x"
732	" WHERE x.tagid=t.tagid AND t.tagname='wiki-%q'"
733	" ORDER BY x.mtime DESC LIMIT 1",
734	zPageName
735	);
736	if( (pWiki = manifest_get(rid, CFTYPE_WIKI, 0))!=0 ){
737	zBody = pWiki->zWiki;
738	}
739	if( zBody==0 ){
740	fossil_fatal("wiki page [%s] not found",zPageName);
741

	--- src/attach.c
	+++ src/attach.c
	@@ -26,11 +26,11 @@
26	** List attachments.
27	**
28	** tkt=TICKETUUID
29	** page=WIKIPAGE
30	**
31	** At most one of technote=, tkt= or page= are supplied.
32	** If none is given, all attachments are listed. If one is given,
33	** only attachments for the designated technote, ticket or wiki page
34	** are shown. TECHNOTEUUID and TICKETUUID may be just a prefix of the
35	** relevant technical note or ticket, in which case all attachments
36	** of all technical notes or tickets with the prefix will be listed.
	@@ -109,11 +109,11 @@
109	@ <li><p>
110	@ Attachment %z(href("%R/ainfo/%!S",zUuid))%S(zUuid)</a>
111	if( moderation_pending(attachid) ){
112	@ <span class="modpending">* Awaiting Moderator Approval *</span>
113	}
114	@ <br /><a href="%R/attachview?%s(zUrlTail)">%h(zFilename)</a>
115	@ [<a href="%R/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
116	if( zComment ) while( fossil_isspace(zComment[0]) ) zComment++;
117	if( zComment && zComment[0] ){
118	@ %!W(zComment)<br />
119	}
	@@ -358,11 +358,11 @@
358	if( zTechNote==0) fossil_redirect_home();
359	}
360	zTarget = zTechNote;
361	zTargetType = mprintf("Tech Note <a href=\"%R/technote/%s\">%S</a>",
362	zTechNote, zTechNote);
363
364	}else{
365	if( g.perm.ApndTkt==0 \|\| g.perm.Attach==0 ){
366	login_needed(g.anon.ApndTkt && g.anon.Attach);
367	return;
368	}
	@@ -493,11 +493,11 @@
493	}
494	}
495	zDate = db_text(0, "SELECT datetime(%.12f)", pAttach->rDate);
496
497	if( P("confirm")
498	&& ((zTktUuid && g.perm.WrTkt) \|\|
499	(zWikiName && g.perm.WrWiki) \|\|
500	(zTNUuid && g.perm.Write && g.perm.WrWiki))
501	){
502	int i, n, rid;
503	char *zDate;
	@@ -627,11 +627,11 @@
627	@ %h(z)
628	@ </pre>
629	}
630	}else if( strncmp(zMime, "image/", 6)==0 ){
631	int sz = db_int(0, "SELECT size FROM blob WHERE rid=%d", ridSrc);
632	@ <i>(file is %d(sz) bytes of image data)</i><br />
633	@ <img src="%R/raw/%s(zSrc)?m=%s(zMime)"></img>
634	style_submenu_element("Image", "Image", "%R/raw/%s?m=%s", zSrc, zMime);
635	}else{
636	int sz = db_int(0, "SELECT size FROM blob WHERE rid=%d", ridSrc);
637	@ <i>(file is %d(sz) bytes of binary data)</i>
	@@ -730,11 +730,11 @@
730	zPageName = g.argv[3];
731	rid = db_int(0, "SELECT x.rid FROM tag t, tagxref x"
732	" WHERE x.tagid=t.tagid AND t.tagname='wiki-%q'"
733	" ORDER BY x.mtime DESC LIMIT 1",
734	zPageName
735	);
736	if( (pWiki = manifest_get(rid, CFTYPE_WIKI, 0))!=0 ){
737	zBody = pWiki->zWiki;
738	}
739	if( zBody==0 ){
740	fossil_fatal("wiki page [%s] not found",zPageName);
741

M src/browse.c

+2 -2

		--- src/browse.c
		+++ src/browse.c
		@@ -1088,13 +1088,13 @@
1088	1088	while( db_step(&q2)==SQLITE_ROW ){
1089	1089	const char *zFUuid = db_column_text(&q2,0);
1090	1090	const char *zFile = db_column_text(&q2,1);
1091	1091	int fid = db_column_int(&q2,2);
1092	1092	if( showId ){
1093		- @ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a> (%d(fid))<br>
	1093	+ @ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a> (%d(fid))<br />
1094	1094	}else{
1095		- @ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a><br>
	1095	+ @ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a><br />
1096	1096	}
1097	1097	}
1098	1098	db_reset(&q2);
1099	1099	@ </td>
1100	1100	@ <td>
1101	1101

	--- src/browse.c
	+++ src/browse.c
	@@ -1088,13 +1088,13 @@
1088	while( db_step(&q2)==SQLITE_ROW ){
1089	const char *zFUuid = db_column_text(&q2,0);
1090	const char *zFile = db_column_text(&q2,1);
1091	int fid = db_column_int(&q2,2);
1092	if( showId ){
1093	@ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a> (%d(fid))<br>
1094	}else{
1095	@ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a><br>
1096	}
1097	}
1098	db_reset(&q2);
1099	@ </td>
1100	@ <td>
1101

	--- src/browse.c
	+++ src/browse.c
	@@ -1088,13 +1088,13 @@
1088	while( db_step(&q2)==SQLITE_ROW ){
1089	const char *zFUuid = db_column_text(&q2,0);
1090	const char *zFile = db_column_text(&q2,1);
1091	int fid = db_column_int(&q2,2);
1092	if( showId ){
1093	@ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a> (%d(fid))<br />
1094	}else{
1095	@ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a><br />
1096	}
1097	}
1098	db_reset(&q2);
1099	@ </td>
1100	@ <td>
1101

M src/cache.c

+2 -2

		--- src/cache.c
		+++ src/cache.c
		@@ -237,11 +237,11 @@
237	237	sqlite3_close(cacheOpen(1));
238	238	}
239	239
240	240	/*
241	241	** COMMAND: cache*
242		-**
	242	+**
243	243	** Usage: %fossil cache SUBCOMMAND
244	244	**
245	245	** Manage the cache used for potentially expensive web pages such as
246	246	** /zip and /tarball. SUBCOMMAND can be:
247	247	**
		@@ -356,11 +356,11 @@
356	356	);
357	357	if( pStmt ){
358	358	@ <ol>
359	359	while( sqlite3_step(pStmt)==SQLITE_ROW ){
360	360	const unsigned char *zName = sqlite3_column_text(pStmt,0);
361		- @ <li><p>%z(href("%R/cacheget?key=%T",zName))%h(zName)</a><br>
	361	+ @ <li><p>%z(href("%R/cacheget?key=%T",zName))%h(zName)</a><br />
362	362	@ size: %s(sqlite3_column_text(pStmt,1))
363	363	@ hit-count: %d(sqlite3_column_int(pStmt,2))
364	364	@ last-access: %s(sqlite3_column_text(pStmt,3))</p></li>
365	365	}
366	366	sqlite3_finalize(pStmt);
367	367

	--- src/cache.c
	+++ src/cache.c
	@@ -237,11 +237,11 @@
237	sqlite3_close(cacheOpen(1));
238	}
239
240	/*
241	** COMMAND: cache*
242	**
243	** Usage: %fossil cache SUBCOMMAND
244	**
245	** Manage the cache used for potentially expensive web pages such as
246	** /zip and /tarball. SUBCOMMAND can be:
247	**
	@@ -356,11 +356,11 @@
356	);
357	if( pStmt ){
358	@ <ol>
359	while( sqlite3_step(pStmt)==SQLITE_ROW ){
360	const unsigned char *zName = sqlite3_column_text(pStmt,0);
361	@ <li><p>%z(href("%R/cacheget?key=%T",zName))%h(zName)</a><br>
362	@ size: %s(sqlite3_column_text(pStmt,1))
363	@ hit-count: %d(sqlite3_column_int(pStmt,2))
364	@ last-access: %s(sqlite3_column_text(pStmt,3))</p></li>
365	}
366	sqlite3_finalize(pStmt);
367

	--- src/cache.c
	+++ src/cache.c
	@@ -237,11 +237,11 @@
237	sqlite3_close(cacheOpen(1));
238	}
239
240	/*
241	** COMMAND: cache*
242	**
243	** Usage: %fossil cache SUBCOMMAND
244	**
245	** Manage the cache used for potentially expensive web pages such as
246	** /zip and /tarball. SUBCOMMAND can be:
247	**
	@@ -356,11 +356,11 @@
356	);
357	if( pStmt ){
358	@ <ol>
359	while( sqlite3_step(pStmt)==SQLITE_ROW ){
360	const unsigned char *zName = sqlite3_column_text(pStmt,0);
361	@ <li><p>%z(href("%R/cacheget?key=%T",zName))%h(zName)</a><br />
362	@ size: %s(sqlite3_column_text(pStmt,1))
363	@ hit-count: %d(sqlite3_column_int(pStmt,2))
364	@ last-access: %s(sqlite3_column_text(pStmt,3))</p></li>
365	}
366	sqlite3_finalize(pStmt);
367

M src/finfo.c

+3 -3

		--- src/finfo.c
		+++ src/finfo.c
		@@ -531,11 +531,11 @@
531	531	}
532	532	}
533	533	if( fDebug & FINFO_DEBUG_MLINK ){
534	534	int ii;
535	535	char *zAncLink;
536		- @ <br>fid=%d(frid) pid=%d(fpid) mid=%d(fmid)
	536	+ @ <br />fid=%d(frid) pid=%d(fpid) mid=%d(fmid)
537	537	if( nParent>0 ){
538	538	@ parents=%d(aParent[0])
539	539	for(ii=1; ii<nParent; ii++){
540	540	@ %d(aParent[ii])
541	541	}
		@@ -573,11 +573,11 @@
573	573	*/
574	574	void mlink_page(void){
575	575	const char *zFName = P("name");
576	576	const char *zCI = P("ci");
577	577	Stmt q;
578		-
	578	+
579	579	login_check_credentials();
580	580	if( !g.perm.Admin ){ login_needed(g.anon.Admin); return; }
581	581	style_header("MLINK Table");
582	582	if( zFName==0 && zCI==0 ){
583	583	@ <span class='generalError'>
		@@ -676,11 +676,11 @@
676	676	" FROM mlink WHERE mid=%d ORDER BY 1",
677	677	mid
678	678	);
679	679	@ <h1>MLINK table for check-in %h(zCI)</h1>
680	680	render_checkin_context(mid, 1);
681		- @ <hr>
	681	+ @ <hr />
682	682	@ <div class='brlist'>
683	683	@ <table id='mlinktable'>
684	684	@ <thead><tr>
685	685	@ <th>File</th>
686	686	@ <th>From</th>
687	687

	--- src/finfo.c
	+++ src/finfo.c
	@@ -531,11 +531,11 @@
531	}
532	}
533	if( fDebug & FINFO_DEBUG_MLINK ){
534	int ii;
535	char *zAncLink;
536	@ <br>fid=%d(frid) pid=%d(fpid) mid=%d(fmid)
537	if( nParent>0 ){
538	@ parents=%d(aParent[0])
539	for(ii=1; ii<nParent; ii++){
540	@ %d(aParent[ii])
541	}
	@@ -573,11 +573,11 @@
573	*/
574	void mlink_page(void){
575	const char *zFName = P("name");
576	const char *zCI = P("ci");
577	Stmt q;
578
579	login_check_credentials();
580	if( !g.perm.Admin ){ login_needed(g.anon.Admin); return; }
581	style_header("MLINK Table");
582	if( zFName==0 && zCI==0 ){
583	@ <span class='generalError'>
	@@ -676,11 +676,11 @@
676	" FROM mlink WHERE mid=%d ORDER BY 1",
677	mid
678	);
679	@ <h1>MLINK table for check-in %h(zCI)</h1>
680	render_checkin_context(mid, 1);
681	@ <hr>
682	@ <div class='brlist'>
683	@ <table id='mlinktable'>
684	@ <thead><tr>
685	@ <th>File</th>
686	@ <th>From</th>
687

	--- src/finfo.c
	+++ src/finfo.c
	@@ -531,11 +531,11 @@
531	}
532	}
533	if( fDebug & FINFO_DEBUG_MLINK ){
534	int ii;
535	char *zAncLink;
536	@ <br />fid=%d(frid) pid=%d(fpid) mid=%d(fmid)
537	if( nParent>0 ){
538	@ parents=%d(aParent[0])
539	for(ii=1; ii<nParent; ii++){
540	@ %d(aParent[ii])
541	}
	@@ -573,11 +573,11 @@
573	*/
574	void mlink_page(void){
575	const char *zFName = P("name");
576	const char *zCI = P("ci");
577	Stmt q;
578
579	login_check_credentials();
580	if( !g.perm.Admin ){ login_needed(g.anon.Admin); return; }
581	style_header("MLINK Table");
582	if( zFName==0 && zCI==0 ){
583	@ <span class='generalError'>
	@@ -676,11 +676,11 @@
676	" FROM mlink WHERE mid=%d ORDER BY 1",
677	mid
678	);
679	@ <h1>MLINK table for check-in %h(zCI)</h1>
680	render_checkin_context(mid, 1);
681	@ <hr />
682	@ <div class='brlist'>
683	@ <table id='mlinktable'>
684	@ <thead><tr>
685	@ <th>File</th>
686	@ <th>From</th>
687

M src/info.c

+3 -3

		--- src/info.c
		+++ src/info.c
		@@ -1349,11 +1349,11 @@
1349	1349	if( eventTagId != 0) {
1350	1350	@ Instance of technote
1351	1351	objType \|= OBJTYPE_EVENT;
1352	1352	hyperlink_to_event_tagid(db_column_int(&q, 5));
1353	1353	}else{
1354		- @ Attachment to technote
	1354	+ @ Attachment to technote
1355	1355	}
1356	1356	}else{
1357	1357	@ Tag referencing
1358	1358	}
1359	1359	if( zType[0]!='e' \|\| eventTagId == 0){
		@@ -1977,11 +1977,11 @@
1977	1977	@ <pre>
1978	1978	@ %h(z)
1979	1979	@ </pre>
1980	1980	}
1981	1981	}else if( strncmp(zMime, "image/", 6)==0 ){
1982		- @ <i>(file is %d(blob_size(&content)) bytes of image data)</i><br>
	1982	+ @ <i>(file is %d(blob_size(&content)) bytes of image data)</i><br />
1983	1983	@ <img src="%R/raw/%s(zUuid)?m=%s(zMime)" />
1984	1984	style_submenu_element("Image", "Image",
1985	1985	"%R/raw/%s?m=%s", zUuid, zMime);
1986	1986	}else{
1987	1987	@ <i>(file is %d(blob_size(&content)) bytes of binary data)</i>
		@@ -2072,11 +2072,11 @@
2072	2072	@ <span class="modpending">* Awaiting Moderator Approval *</span>
2073	2073	}
2074	2074	@ <tr><th>Ticket:</th>
2075	2075	@ <td>%z(href("%R/tktview/%s",zTktName))%s(zTktName)</a>
2076	2076	if( zTktTitle ){
2077		- @<br>%h(zTktTitle)
	2077	+ @<br />%h(zTktTitle)
2078	2078	}
2079	2079	@</td></tr>
2080	2080	@ <tr><th>Date:</th><td>
2081	2081	hyperlink_to_date(zDate, "</td></tr>");
2082	2082	@ <tr><th>User:</th><td>
2083	2083

	--- src/info.c
	+++ src/info.c
	@@ -1349,11 +1349,11 @@
1349	if( eventTagId != 0) {
1350	@ Instance of technote
1351	objType \|= OBJTYPE_EVENT;
1352	hyperlink_to_event_tagid(db_column_int(&q, 5));
1353	}else{
1354	@ Attachment to technote
1355	}
1356	}else{
1357	@ Tag referencing
1358	}
1359	if( zType[0]!='e' \|\| eventTagId == 0){
	@@ -1977,11 +1977,11 @@
1977	@ <pre>
1978	@ %h(z)
1979	@ </pre>
1980	}
1981	}else if( strncmp(zMime, "image/", 6)==0 ){
1982	@ <i>(file is %d(blob_size(&content)) bytes of image data)</i><br>
1983	@ <img src="%R/raw/%s(zUuid)?m=%s(zMime)" />
1984	style_submenu_element("Image", "Image",
1985	"%R/raw/%s?m=%s", zUuid, zMime);
1986	}else{
1987	@ <i>(file is %d(blob_size(&content)) bytes of binary data)</i>
	@@ -2072,11 +2072,11 @@
2072	@ <span class="modpending">* Awaiting Moderator Approval *</span>
2073	}
2074	@ <tr><th>Ticket:</th>
2075	@ <td>%z(href("%R/tktview/%s",zTktName))%s(zTktName)</a>
2076	if( zTktTitle ){
2077	@<br>%h(zTktTitle)
2078	}
2079	@</td></tr>
2080	@ <tr><th>Date:</th><td>
2081	hyperlink_to_date(zDate, "</td></tr>");
2082	@ <tr><th>User:</th><td>
2083

	--- src/info.c
	+++ src/info.c
	@@ -1349,11 +1349,11 @@
1349	if( eventTagId != 0) {
1350	@ Instance of technote
1351	objType \|= OBJTYPE_EVENT;
1352	hyperlink_to_event_tagid(db_column_int(&q, 5));
1353	}else{
1354	@ Attachment to technote
1355	}
1356	}else{
1357	@ Tag referencing
1358	}
1359	if( zType[0]!='e' \|\| eventTagId == 0){
	@@ -1977,11 +1977,11 @@
1977	@ <pre>
1978	@ %h(z)
1979	@ </pre>
1980	}
1981	}else if( strncmp(zMime, "image/", 6)==0 ){
1982	@ <i>(file is %d(blob_size(&content)) bytes of image data)</i><br />
1983	@ <img src="%R/raw/%s(zUuid)?m=%s(zMime)" />
1984	style_submenu_element("Image", "Image",
1985	"%R/raw/%s?m=%s", zUuid, zMime);
1986	}else{
1987	@ <i>(file is %d(blob_size(&content)) bytes of binary data)</i>
	@@ -2072,11 +2072,11 @@
2072	@ <span class="modpending">* Awaiting Moderator Approval *</span>
2073	}
2074	@ <tr><th>Ticket:</th>
2075	@ <td>%z(href("%R/tktview/%s",zTktName))%s(zTktName)</a>
2076	if( zTktTitle ){
2077	@<br />%h(zTktTitle)
2078	}
2079	@</td></tr>
2080	@ <tr><th>Date:</th><td>
2081	hyperlink_to_date(zDate, "</td></tr>");
2082	@ <tr><th>User:</th><td>
2083

M src/piechart.c

+4 -4

		--- src/piechart.c
		+++ src/piechart.c
		@@ -299,22 +299,22 @@
299	299	blob_reset(&all);
300	300	if( n>0 ){
301	301	@ <svg width=%d(width) height=%d(height) style="border:1px solid #d3d3d3;">
302	302	piechart_render(width,height, PIE_OTHER);
303	303	@ </svg>
304		- @ <hr>
	304	+ @ <hr />
305	305	}
306	306	@ <form method="post" action='%R/test-piechart'>
307	307	@ <p>One slice per line. Value and then Label.<p>
308		- @ <textarea name='data' rows='20' cols='80'>%h(zData)</textarea><br/>
	308	+ @ <textarea name='data' rows='20' cols='80'>%h(zData)</textarea><br />
309	309	@ Width: <input type='text' size='8' name='width' value='%d(width)'/>
310		- @ Height: <input type='text' size='8' name='height' value='%d(height)'/><br/>
	310	+ @ Height: <input type='text' size='8' name='height' value='%d(height)'/><br />
311	311	@ <input type='hidden' name='width' value='%d(width)'/>
312	312	@ <input type='hidden' name='height' value='%d(height)'/>
313	313	@ <input type='submit' value='Draw The Pie Chart'/>
314	314	@ </form>
315		- @ <hr><p>Previous Data:</p>
	315	+ @ <hr /><p>Previous Data:</p>
316	316	@ <table border="1">
317	317	db_prepare(&q, "SELECT rowid, amt, label FROM piechart");
318	318	while( db_step(&q)==SQLITE_ROW ){
319	319	@ <tr><td>%d(db_column_int(&q,0))</td>
320	320	@ <td>%g(db_column_double(&q,1))</td>
321	321

	--- src/piechart.c
	+++ src/piechart.c
	@@ -299,22 +299,22 @@
299	blob_reset(&all);
300	if( n>0 ){
301	@ <svg width=%d(width) height=%d(height) style="border:1px solid #d3d3d3;">
302	piechart_render(width,height, PIE_OTHER);
303	@ </svg>
304	@ <hr>
305	}
306	@ <form method="post" action='%R/test-piechart'>
307	@ <p>One slice per line. Value and then Label.<p>
308	@ <textarea name='data' rows='20' cols='80'>%h(zData)</textarea><br/>
309	@ Width: <input type='text' size='8' name='width' value='%d(width)'/>
310	@ Height: <input type='text' size='8' name='height' value='%d(height)'/><br/>
311	@ <input type='hidden' name='width' value='%d(width)'/>
312	@ <input type='hidden' name='height' value='%d(height)'/>
313	@ <input type='submit' value='Draw The Pie Chart'/>
314	@ </form>
315	@ <hr><p>Previous Data:</p>
316	@ <table border="1">
317	db_prepare(&q, "SELECT rowid, amt, label FROM piechart");
318	while( db_step(&q)==SQLITE_ROW ){
319	@ <tr><td>%d(db_column_int(&q,0))</td>
320	@ <td>%g(db_column_double(&q,1))</td>
321

	--- src/piechart.c
	+++ src/piechart.c
	@@ -299,22 +299,22 @@
299	blob_reset(&all);
300	if( n>0 ){
301	@ <svg width=%d(width) height=%d(height) style="border:1px solid #d3d3d3;">
302	piechart_render(width,height, PIE_OTHER);
303	@ </svg>
304	@ <hr />
305	}
306	@ <form method="post" action='%R/test-piechart'>
307	@ <p>One slice per line. Value and then Label.<p>
308	@ <textarea name='data' rows='20' cols='80'>%h(zData)</textarea><br />
309	@ Width: <input type='text' size='8' name='width' value='%d(width)'/>
310	@ Height: <input type='text' size='8' name='height' value='%d(height)'/><br />
311	@ <input type='hidden' name='width' value='%d(width)'/>
312	@ <input type='hidden' name='height' value='%d(height)'/>
313	@ <input type='submit' value='Draw The Pie Chart'/>
314	@ </form>
315	@ <hr /><p>Previous Data:</p>
316	@ <table border="1">
317	db_prepare(&q, "SELECT rowid, amt, label FROM piechart");
318	while( db_step(&q)==SQLITE_ROW ){
319	@ <tr><td>%d(db_column_int(&q,0))</td>
320	@ <td>%g(db_column_double(&q,1))</td>
321

M src/search.c

+2 -2

		--- src/search.c
		+++ src/search.c
		@@ -516,11 +516,11 @@
516	516
517	517	/*
518	518	** Testing the search function.
519	519	**
520	520	** COMMAND: search*
521		-**
	521	+**
522	522	** Usage: %fossil search [-all\|-a] [-limit\|-n #] [-width\|-W #] pattern...
523	523	**
524	524	** Search for timeline entries matching all words provided on the
525	525	** command line. Whole-word matches scope more highly than partial
526	526	** matches.
		@@ -949,11 +949,11 @@
949	949	nRow++;
950	950	@ <li><p><a href='%R%s(zUrl)'>%h(zLabel)</a>
951	951	if( fDebug ){
952	952	@ (%e(db_column_double(&q,3)), %s(db_column_text(&q,4)))
953	953	}
954		- @ <br><span class='snippet'>%z(cleanSnippet(zSnippet))</span></li>
	954	+ @ <br /><span class='snippet'>%z(cleanSnippet(zSnippet))</span></li>
955	955	}
956	956	db_finalize(&q);
957	957	if( nRow ){
958	958	@ </ol>
959	959	}
960	960

	--- src/search.c
	+++ src/search.c
	@@ -516,11 +516,11 @@
516
517	/*
518	** Testing the search function.
519	**
520	** COMMAND: search*
521	**
522	** Usage: %fossil search [-all\|-a] [-limit\|-n #] [-width\|-W #] pattern...
523	**
524	** Search for timeline entries matching all words provided on the
525	** command line. Whole-word matches scope more highly than partial
526	** matches.
	@@ -949,11 +949,11 @@
949	nRow++;
950	@ <li><p><a href='%R%s(zUrl)'>%h(zLabel)</a>
951	if( fDebug ){
952	@ (%e(db_column_double(&q,3)), %s(db_column_text(&q,4)))
953	}
954	@ <br><span class='snippet'>%z(cleanSnippet(zSnippet))</span></li>
955	}
956	db_finalize(&q);
957	if( nRow ){
958	@ </ol>
959	}
960

	--- src/search.c
	+++ src/search.c
	@@ -516,11 +516,11 @@
516
517	/*
518	** Testing the search function.
519	**
520	** COMMAND: search*
521	**
522	** Usage: %fossil search [-all\|-a] [-limit\|-n #] [-width\|-W #] pattern...
523	**
524	** Search for timeline entries matching all words provided on the
525	** command line. Whole-word matches scope more highly than partial
526	** matches.
	@@ -949,11 +949,11 @@
949	nRow++;
950	@ <li><p><a href='%R%s(zUrl)'>%h(zLabel)</a>
951	if( fDebug ){
952	@ (%e(db_column_double(&q,3)), %s(db_column_text(&q,4)))
953	}
954	@ <br /><span class='snippet'>%z(cleanSnippet(zSnippet))</span></li>
955	}
956	db_finalize(&q);
957	if( nRow ){
958	@ </ol>
959	}
960

M src/setup.c

+10 -10

		--- src/setup.c
		+++ src/setup.c
		@@ -175,11 +175,11 @@
175	175	const char *zDate = db_column_text(&s, 4);
176	176	@ <tr>
177	177	@ <td><a href='setup_uedit?id=%d(uid)'>%d(uid)</a>
178	178	@ <td><a href='setup_uedit?id=%d(uid)'>%h(zLogin)</a>
179	179	@ <td>%h(zCap)
180		-
	180	+
181	181	if( fossil_strcmp(zLogin,"anonymous")==0 ){
182	182	@ <td>All logged-in users
183	183	}else if( fossil_strcmp(zLogin,"developer")==0 ){
184	184	@ <td>Users with '<b>v</b>' capability
185	185	}else if( fossil_strcmp(zLogin,"nobody")==0 ){
		@@ -1154,14 +1154,14 @@
1154	1154	@ <p>Additional parameters that control this behavior:</p>
1155	1155	@ <blockquote>
1156	1156	onoff_attribute("Enable hyperlinks for humans (as deduced from the UserAgent "
1157	1157	" HTTP header string)",
1158	1158	"auto-hyperlink-ishuman", "ahis", 0, 0);
1159		- @ <br>
	1159	+ @ <br />
1160	1160	onoff_attribute("Require mouse movement before enabling hyperlinks",
1161	1161	"auto-hyperlink-mouseover", "ahmo", 0, 0);
1162		- @ <br>
	1162	+ @ <br />
1163	1163	entry_attribute("Delay before enabling hyperlinks (milliseconds)", 5,
1164	1164	"auto-hyperlink-delay", "ah-delay", "10", 0);
1165	1165	@ </blockquote>
1166	1166	@ <p>Hyperlinks for user "nobody" are normally enabled as soon as the page
1167	1167	@ finishes loading. But the first check-box below can be set to require mouse
		@@ -1314,11 +1314,11 @@
1314	1314	@ <p><form action="%s(g.zTop)/setup_login_group" method="post"><div>
1315	1315	login_insert_csrf_secret();
1316	1316	@ To leave this login group press
1317	1317	@ <input type="submit" value="Leave Login Group" name="leave">
1318	1318	@ </form></p>
1319		- @ <hr><h2>Implementation Details</h2>
	1319	+ @ <hr /><h2>Implementation Details</h2>
1320	1320	@ <p>The following are fields from the CONFIG table related to login-groups,
1321	1321	@ provided here for instructional and debugging purposes:</p>
1322	1322	@ <table border='1' id='configTab'>
1323	1323	@ <thead><tr><th>Config.Name<th>Config.Value<th>Config.mtime</tr></thead><tbody>
1324	1324	db_prepare(&q, "SELECT name, value, datetime(mtime,'unixepoch') FROM config"
		@@ -2153,21 +2153,21 @@
2153	2153	@ <hr />
2154	2154	entry_attribute("Document Branch", 20, "doc-branch", "db", "trunk", 0);
2155	2155	@ <p>When searching documents, use the versions of the files found at the
2156	2156	@ type of the "Document Branch" branch. Recommended value: "trunk".
2157	2157	@ Document search is disabled if blank.
2158		- @ <hr/>
	2158	+ @ <hr />
2159	2159	onoff_attribute("Search Check-in Comments", "search-ci", "sc", 0, 0);
2160		- @ <br>
	2160	+ @ <br />
2161	2161	onoff_attribute("Search Documents", "search-doc", "sd", 0, 0);
2162		- @ <br>
	2162	+ @ <br />
2163	2163	onoff_attribute("Search Tickets", "search-tkt", "st", 0, 0);
2164		- @ <br>
	2164	+ @ <br />
2165	2165	onoff_attribute("Search Wiki","search-wiki", "sw", 0, 0);
2166		- @ <hr/>
	2166	+ @ <hr />
2167	2167	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
2168		- @ <hr/>
	2168	+ @ <hr />
2169	2169	if( P("fts0") ){
2170	2170	search_drop_index();
2171	2171	}else if( P("fts1") ){
2172	2172	search_drop_index();
2173	2173	search_create_index();
2174	2174

	--- src/setup.c
	+++ src/setup.c
	@@ -175,11 +175,11 @@
175	const char *zDate = db_column_text(&s, 4);
176	@ <tr>
177	@ <td><a href='setup_uedit?id=%d(uid)'>%d(uid)</a>
178	@ <td><a href='setup_uedit?id=%d(uid)'>%h(zLogin)</a>
179	@ <td>%h(zCap)
180
181	if( fossil_strcmp(zLogin,"anonymous")==0 ){
182	@ <td>All logged-in users
183	}else if( fossil_strcmp(zLogin,"developer")==0 ){
184	@ <td>Users with '<b>v</b>' capability
185	}else if( fossil_strcmp(zLogin,"nobody")==0 ){
	@@ -1154,14 +1154,14 @@
1154	@ <p>Additional parameters that control this behavior:</p>
1155	@ <blockquote>
1156	onoff_attribute("Enable hyperlinks for humans (as deduced from the UserAgent "
1157	" HTTP header string)",
1158	"auto-hyperlink-ishuman", "ahis", 0, 0);
1159	@ <br>
1160	onoff_attribute("Require mouse movement before enabling hyperlinks",
1161	"auto-hyperlink-mouseover", "ahmo", 0, 0);
1162	@ <br>
1163	entry_attribute("Delay before enabling hyperlinks (milliseconds)", 5,
1164	"auto-hyperlink-delay", "ah-delay", "10", 0);
1165	@ </blockquote>
1166	@ <p>Hyperlinks for user "nobody" are normally enabled as soon as the page
1167	@ finishes loading. But the first check-box below can be set to require mouse
	@@ -1314,11 +1314,11 @@
1314	@ <p><form action="%s(g.zTop)/setup_login_group" method="post"><div>
1315	login_insert_csrf_secret();
1316	@ To leave this login group press
1317	@ <input type="submit" value="Leave Login Group" name="leave">
1318	@ </form></p>
1319	@ <hr><h2>Implementation Details</h2>
1320	@ <p>The following are fields from the CONFIG table related to login-groups,
1321	@ provided here for instructional and debugging purposes:</p>
1322	@ <table border='1' id='configTab'>
1323	@ <thead><tr><th>Config.Name<th>Config.Value<th>Config.mtime</tr></thead><tbody>
1324	db_prepare(&q, "SELECT name, value, datetime(mtime,'unixepoch') FROM config"
	@@ -2153,21 +2153,21 @@
2153	@ <hr />
2154	entry_attribute("Document Branch", 20, "doc-branch", "db", "trunk", 0);
2155	@ <p>When searching documents, use the versions of the files found at the
2156	@ type of the "Document Branch" branch. Recommended value: "trunk".
2157	@ Document search is disabled if blank.
2158	@ <hr/>
2159	onoff_attribute("Search Check-in Comments", "search-ci", "sc", 0, 0);
2160	@ <br>
2161	onoff_attribute("Search Documents", "search-doc", "sd", 0, 0);
2162	@ <br>
2163	onoff_attribute("Search Tickets", "search-tkt", "st", 0, 0);
2164	@ <br>
2165	onoff_attribute("Search Wiki","search-wiki", "sw", 0, 0);
2166	@ <hr/>
2167	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
2168	@ <hr/>
2169	if( P("fts0") ){
2170	search_drop_index();
2171	}else if( P("fts1") ){
2172	search_drop_index();
2173	search_create_index();
2174

	--- src/setup.c
	+++ src/setup.c
	@@ -175,11 +175,11 @@
175	const char *zDate = db_column_text(&s, 4);
176	@ <tr>
177	@ <td><a href='setup_uedit?id=%d(uid)'>%d(uid)</a>
178	@ <td><a href='setup_uedit?id=%d(uid)'>%h(zLogin)</a>
179	@ <td>%h(zCap)
180
181	if( fossil_strcmp(zLogin,"anonymous")==0 ){
182	@ <td>All logged-in users
183	}else if( fossil_strcmp(zLogin,"developer")==0 ){
184	@ <td>Users with '<b>v</b>' capability
185	}else if( fossil_strcmp(zLogin,"nobody")==0 ){
	@@ -1154,14 +1154,14 @@
1154	@ <p>Additional parameters that control this behavior:</p>
1155	@ <blockquote>
1156	onoff_attribute("Enable hyperlinks for humans (as deduced from the UserAgent "
1157	" HTTP header string)",
1158	"auto-hyperlink-ishuman", "ahis", 0, 0);
1159	@ <br />
1160	onoff_attribute("Require mouse movement before enabling hyperlinks",
1161	"auto-hyperlink-mouseover", "ahmo", 0, 0);
1162	@ <br />
1163	entry_attribute("Delay before enabling hyperlinks (milliseconds)", 5,
1164	"auto-hyperlink-delay", "ah-delay", "10", 0);
1165	@ </blockquote>
1166	@ <p>Hyperlinks for user "nobody" are normally enabled as soon as the page
1167	@ finishes loading. But the first check-box below can be set to require mouse
	@@ -1314,11 +1314,11 @@
1314	@ <p><form action="%s(g.zTop)/setup_login_group" method="post"><div>
1315	login_insert_csrf_secret();
1316	@ To leave this login group press
1317	@ <input type="submit" value="Leave Login Group" name="leave">
1318	@ </form></p>
1319	@ <hr /><h2>Implementation Details</h2>
1320	@ <p>The following are fields from the CONFIG table related to login-groups,
1321	@ provided here for instructional and debugging purposes:</p>
1322	@ <table border='1' id='configTab'>
1323	@ <thead><tr><th>Config.Name<th>Config.Value<th>Config.mtime</tr></thead><tbody>
1324	db_prepare(&q, "SELECT name, value, datetime(mtime,'unixepoch') FROM config"
	@@ -2153,21 +2153,21 @@
2153	@ <hr />
2154	entry_attribute("Document Branch", 20, "doc-branch", "db", "trunk", 0);
2155	@ <p>When searching documents, use the versions of the files found at the
2156	@ type of the "Document Branch" branch. Recommended value: "trunk".
2157	@ Document search is disabled if blank.
2158	@ <hr />
2159	onoff_attribute("Search Check-in Comments", "search-ci", "sc", 0, 0);
2160	@ <br />
2161	onoff_attribute("Search Documents", "search-doc", "sd", 0, 0);
2162	@ <br />
2163	onoff_attribute("Search Tickets", "search-tkt", "st", 0, 0);
2164	@ <br />
2165	onoff_attribute("Search Wiki","search-wiki", "sw", 0, 0);
2166	@ <hr />
2167	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
2168	@ <hr />
2169	if( P("fts0") ){
2170	search_drop_index();
2171	}else if( P("fts1") ){
2172	search_drop_index();
2173	search_create_index();
2174

M src/statrep.c

+6 -6

		--- src/statrep.c
		+++ src/statrep.c
		@@ -311,12 +311,12 @@
311	311	}
312	312	@ </tbody></table>
313	313	if(nEventTotal){
314	314	const char *zAvgLabel = includeMonth ? "month" : "year";
315	315	int nAvg = iterations ? (nEventTotal/iterations) : 0;
316		- @ <br><div>Total events: %d(nEventTotal)
317		- @ <br>Average per active %s(zAvgLabel): %d(nAvg)
	316	+ @ <br /><div>Total events: %d(nEventTotal)
	317	+ @ <br />Average per active %s(zAvgLabel): %d(nAvg)
318	318	@ </div>
319	319	}
320	320	if( !includeMonth ){
321	321	output_table_sorting_javascript("statsTable","tnx",-1);
322	322	}
		@@ -342,11 +342,11 @@
342	342	" GROUP BY ifnull(euser,user) ORDER BY count(*) DESC;"
343	343	);
344	344	if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){
345	345	@ <center><svg width=700 height=400>
346	346	piechart_render(700, 400, PIE_OTHER\|PIE_PERCENT);
347		- @ </svg></centre><hr/>
	347	+ @ </svg></centre><hr />
348	348	}
349	349	@ <table class='statistics-report-table-events' border='0'
350	350	@ cellpadding='2' cellspacing='0' id='statsTable'>
351	351	@ <thead><tr>
352	352	@ <th>User</th>
		@@ -503,11 +503,11 @@
503	503	, zUserName
504	504	);
505	505	if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){
506	506	@ <center><svg width=700 height=400>
507	507	piechart_render(700, 400, PIE_OTHER\|PIE_PERCENT);
508		- @ </svg></centre><hr/>
	508	+ @ </svg></centre><hr />
509	509	}
510	510	@ <table class='statistics-report-table-events' border='0'
511	511	@ cellpadding='2' cellspacing='0' id='statsTable'>
512	512	@ <thead><tr>
513	513	@ <th>DoW</th>
		@@ -571,11 +571,11 @@
571	571	" WHERE b>0+(SELECT substr(date(min(mtime)),1,4) FROM event)"
572	572	") SELECT b, b FROM a ORDER BY b DESC");
573	573	if( zYear==0 \|\| strlen(zYear)!=4 ){
574	574	zYear = db_text("1970","SELECT substr(date('now'),1,4);");
575	575	}
576		- cgi_printf("<br/>");
	576	+ cgi_printf("<br />");
577	577	db_prepare(&q,
578	578	"SELECT DISTINCT strftime('%%W',mtime) AS wk, "
579	579	" count(*) AS n "
580	580	" FROM v_reports "
581	581	" WHERE %Q=substr(date(mtime),1,4) "
		@@ -633,11 +633,11 @@
633	633	}
634	634	db_finalize(&q);
635	635	cgi_printf("</tbody></table>");
636	636	if(total){
637	637	int nAvg = iterations ? (total/iterations) : 0;
638		- cgi_printf("<br><div>Total events: %d<br>"
	638	+ cgi_printf("<br /><div>Total events: %d<br />"
639	639	"Average per active week: %d</div>",
640	640	total, nAvg);
641	641	}
642	642	output_table_sorting_javascript("statsTable","tnx",-1);
643	643	}
644	644

	--- src/statrep.c
	+++ src/statrep.c
	@@ -311,12 +311,12 @@
311	}
312	@ </tbody></table>
313	if(nEventTotal){
314	const char *zAvgLabel = includeMonth ? "month" : "year";
315	int nAvg = iterations ? (nEventTotal/iterations) : 0;
316	@ <br><div>Total events: %d(nEventTotal)
317	@ <br>Average per active %s(zAvgLabel): %d(nAvg)
318	@ </div>
319	}
320	if( !includeMonth ){
321	output_table_sorting_javascript("statsTable","tnx",-1);
322	}
	@@ -342,11 +342,11 @@
342	" GROUP BY ifnull(euser,user) ORDER BY count(*) DESC;"
343	);
344	if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){
345	@ <center><svg width=700 height=400>
346	piechart_render(700, 400, PIE_OTHER\|PIE_PERCENT);
347	@ </svg></centre><hr/>
348	}
349	@ <table class='statistics-report-table-events' border='0'
350	@ cellpadding='2' cellspacing='0' id='statsTable'>
351	@ <thead><tr>
352	@ <th>User</th>
	@@ -503,11 +503,11 @@
503	, zUserName
504	);
505	if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){
506	@ <center><svg width=700 height=400>
507	piechart_render(700, 400, PIE_OTHER\|PIE_PERCENT);
508	@ </svg></centre><hr/>
509	}
510	@ <table class='statistics-report-table-events' border='0'
511	@ cellpadding='2' cellspacing='0' id='statsTable'>
512	@ <thead><tr>
513	@ <th>DoW</th>
	@@ -571,11 +571,11 @@
571	" WHERE b>0+(SELECT substr(date(min(mtime)),1,4) FROM event)"
572	") SELECT b, b FROM a ORDER BY b DESC");
573	if( zYear==0 \|\| strlen(zYear)!=4 ){
574	zYear = db_text("1970","SELECT substr(date('now'),1,4);");
575	}
576	cgi_printf("<br/>");
577	db_prepare(&q,
578	"SELECT DISTINCT strftime('%%W',mtime) AS wk, "
579	" count(*) AS n "
580	" FROM v_reports "
581	" WHERE %Q=substr(date(mtime),1,4) "
	@@ -633,11 +633,11 @@
633	}
634	db_finalize(&q);
635	cgi_printf("</tbody></table>");
636	if(total){
637	int nAvg = iterations ? (total/iterations) : 0;
638	cgi_printf("<br><div>Total events: %d<br>"
639	"Average per active week: %d</div>",
640	total, nAvg);
641	}
642	output_table_sorting_javascript("statsTable","tnx",-1);
643	}
644

	--- src/statrep.c
	+++ src/statrep.c
	@@ -311,12 +311,12 @@
311	}
312	@ </tbody></table>
313	if(nEventTotal){
314	const char *zAvgLabel = includeMonth ? "month" : "year";
315	int nAvg = iterations ? (nEventTotal/iterations) : 0;
316	@ <br /><div>Total events: %d(nEventTotal)
317	@ <br />Average per active %s(zAvgLabel): %d(nAvg)
318	@ </div>
319	}
320	if( !includeMonth ){
321	output_table_sorting_javascript("statsTable","tnx",-1);
322	}
	@@ -342,11 +342,11 @@
342	" GROUP BY ifnull(euser,user) ORDER BY count(*) DESC;"
343	);
344	if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){
345	@ <center><svg width=700 height=400>
346	piechart_render(700, 400, PIE_OTHER\|PIE_PERCENT);
347	@ </svg></centre><hr />
348	}
349	@ <table class='statistics-report-table-events' border='0'
350	@ cellpadding='2' cellspacing='0' id='statsTable'>
351	@ <thead><tr>
352	@ <th>User</th>
	@@ -503,11 +503,11 @@
503	, zUserName
504	);
505	if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){
506	@ <center><svg width=700 height=400>
507	piechart_render(700, 400, PIE_OTHER\|PIE_PERCENT);
508	@ </svg></centre><hr />
509	}
510	@ <table class='statistics-report-table-events' border='0'
511	@ cellpadding='2' cellspacing='0' id='statsTable'>
512	@ <thead><tr>
513	@ <th>DoW</th>
	@@ -571,11 +571,11 @@
571	" WHERE b>0+(SELECT substr(date(min(mtime)),1,4) FROM event)"
572	") SELECT b, b FROM a ORDER BY b DESC");
573	if( zYear==0 \|\| strlen(zYear)!=4 ){
574	zYear = db_text("1970","SELECT substr(date('now'),1,4);");
575	}
576	cgi_printf("<br />");
577	db_prepare(&q,
578	"SELECT DISTINCT strftime('%%W',mtime) AS wk, "
579	" count(*) AS n "
580	" FROM v_reports "
581	" WHERE %Q=substr(date(mtime),1,4) "
	@@ -633,11 +633,11 @@
633	}
634	db_finalize(&q);
635	cgi_printf("</tbody></table>");
636	if(total){
637	int nAvg = iterations ? (total/iterations) : 0;
638	cgi_printf("<br /><div>Total events: %d<br />"
639	"Average per active week: %d</div>",
640	total, nAvg);
641	}
642	output_table_sorting_javascript("statsTable","tnx",-1);
643	}
644

M src/tar.c

+5 -5

		--- src/tar.c
		+++ src/tar.c
		@@ -684,20 +684,20 @@
684	684	blob_appendf(&cacheKey, "/tarball/%z", rid_to_uuid(rid));
685	685	if( zInclude ) blob_appendf(&cacheKey, ",in=%Q", zInclude);
686	686	if( zExclude ) blob_appendf(&cacheKey, ",ex=%Q", zExclude);
687	687	blob_appendf(&cacheKey, "/%q", zName);
688	688	zKey = blob_str(&cacheKey);
689		-
	689	+
690	690	if( P("debug")!=0 ){
691	691	style_header("Tarball Generator Debug Screen");
692		- @ zName = "%h(zName)"<br>
693		- @ rid = %d(rid)<br>
	692	+ @ zName = "%h(zName)"<br />
	693	+ @ rid = %d(rid)<br />
694	694	if( zInclude ){
695		- @ zInclude = "%h(zInclude)"<br>
	695	+ @ zInclude = "%h(zInclude)"<br />
696	696	}
697	697	if( zExclude ){
698		- @ zExclude = "%h(zExclude)"<br>
	698	+ @ zExclude = "%h(zExclude)"<br />
699	699	}
700	700	@ zKey = "%h(zKey)"
701	701	style_footer();
702	702	return;
703	703	}
704	704

	--- src/tar.c
	+++ src/tar.c
	@@ -684,20 +684,20 @@
684	blob_appendf(&cacheKey, "/tarball/%z", rid_to_uuid(rid));
685	if( zInclude ) blob_appendf(&cacheKey, ",in=%Q", zInclude);
686	if( zExclude ) blob_appendf(&cacheKey, ",ex=%Q", zExclude);
687	blob_appendf(&cacheKey, "/%q", zName);
688	zKey = blob_str(&cacheKey);
689
690	if( P("debug")!=0 ){
691	style_header("Tarball Generator Debug Screen");
692	@ zName = "%h(zName)"<br>
693	@ rid = %d(rid)<br>
694	if( zInclude ){
695	@ zInclude = "%h(zInclude)"<br>
696	}
697	if( zExclude ){
698	@ zExclude = "%h(zExclude)"<br>
699	}
700	@ zKey = "%h(zKey)"
701	style_footer();
702	return;
703	}
704

	--- src/tar.c
	+++ src/tar.c
	@@ -684,20 +684,20 @@
684	blob_appendf(&cacheKey, "/tarball/%z", rid_to_uuid(rid));
685	if( zInclude ) blob_appendf(&cacheKey, ",in=%Q", zInclude);
686	if( zExclude ) blob_appendf(&cacheKey, ",ex=%Q", zExclude);
687	blob_appendf(&cacheKey, "/%q", zName);
688	zKey = blob_str(&cacheKey);
689
690	if( P("debug")!=0 ){
691	style_header("Tarball Generator Debug Screen");
692	@ zName = "%h(zName)"<br />
693	@ rid = %d(rid)<br />
694	if( zInclude ){
695	@ zInclude = "%h(zInclude)"<br />
696	}
697	if( zExclude ){
698	@ zExclude = "%h(zExclude)"<br />
699	}
700	@ zKey = "%h(zKey)"
701	style_footer();
702	return;
703	}
704

M src/th_main.c

+3 -3

		--- src/th_main.c
		+++ src/th_main.c
		@@ -282,11 +282,11 @@
282	282	if( argc<2 \|\| argc>3 ){
283	283	return Th_WrongNumArgs(interp, "enable_output [LABEL] BOOLEAN");
284	284	}
285	285	rc = Th_ToInt(interp, argv[argc-1], argl[argc-1], &enableOutput);
286	286	if( g.thTrace ){
287		- Th_Trace("enable_output {%.*s} -> %d<br>\n", argl[1],argv[1],enableOutput);
	287	+ Th_Trace("enable_output {%.*s} -> %d<br />\n", argl[1],argv[1],enableOutput);
288	288	}
289	289	return rc;
290	290	}
291	291
292	292	/*
		@@ -332,11 +332,11 @@
332	332
333	333	static void sendError(const char *z, int n, int forceCgi){
334	334	int savedEnable = enableOutput;
335	335	enableOutput = 1;
336	336	if( forceCgi \|\| g.cgiOutput ){
337		- sendText("<hr><p class=\"thmainError\">", -1, 0);
	337	+ sendText("<hr /><p class=\"thmainError\">", -1, 0);
338	338	}
339	339	sendText("ERROR: ", -1, 0);
340	340	sendText((char*)z, n, 1);
341	341	sendText(forceCgi \|\| g.cgiOutput ? "</p>" : "\n", -1, 0);
342	342	enableOutput = savedEnable;
		@@ -2327,11 +2327,11 @@
2327	2327	}else if( z[i]=='<' && isBeginScriptTag(&z[i]) ){
2328	2328	sendText(z, i, 0);
2329	2329	z += i+5;
2330	2330	for(i=0; z[i] && (z[i]!='<' \|\| !isEndScriptTag(&z[i])); i++){}
2331	2331	if( g.thTrace ){
2332		- Th_Trace("eval {<pre>%#h</pre>}<br>", i, z);
	2332	+ Th_Trace("eval {<pre>%#h</pre>}<br />", i, z);
2333	2333	}
2334	2334	rc = Th_Eval(g.interp, 0, (const char*)z, i);
2335	2335	if( rc!=TH_OK ) break;
2336	2336	z += i;
2337	2337	if( z[0] ){ z += 6; }
2338	2338

	--- src/th_main.c
	+++ src/th_main.c
	@@ -282,11 +282,11 @@
282	if( argc<2 \|\| argc>3 ){
283	return Th_WrongNumArgs(interp, "enable_output [LABEL] BOOLEAN");
284	}
285	rc = Th_ToInt(interp, argv[argc-1], argl[argc-1], &enableOutput);
286	if( g.thTrace ){
287	Th_Trace("enable_output {%.*s} -> %d<br>\n", argl[1],argv[1],enableOutput);
288	}
289	return rc;
290	}
291
292	/*
	@@ -332,11 +332,11 @@
332
333	static void sendError(const char *z, int n, int forceCgi){
334	int savedEnable = enableOutput;
335	enableOutput = 1;
336	if( forceCgi \|\| g.cgiOutput ){
337	sendText("<hr><p class=\"thmainError\">", -1, 0);
338	}
339	sendText("ERROR: ", -1, 0);
340	sendText((char*)z, n, 1);
341	sendText(forceCgi \|\| g.cgiOutput ? "</p>" : "\n", -1, 0);
342	enableOutput = savedEnable;
	@@ -2327,11 +2327,11 @@
2327	}else if( z[i]=='<' && isBeginScriptTag(&z[i]) ){
2328	sendText(z, i, 0);
2329	z += i+5;
2330	for(i=0; z[i] && (z[i]!='<' \|\| !isEndScriptTag(&z[i])); i++){}
2331	if( g.thTrace ){
2332	Th_Trace("eval {<pre>%#h</pre>}<br>", i, z);
2333	}
2334	rc = Th_Eval(g.interp, 0, (const char*)z, i);
2335	if( rc!=TH_OK ) break;
2336	z += i;
2337	if( z[0] ){ z += 6; }
2338

	--- src/th_main.c
	+++ src/th_main.c
	@@ -282,11 +282,11 @@
282	if( argc<2 \|\| argc>3 ){
283	return Th_WrongNumArgs(interp, "enable_output [LABEL] BOOLEAN");
284	}
285	rc = Th_ToInt(interp, argv[argc-1], argl[argc-1], &enableOutput);
286	if( g.thTrace ){
287	Th_Trace("enable_output {%.*s} -> %d<br />\n", argl[1],argv[1],enableOutput);
288	}
289	return rc;
290	}
291
292	/*
	@@ -332,11 +332,11 @@
332
333	static void sendError(const char *z, int n, int forceCgi){
334	int savedEnable = enableOutput;
335	enableOutput = 1;
336	if( forceCgi \|\| g.cgiOutput ){
337	sendText("<hr /><p class=\"thmainError\">", -1, 0);
338	}
339	sendText("ERROR: ", -1, 0);
340	sendText((char*)z, n, 1);
341	sendText(forceCgi \|\| g.cgiOutput ? "</p>" : "\n", -1, 0);
342	enableOutput = savedEnable;
	@@ -2327,11 +2327,11 @@
2327	}else if( z[i]=='<' && isBeginScriptTag(&z[i]) ){
2328	sendText(z, i, 0);
2329	z += i+5;
2330	for(i=0; z[i] && (z[i]!='<' \|\| !isEndScriptTag(&z[i])); i++){}
2331	if( g.thTrace ){
2332	Th_Trace("eval {<pre>%#h</pre>}<br />", i, z);
2333	}
2334	rc = Th_Eval(g.interp, 0, (const char*)z, i);
2335	if( rc!=TH_OK ) break;
2336	z += i;
2337	if( z[0] ){ z += 6; }
2338

M src/timeline.c

+5 -5

		--- src/timeline.c
		+++ src/timeline.c
		@@ -178,11 +178,11 @@
178	178	@ suam declinavit.</p>
179	179	cnt++;
180	180	}
181	181	}
182	182	if( cnt ){
183		- @ <hr>
	183	+ @ <hr />
184	184	}
185	185	@ <form method="post" action="%s(g.zTop)/hash-color-test">
186	186	@ <p>Enter candidate branch names below and see them displayed in their
187	187	@ default background colors above.</p>
188	188	for(i=0; i<10; i++){
		@@ -299,11 +299,11 @@
299	299	}
300	300	pendingEndTr = 0;
301	301	}
302	302	if( fossil_strcmp(zType,"div")==0 ){
303	303	if( !prevWasDivider ){
304		- @ <tr><td colspan="3"><hr class="timelineMarker"/></td></tr>
	304	+ @ <tr><td colspan="3"><hr class="timelineMarker" /></td></tr>
305	305	}
306	306	prevWasDivider = 1;
307	307	continue;
308	308	}
309	309	prevWasDivider = 0;
		@@ -1217,11 +1217,11 @@
1217	1217	** forks Show only forks and their children
1218	1218	** ym=YYYY-MM Show only events for the given year/month.
1219	1219	** yw=YYYY-WW Show only events for the given week of the given year
1220	1220	** ymd=YYYY-MM-DD Show only events on the given day
1221	1221	** datefmt=N Override the date format
1222		-** bisect Show the check-ins that are in the current bisect
	1222	+** bisect Show the check-ins that are in the current bisect
1223	1223	**
1224	1224	** p= and d= can appear individually or together. If either p= or d=
1225	1225	** appear, then u=, y=, a=, and b= are ignored.
1226	1226	**
1227	1227	** If both a= and b= appear then both upper and lower bounds are honored.
		@@ -1439,11 +1439,11 @@
1439	1439	}
1440	1440	blob_append(&sql, ")", -1);
1441	1441	path_reset();
1442	1442	tmFlags \|= TIMELINE_DISJOINT;
1443	1443	db_multi_exec("%s", blob_sql_text(&sql));
1444		- blob_appendf(&desc, "%d check-ins going from ",
	1444	+ blob_appendf(&desc, "%d check-ins going from ",
1445	1445	db_int(0, "SELECT count(*) FROM timeline"));
1446	1446	blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h", zFrom), zFrom);
1447	1447	blob_append(&desc, " to ", -1);
1448	1448	blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h",zTo), zTo);
1449	1449	}else if( (p_rid \|\| d_rid) && g.perm.Read ){
		@@ -1732,11 +1732,11 @@
1732	1732	blob_appendf(&desc, " related to \"%h\"", zBrName);
1733	1733	tmFlags \|= TIMELINE_DISJOINT;
1734	1734	}
1735	1735	if( rAfter>0.0 ){
1736	1736	if( rBefore>0.0 ){
1737		- blob_appendf(&desc, " occurring between %h and %h.<br>",
	1737	+ blob_appendf(&desc, " occurring between %h and %h.<br />",
1738	1738	zAfter, zBefore);
1739	1739	}else{
1740	1740	blob_appendf(&desc, " occurring on or after %h.<br />", zAfter);
1741	1741	}
1742	1742	}else if( rBefore>0.0 ){
1743	1743

	--- src/timeline.c
	+++ src/timeline.c
	@@ -178,11 +178,11 @@
178	@ suam declinavit.</p>
179	cnt++;
180	}
181	}
182	if( cnt ){
183	@ <hr>
184	}
185	@ <form method="post" action="%s(g.zTop)/hash-color-test">
186	@ <p>Enter candidate branch names below and see them displayed in their
187	@ default background colors above.</p>
188	for(i=0; i<10; i++){
	@@ -299,11 +299,11 @@
299	}
300	pendingEndTr = 0;
301	}
302	if( fossil_strcmp(zType,"div")==0 ){
303	if( !prevWasDivider ){
304	@ <tr><td colspan="3"><hr class="timelineMarker"/></td></tr>
305	}
306	prevWasDivider = 1;
307	continue;
308	}
309	prevWasDivider = 0;
	@@ -1217,11 +1217,11 @@
1217	** forks Show only forks and their children
1218	** ym=YYYY-MM Show only events for the given year/month.
1219	** yw=YYYY-WW Show only events for the given week of the given year
1220	** ymd=YYYY-MM-DD Show only events on the given day
1221	** datefmt=N Override the date format
1222	** bisect Show the check-ins that are in the current bisect
1223	**
1224	** p= and d= can appear individually or together. If either p= or d=
1225	** appear, then u=, y=, a=, and b= are ignored.
1226	**
1227	** If both a= and b= appear then both upper and lower bounds are honored.
	@@ -1439,11 +1439,11 @@
1439	}
1440	blob_append(&sql, ")", -1);
1441	path_reset();
1442	tmFlags \|= TIMELINE_DISJOINT;
1443	db_multi_exec("%s", blob_sql_text(&sql));
1444	blob_appendf(&desc, "%d check-ins going from ",
1445	db_int(0, "SELECT count(*) FROM timeline"));
1446	blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h", zFrom), zFrom);
1447	blob_append(&desc, " to ", -1);
1448	blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h",zTo), zTo);
1449	}else if( (p_rid \|\| d_rid) && g.perm.Read ){
	@@ -1732,11 +1732,11 @@
1732	blob_appendf(&desc, " related to \"%h\"", zBrName);
1733	tmFlags \|= TIMELINE_DISJOINT;
1734	}
1735	if( rAfter>0.0 ){
1736	if( rBefore>0.0 ){
1737	blob_appendf(&desc, " occurring between %h and %h.<br>",
1738	zAfter, zBefore);
1739	}else{
1740	blob_appendf(&desc, " occurring on or after %h.<br />", zAfter);
1741	}
1742	}else if( rBefore>0.0 ){
1743

	--- src/timeline.c
	+++ src/timeline.c
	@@ -178,11 +178,11 @@
178	@ suam declinavit.</p>
179	cnt++;
180	}
181	}
182	if( cnt ){
183	@ <hr />
184	}
185	@ <form method="post" action="%s(g.zTop)/hash-color-test">
186	@ <p>Enter candidate branch names below and see them displayed in their
187	@ default background colors above.</p>
188	for(i=0; i<10; i++){
	@@ -299,11 +299,11 @@
299	}
300	pendingEndTr = 0;
301	}
302	if( fossil_strcmp(zType,"div")==0 ){
303	if( !prevWasDivider ){
304	@ <tr><td colspan="3"><hr class="timelineMarker" /></td></tr>
305	}
306	prevWasDivider = 1;
307	continue;
308	}
309	prevWasDivider = 0;
	@@ -1217,11 +1217,11 @@
1217	** forks Show only forks and their children
1218	** ym=YYYY-MM Show only events for the given year/month.
1219	** yw=YYYY-WW Show only events for the given week of the given year
1220	** ymd=YYYY-MM-DD Show only events on the given day
1221	** datefmt=N Override the date format
1222	** bisect Show the check-ins that are in the current bisect
1223	**
1224	** p= and d= can appear individually or together. If either p= or d=
1225	** appear, then u=, y=, a=, and b= are ignored.
1226	**
1227	** If both a= and b= appear then both upper and lower bounds are honored.
	@@ -1439,11 +1439,11 @@
1439	}
1440	blob_append(&sql, ")", -1);
1441	path_reset();
1442	tmFlags \|= TIMELINE_DISJOINT;
1443	db_multi_exec("%s", blob_sql_text(&sql));
1444	blob_appendf(&desc, "%d check-ins going from ",
1445	db_int(0, "SELECT count(*) FROM timeline"));
1446	blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h", zFrom), zFrom);
1447	blob_append(&desc, " to ", -1);
1448	blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h",zTo), zTo);
1449	}else if( (p_rid \|\| d_rid) && g.perm.Read ){
	@@ -1732,11 +1732,11 @@
1732	blob_appendf(&desc, " related to \"%h\"", zBrName);
1733	tmFlags \|= TIMELINE_DISJOINT;
1734	}
1735	if( rAfter>0.0 ){
1736	if( rBefore>0.0 ){
1737	blob_appendf(&desc, " occurring between %h and %h.<br />",
1738	zAfter, zBefore);
1739	}else{
1740	blob_appendf(&desc, " occurring on or after %h.<br />", zAfter);
1741	}
1742	}else if( rBefore>0.0 ){
1743

M src/tktsetup.c

+3 -3

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -524,11 +524,11 @@
524	524	@ mimetype as xmimetype, icomment AS xcomment,
525	525	@ username AS xusername
526	526	@ FROM ticketchng
527	527	@ WHERE tkt_id=$tkt_id AND length(icomment)>0} {
528	528	@ if {$seenRow} {
529		-@ html "<hr>\n"
	529	+@ html "<hr />\n"
530	530	@ } else {
531	531	@ html "<tr><td class='tktDspLabel'>User Comments:</td></tr>\n"
532	532	@ html "<tr><td colspan='5' class='tktDspValue'>\n"
533	533	@ set seenRow 1
534	534	@ }
		@@ -651,11 +651,11 @@
651	651	@ wrap="virtual" class="wikiedit">$<icomment></textarea>
652	652	@ </td></tr>
653	653	@
654	654	@ <th1>enable_output [info exists preview]</th1>
655	655	@ <tr><td colspan="2">
656		-@ Description Preview:<br><hr>
	656	+@ Description Preview:<br /><hr />
657	657	@ <th1>
658	658	@ if {$mutype eq "Wiki"} {
659	659	@ wiki $icomment
660	660	@ } elseif {$mutype eq "Plain Text"} {
661	661	@ set r [randhex]
		@@ -665,11 +665,11 @@
665	665	@ wiki "<verbatim-$r links>\n[string trimright $icomment]</verbatim-$r>"
666	666	@ } else {
667	667	@ wiki "<nowiki>\n[string trimright $icomment]\n</nowiki>"
668	668	@ }
669	669	@ </th1>
670		-@ <hr>
	670	+@ <hr />
671	671	@ </td></tr>
672	672	@ <th1>enable_output 1</th1>
673	673	@
674	674	@ <tr>
675	675	@ <td align="right">
676	676

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -524,11 +524,11 @@
524	@ mimetype as xmimetype, icomment AS xcomment,
525	@ username AS xusername
526	@ FROM ticketchng
527	@ WHERE tkt_id=$tkt_id AND length(icomment)>0} {
528	@ if {$seenRow} {
529	@ html "<hr>\n"
530	@ } else {
531	@ html "<tr><td class='tktDspLabel'>User Comments:</td></tr>\n"
532	@ html "<tr><td colspan='5' class='tktDspValue'>\n"
533	@ set seenRow 1
534	@ }
	@@ -651,11 +651,11 @@
651	@ wrap="virtual" class="wikiedit">$<icomment></textarea>
652	@ </td></tr>
653	@
654	@ <th1>enable_output [info exists preview]</th1>
655	@ <tr><td colspan="2">
656	@ Description Preview:<br><hr>
657	@ <th1>
658	@ if {$mutype eq "Wiki"} {
659	@ wiki $icomment
660	@ } elseif {$mutype eq "Plain Text"} {
661	@ set r [randhex]
	@@ -665,11 +665,11 @@
665	@ wiki "<verbatim-$r links>\n[string trimright $icomment]</verbatim-$r>"
666	@ } else {
667	@ wiki "<nowiki>\n[string trimright $icomment]\n</nowiki>"
668	@ }
669	@ </th1>
670	@ <hr>
671	@ </td></tr>
672	@ <th1>enable_output 1</th1>
673	@
674	@ <tr>
675	@ <td align="right">
676

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -524,11 +524,11 @@
524	@ mimetype as xmimetype, icomment AS xcomment,
525	@ username AS xusername
526	@ FROM ticketchng
527	@ WHERE tkt_id=$tkt_id AND length(icomment)>0} {
528	@ if {$seenRow} {
529	@ html "<hr />\n"
530	@ } else {
531	@ html "<tr><td class='tktDspLabel'>User Comments:</td></tr>\n"
532	@ html "<tr><td colspan='5' class='tktDspValue'>\n"
533	@ set seenRow 1
534	@ }
	@@ -651,11 +651,11 @@
651	@ wrap="virtual" class="wikiedit">$<icomment></textarea>
652	@ </td></tr>
653	@
654	@ <th1>enable_output [info exists preview]</th1>
655	@ <tr><td colspan="2">
656	@ Description Preview:<br /><hr />
657	@ <th1>
658	@ if {$mutype eq "Wiki"} {
659	@ wiki $icomment
660	@ } elseif {$mutype eq "Plain Text"} {
661	@ set r [randhex]
	@@ -665,11 +665,11 @@
665	@ wiki "<verbatim-$r links>\n[string trimright $icomment]</verbatim-$r>"
666	@ } else {
667	@ wiki "<nowiki>\n[string trimright $icomment]\n</nowiki>"
668	@ }
669	@ </th1>
670	@ <hr />
671	@ </td></tr>
672	@ <th1>enable_output 1</th1>
673	@
674	@ <tr>
675	@ <td align="right">
676

M src/xfersetup.c

+1 -1

		--- src/xfersetup.c
		+++ src/xfersetup.c
		@@ -61,11 +61,11 @@
61	61	zButton = "Synchronize";
62	62	zWarning = mprintf("WARNING: Pushing to \"%s\" is enabled.",
63	63	g.url.canonical);
64	64	}
65	65	@ <p>Press the <strong>%h(zButton)</strong> button below to
66		- @ synchronize with the <em>%h(g.url.canonical)</em> repository now.<br/>
	66	+ @ synchronize with the <em>%h(g.url.canonical)</em> repository now.<br />
67	67	@ This may be useful when testing the various transfer scripts.</p>
68	68	@ <p>You can use the <code>http -async</code> command in your scripts, but
69	69	@ make sure the <code>th1-uri-regexp</code> setting is set first.</p>
70	70	if( zWarning ){
71	71	@
72	72

	--- src/xfersetup.c
	+++ src/xfersetup.c
	@@ -61,11 +61,11 @@
61	zButton = "Synchronize";
62	zWarning = mprintf("WARNING: Pushing to \"%s\" is enabled.",
63	g.url.canonical);
64	}
65	@ <p>Press the <strong>%h(zButton)</strong> button below to
66	@ synchronize with the <em>%h(g.url.canonical)</em> repository now.<br/>
67	@ This may be useful when testing the various transfer scripts.</p>
68	@ <p>You can use the <code>http -async</code> command in your scripts, but
69	@ make sure the <code>th1-uri-regexp</code> setting is set first.</p>
70	if( zWarning ){
71	@
72

	--- src/xfersetup.c
	+++ src/xfersetup.c
	@@ -61,11 +61,11 @@
61	zButton = "Synchronize";
62	zWarning = mprintf("WARNING: Pushing to \"%s\" is enabled.",
63	g.url.canonical);
64	}
65	@ <p>Press the <strong>%h(zButton)</strong> button below to
66	@ synchronize with the <em>%h(g.url.canonical)</em> repository now.<br />
67	@ This may be useful when testing the various transfer scripts.</p>
68	@ <p>You can use the <code>http -async</code> command in your scripts, but
69	@ make sure the <code>th1-uri-regexp</code> setting is set first.</p>
70	if( zWarning ){
71	@
72

Fossil SCM

Keyboard Shortcuts