214d2faf6d4… — Fossil SCM

M src/attach.c

+2 -2

		--- src/attach.c
		+++ src/attach.c
		@@ -75,13 +75,13 @@
75	75	zFilename = &zFilename[i+1];
76	76	i = -1;
77	77	}
78	78	}
79	79	if( strlen(zTarget)==UUID_SIZE && validate16(zTarget,UUID_SIZE) ){
80		- zUrlTail = mprintf("tkt=%s&file=%t", zTarget, zFilename);
	80	+ zUrlTail = mprintf("tkt=%s&file=%t", zTarget, zFilename);
81	81	}else{
82		- zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
	82	+ zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
83	83	}
84	84	@
85	85	@ <p><a href="/attachview?%s(zUrlTail)">%h(zFilename)</a>
86	86	@ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
87	87	if( zComment ) while( isspace(zComment[0]) ) zComment++;
88	88

	--- src/attach.c
	+++ src/attach.c
	@@ -75,13 +75,13 @@
75	zFilename = &zFilename[i+1];
76	i = -1;
77	}
78	}
79	if( strlen(zTarget)==UUID_SIZE && validate16(zTarget,UUID_SIZE) ){
80	zUrlTail = mprintf("tkt=%s&file=%t", zTarget, zFilename);
81	}else{
82	zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
83	}
84	@
85	@ <p><a href="/attachview?%s(zUrlTail)">%h(zFilename)</a>
86	@ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
87	if( zComment ) while( isspace(zComment[0]) ) zComment++;
88

	--- src/attach.c
	+++ src/attach.c
	@@ -75,13 +75,13 @@
75	zFilename = &zFilename[i+1];
76	i = -1;
77	}
78	}
79	if( strlen(zTarget)==UUID_SIZE && validate16(zTarget,UUID_SIZE) ){
80	zUrlTail = mprintf("tkt=%s&file=%t", zTarget, zFilename);
81	}else{
82	zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
83	}
84	@
85	@ <p><a href="/attachview?%s(zUrlTail)">%h(zFilename)</a>
86	@ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
87	if( zComment ) while( isspace(zComment[0]) ) zComment++;
88

M src/browse.c

+2 -2

		--- src/browse.c
		+++ src/browse.c
		@@ -157,13 +157,13 @@
157	157	@ <h2>The union of all files from all check-ins
158	158	@ %s(blob_str(&dirname))</h2>
159	159	zSubdirLink = mprintf("%s/dir?name=%T", g.zBaseURL, zPrefix);
160	160	if( zD ){
161	161	style_submenu_element("Top", "Top", "%s/dir", g.zBaseURL);
162		- style_submenu_element("Tip", "Tip", "%s/dir?name=%t&ci=tip",
	162	+ style_submenu_element("Tip", "Tip", "%s/dir?name=%t&ci=tip",
163	163	g.zBaseURL, zD);
164		- style_submenu_element("Trunk", "Trunk", "%s/dir?name=%t&ci=trunk",
	164	+ style_submenu_element("Trunk", "Trunk", "%s/dir?name=%t&ci=trunk",
165	165	g.zBaseURL,zD);
166	166	}else{
167	167	style_submenu_element("Tip", "Tip", "%s/dir?ci=tip", g.zBaseURL);
168	168	style_submenu_element("Trunk", "Trunk", "%s/dir?ci=trunk", g.zBaseURL);
169	169	}
170	170

	--- src/browse.c
	+++ src/browse.c
	@@ -157,13 +157,13 @@
157	@ <h2>The union of all files from all check-ins
158	@ %s(blob_str(&dirname))</h2>
159	zSubdirLink = mprintf("%s/dir?name=%T", g.zBaseURL, zPrefix);
160	if( zD ){
161	style_submenu_element("Top", "Top", "%s/dir", g.zBaseURL);
162	style_submenu_element("Tip", "Tip", "%s/dir?name=%t&ci=tip",
163	g.zBaseURL, zD);
164	style_submenu_element("Trunk", "Trunk", "%s/dir?name=%t&ci=trunk",
165	g.zBaseURL,zD);
166	}else{
167	style_submenu_element("Tip", "Tip", "%s/dir?ci=tip", g.zBaseURL);
168	style_submenu_element("Trunk", "Trunk", "%s/dir?ci=trunk", g.zBaseURL);
169	}
170

	--- src/browse.c
	+++ src/browse.c
	@@ -157,13 +157,13 @@
157	@ <h2>The union of all files from all check-ins
158	@ %s(blob_str(&dirname))</h2>
159	zSubdirLink = mprintf("%s/dir?name=%T", g.zBaseURL, zPrefix);
160	if( zD ){
161	style_submenu_element("Top", "Top", "%s/dir", g.zBaseURL);
162	style_submenu_element("Tip", "Tip", "%s/dir?name=%t&ci=tip",
163	g.zBaseURL, zD);
164	style_submenu_element("Trunk", "Trunk", "%s/dir?name=%t&ci=trunk",
165	g.zBaseURL,zD);
166	}else{
167	style_submenu_element("Tip", "Tip", "%s/dir?ci=tip", g.zBaseURL);
168	style_submenu_element("Trunk", "Trunk", "%s/dir?ci=trunk", g.zBaseURL);
169	}
170

M src/info.c

+9 -9

		--- src/info.c
		+++ src/info.c
		@@ -618,11 +618,11 @@
618	618	}
619	619
620	620
621	621	/*
622	622	** WEBPAGE: vdiff
623		-** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN
	623	+** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN
624	624	**
625	625	** Show all differences between two checkins.
626	626	*/
627	627	void vdiff_page(void){
628	628	int ridFrom, ridTo;
		@@ -996,11 +996,11 @@
996	996	if( !g.okRead ){ login_needed(); return; }
997	997	if( rid==0 ) fossil_redirect_home();
998	998	if( g.okAdmin ){
999	999	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1000	1000	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1001		- style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
	1001	+ style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1002	1002	g.zTop, zUuid);
1003	1003	}else{
1004	1004	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1005	1005	g.zTop, zUuid);
1006	1006	}
		@@ -1078,11 +1078,11 @@
1078	1078	if( !g.okRead ){ login_needed(); return; }
1079	1079	if( rid==0 ) fossil_redirect_home();
1080	1080	if( g.okAdmin ){
1081	1081	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1082	1082	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1083		- style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
	1083	+ style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1084	1084	g.zTop, zUuid);
1085	1085	}else{
1086	1086	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1087	1087	g.zTop, zUuid);
1088	1088	}
		@@ -1102,20 +1102,20 @@
1102	1102	style_submenu_element("Html", "Html",
1103	1103	"%s/artifact?name=%s", g.zTop, zUuid);
1104	1104	}else{
1105	1105	renderAsHtml = 1;
1106	1106	style_submenu_element("Text", "Text",
1107		- "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
	1107	+ "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1108	1108	}
1109	1109	}else if( strcmp(zMime, "application/x-fossil-wiki")==0 ){
1110	1110	if( P("txt") ){
1111	1111	style_submenu_element("Wiki", "Wiki",
1112	1112	"%s/artifact?name=%s", g.zTop, zUuid);
1113	1113	}else{
1114	1114	renderAsWiki = 1;
1115	1115	style_submenu_element("Text", "Text",
1116		- "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
	1116	+ "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1117	1117	}
1118	1118	}
1119	1119	}
1120	1120	@ </p></blockquote>
1121	1121	@ <hr />
		@@ -1133,11 +1133,11 @@
1133	1133	@ <pre>
1134	1134	@ %h(blob_str(&content))
1135	1135	@ </pre>
1136	1136	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1137	1137	}else if( strncmp(zMime, "image/", 6)==0 ){
1138		- @ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img>
	1138	+ @ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img>
1139	1139	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1140	1140	}else{
1141	1141	@ <pre>
1142	1142	hexdump(&content);
1143	1143	@ </pre>
		@@ -1166,11 +1166,11 @@
1166	1166	rid = name_to_rid_www("name");
1167	1167	if( rid==0 ){ fossil_redirect_home(); }
1168	1168	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1169	1169	if( g.okAdmin ){
1170	1170	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1171		- style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
	1171	+ style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1172	1172	g.zTop, zUuid);
1173	1173	}else{
1174	1174	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1175	1175	g.zTop, zUuid);
1176	1176	}
		@@ -1444,11 +1444,11 @@
1444	1444	int nTag = 0;
1445	1445	@ <b>Preview:</b>
1446	1446	@ <blockquote>
1447	1447	@ <table border=0>
1448	1448	if( zNewColor && zNewColor[0] ){
1449		- @ <tr><td bgcolor="%h(zNewColor)">
	1449	+ @ <tr><td style="background-color: %h(zNewColor);">
1450	1450	}else{
1451	1451	@ <tr><td>
1452	1452	}
1453	1453	wiki_convert(&comment, 0, WIKI_INLINE);
1454	1454	blob_zero(&suffix);
		@@ -1507,11 +1507,11 @@
1507	1507	}
1508	1508	@ Propagate color to descendants</input></td></tr>
1509	1509	@ <tr>
1510	1510	for(i=0; i<nColor; i++){
1511	1511	if( aColor[i].zColor[0] ){
1512		- @ <td bgcolor="%h(aColor[i].zColor)">
	1512	+ @ <td style="background-color: %h(aColor[i].zColor);">
1513	1513	}else{
1514	1514	@ <td>
1515	1515	}
1516	1516	if( strcmp(zNewColor, aColor[i].zColor)==0 ){
1517	1517	@ <input type="radio" name="clr" value="%h(aColor[i].zColor)" checked>
1518	1518

	--- src/info.c
	+++ src/info.c
	@@ -618,11 +618,11 @@
618	}
619
620
621	/*
622	** WEBPAGE: vdiff
623	** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN
624	**
625	** Show all differences between two checkins.
626	*/
627	void vdiff_page(void){
628	int ridFrom, ridTo;
	@@ -996,11 +996,11 @@
996	if( !g.okRead ){ login_needed(); return; }
997	if( rid==0 ) fossil_redirect_home();
998	if( g.okAdmin ){
999	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1000	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1001	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1002	g.zTop, zUuid);
1003	}else{
1004	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1005	g.zTop, zUuid);
1006	}
	@@ -1078,11 +1078,11 @@
1078	if( !g.okRead ){ login_needed(); return; }
1079	if( rid==0 ) fossil_redirect_home();
1080	if( g.okAdmin ){
1081	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1082	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1083	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1084	g.zTop, zUuid);
1085	}else{
1086	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1087	g.zTop, zUuid);
1088	}
	@@ -1102,20 +1102,20 @@
1102	style_submenu_element("Html", "Html",
1103	"%s/artifact?name=%s", g.zTop, zUuid);
1104	}else{
1105	renderAsHtml = 1;
1106	style_submenu_element("Text", "Text",
1107	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1108	}
1109	}else if( strcmp(zMime, "application/x-fossil-wiki")==0 ){
1110	if( P("txt") ){
1111	style_submenu_element("Wiki", "Wiki",
1112	"%s/artifact?name=%s", g.zTop, zUuid);
1113	}else{
1114	renderAsWiki = 1;
1115	style_submenu_element("Text", "Text",
1116	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1117	}
1118	}
1119	}
1120	@ </p></blockquote>
1121	@ <hr />
	@@ -1133,11 +1133,11 @@
1133	@ <pre>
1134	@ %h(blob_str(&content))
1135	@ </pre>
1136	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1137	}else if( strncmp(zMime, "image/", 6)==0 ){
1138	@ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img>
1139	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1140	}else{
1141	@ <pre>
1142	hexdump(&content);
1143	@ </pre>
	@@ -1166,11 +1166,11 @@
1166	rid = name_to_rid_www("name");
1167	if( rid==0 ){ fossil_redirect_home(); }
1168	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1169	if( g.okAdmin ){
1170	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1171	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1172	g.zTop, zUuid);
1173	}else{
1174	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1175	g.zTop, zUuid);
1176	}
	@@ -1444,11 +1444,11 @@
1444	int nTag = 0;
1445	@ <b>Preview:</b>
1446	@ <blockquote>
1447	@ <table border=0>
1448	if( zNewColor && zNewColor[0] ){
1449	@ <tr><td bgcolor="%h(zNewColor)">
1450	}else{
1451	@ <tr><td>
1452	}
1453	wiki_convert(&comment, 0, WIKI_INLINE);
1454	blob_zero(&suffix);
	@@ -1507,11 +1507,11 @@
1507	}
1508	@ Propagate color to descendants</input></td></tr>
1509	@ <tr>
1510	for(i=0; i<nColor; i++){
1511	if( aColor[i].zColor[0] ){
1512	@ <td bgcolor="%h(aColor[i].zColor)">
1513	}else{
1514	@ <td>
1515	}
1516	if( strcmp(zNewColor, aColor[i].zColor)==0 ){
1517	@ <input type="radio" name="clr" value="%h(aColor[i].zColor)" checked>
1518

	--- src/info.c
	+++ src/info.c
	@@ -618,11 +618,11 @@
618	}
619
620
621	/*
622	** WEBPAGE: vdiff
623	** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN
624	**
625	** Show all differences between two checkins.
626	*/
627	void vdiff_page(void){
628	int ridFrom, ridTo;
	@@ -996,11 +996,11 @@
996	if( !g.okRead ){ login_needed(); return; }
997	if( rid==0 ) fossil_redirect_home();
998	if( g.okAdmin ){
999	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1000	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1001	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1002	g.zTop, zUuid);
1003	}else{
1004	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1005	g.zTop, zUuid);
1006	}
	@@ -1078,11 +1078,11 @@
1078	if( !g.okRead ){ login_needed(); return; }
1079	if( rid==0 ) fossil_redirect_home();
1080	if( g.okAdmin ){
1081	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1082	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1083	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1084	g.zTop, zUuid);
1085	}else{
1086	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1087	g.zTop, zUuid);
1088	}
	@@ -1102,20 +1102,20 @@
1102	style_submenu_element("Html", "Html",
1103	"%s/artifact?name=%s", g.zTop, zUuid);
1104	}else{
1105	renderAsHtml = 1;
1106	style_submenu_element("Text", "Text",
1107	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1108	}
1109	}else if( strcmp(zMime, "application/x-fossil-wiki")==0 ){
1110	if( P("txt") ){
1111	style_submenu_element("Wiki", "Wiki",
1112	"%s/artifact?name=%s", g.zTop, zUuid);
1113	}else{
1114	renderAsWiki = 1;
1115	style_submenu_element("Text", "Text",
1116	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1117	}
1118	}
1119	}
1120	@ </p></blockquote>
1121	@ <hr />
	@@ -1133,11 +1133,11 @@
1133	@ <pre>
1134	@ %h(blob_str(&content))
1135	@ </pre>
1136	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1137	}else if( strncmp(zMime, "image/", 6)==0 ){
1138	@ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img>
1139	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1140	}else{
1141	@ <pre>
1142	hexdump(&content);
1143	@ </pre>
	@@ -1166,11 +1166,11 @@
1166	rid = name_to_rid_www("name");
1167	if( rid==0 ){ fossil_redirect_home(); }
1168	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1169	if( g.okAdmin ){
1170	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1171	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1172	g.zTop, zUuid);
1173	}else{
1174	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1175	g.zTop, zUuid);
1176	}
	@@ -1444,11 +1444,11 @@
1444	int nTag = 0;
1445	@ <b>Preview:</b>
1446	@ <blockquote>
1447	@ <table border=0>
1448	if( zNewColor && zNewColor[0] ){
1449	@ <tr><td style="background-color: %h(zNewColor);">
1450	}else{
1451	@ <tr><td>
1452	}
1453	wiki_convert(&comment, 0, WIKI_INLINE);
1454	blob_zero(&suffix);
	@@ -1507,11 +1507,11 @@
1507	}
1508	@ Propagate color to descendants</input></td></tr>
1509	@ <tr>
1510	for(i=0; i<nColor; i++){
1511	if( aColor[i].zColor[0] ){
1512	@ <td style="background-color: %h(aColor[i].zColor);">
1513	}else{
1514	@ <td>
1515	}
1516	if( strcmp(zNewColor, aColor[i].zColor)==0 ){
1517	@ <input type="radio" name="clr" value="%h(aColor[i].zColor)" checked>
1518

M src/report.c

+5 -5

		--- src/report.c
		+++ src/report.c
		@@ -393,11 +393,11 @@
393	393	}
394	394	}
395	395	if( zOwner==0 ) zOwner = g.zLogin;
396	396	style_submenu_element("Cancel", "Cancel", "reportlist");
397	397	if( rn>0 ){
398		- style_submenu_element("Delete", "Delete", "rptedit?rn=%d&del1=1", rn);
	398	+ style_submenu_element("Delete", "Delete", "rptedit?rn=%d&del1=1", rn);
399	399	}
400	400	style_header(rn>0 ? "Edit Report Format":"Create New Report Format");
401	401	if( zErr ){
402	402	@ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403	403	}
		@@ -829,14 +829,14 @@
829	829	while( isspace(*zSafeKey) ) zSafeKey++;
830	830	for(i=0; zSafeKey[i] && !isspace(zSafeKey[i]); i++){}
831	831	for(j=i; isspace(zSafeKey[j]); j++){}
832	832	for(k=j; zSafeKey[k] && zSafeKey[k]!='\n' && zSafeKey[k]!='\r'; k++){}
833	833	if( !horiz ){
834		- cgi_printf("<tr bgcolor=\"%.s\"><td>%.s</td></tr>\n",
	834	+ cgi_printf("<tr style=\"background-color: %.s;\"><td>%.s</td></tr>\n",
835	835	i, zSafeKey, k-j, &zSafeKey[j]);
836	836	}else{
837		- cgi_printf("<td bgcolor=\"%.s\">%.s</td>\n",
	837	+ cgi_printf("<td style=\"background-color: %.s;\">%.s</td>\n",
838	838	i, zSafeKey, k-j, &zSafeKey[j]);
839	839	}
840	840	zSafeKey += k;
841	841	}
842	842	free(zToFree);
		@@ -921,12 +921,12 @@
921	921	style_submenu_element("New Ticket", "Create a new ticket",
922	922	"%s/tktnew", g.zTop);
923	923	}
924	924	style_header(zTitle);
925	925	output_color_key(zClrKey, 1,
926		- "border=0 cellpadding=3 cellspacing=0 class=\"report\"");
927		- @ <table border=1 cellpadding=2 cellspacing=0 class="report">
	926	+ "border=\"0\" cellpadding=\"3\" cellspacing=\"0\" class=\"report\"");
	927	+ @ <table border="1" cellpadding="2" cellspacing="0" class="report">
928	928	sState.rn = rn;
929	929	sState.nCount = 0;
930	930	sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
931	931	sqlite3_exec(g.db, zSql, generate_html, &sState, &zErr2);
932	932	sqlite3_set_authorizer(g.db, 0, 0);
933	933

	--- src/report.c
	+++ src/report.c
	@@ -393,11 +393,11 @@
393	}
394	}
395	if( zOwner==0 ) zOwner = g.zLogin;
396	style_submenu_element("Cancel", "Cancel", "reportlist");
397	if( rn>0 ){
398	style_submenu_element("Delete", "Delete", "rptedit?rn=%d&del1=1", rn);
399	}
400	style_header(rn>0 ? "Edit Report Format":"Create New Report Format");
401	if( zErr ){
402	@ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403	}
	@@ -829,14 +829,14 @@
829	while( isspace(*zSafeKey) ) zSafeKey++;
830	for(i=0; zSafeKey[i] && !isspace(zSafeKey[i]); i++){}
831	for(j=i; isspace(zSafeKey[j]); j++){}
832	for(k=j; zSafeKey[k] && zSafeKey[k]!='\n' && zSafeKey[k]!='\r'; k++){}
833	if( !horiz ){
834	cgi_printf("<tr bgcolor=\"%.s\"><td>%.s</td></tr>\n",
835	i, zSafeKey, k-j, &zSafeKey[j]);
836	}else{
837	cgi_printf("<td bgcolor=\"%.s\">%.s</td>\n",
838	i, zSafeKey, k-j, &zSafeKey[j]);
839	}
840	zSafeKey += k;
841	}
842	free(zToFree);
	@@ -921,12 +921,12 @@
921	style_submenu_element("New Ticket", "Create a new ticket",
922	"%s/tktnew", g.zTop);
923	}
924	style_header(zTitle);
925	output_color_key(zClrKey, 1,
926	"border=0 cellpadding=3 cellspacing=0 class=\"report\"");
927	@ <table border=1 cellpadding=2 cellspacing=0 class="report">
928	sState.rn = rn;
929	sState.nCount = 0;
930	sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
931	sqlite3_exec(g.db, zSql, generate_html, &sState, &zErr2);
932	sqlite3_set_authorizer(g.db, 0, 0);
933

	--- src/report.c
	+++ src/report.c
	@@ -393,11 +393,11 @@
393	}
394	}
395	if( zOwner==0 ) zOwner = g.zLogin;
396	style_submenu_element("Cancel", "Cancel", "reportlist");
397	if( rn>0 ){
398	style_submenu_element("Delete", "Delete", "rptedit?rn=%d&del1=1", rn);
399	}
400	style_header(rn>0 ? "Edit Report Format":"Create New Report Format");
401	if( zErr ){
402	@ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403	}
	@@ -829,14 +829,14 @@
829	while( isspace(*zSafeKey) ) zSafeKey++;
830	for(i=0; zSafeKey[i] && !isspace(zSafeKey[i]); i++){}
831	for(j=i; isspace(zSafeKey[j]); j++){}
832	for(k=j; zSafeKey[k] && zSafeKey[k]!='\n' && zSafeKey[k]!='\r'; k++){}
833	if( !horiz ){
834	cgi_printf("<tr style=\"background-color: %.s;\"><td>%.s</td></tr>\n",
835	i, zSafeKey, k-j, &zSafeKey[j]);
836	}else{
837	cgi_printf("<td style=\"background-color: %.s;\">%.s</td>\n",
838	i, zSafeKey, k-j, &zSafeKey[j]);
839	}
840	zSafeKey += k;
841	}
842	free(zToFree);
	@@ -921,12 +921,12 @@
921	style_submenu_element("New Ticket", "Create a new ticket",
922	"%s/tktnew", g.zTop);
923	}
924	style_header(zTitle);
925	output_color_key(zClrKey, 1,
926	"border=\"0\" cellpadding=\"3\" cellspacing=\"0\" class=\"report\"");
927	@ <table border="1" cellpadding="2" cellspacing="0" class="report">
928	sState.rn = rn;
929	sState.nCount = 0;
930	sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
931	sqlite3_exec(g.db, zSql, generate_html, &sState, &zErr2);
932	sqlite3_set_authorizer(g.db, 0, 0);
933

M src/timeline.c

+1 -1

		--- src/timeline.c
		+++ src/timeline.c
		@@ -83,11 +83,11 @@
83	83	void hyperlink_to_diff(const char zV1, const char zV2){
84	84	if( g.okHistory ){
85	85	if( zV2==0 ){
86	86	@ <a href="%s(g.zBaseURL)/diff?v2=%s(zV1)">[diff]</a>
87	87	}else{
88		- @ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a>
	88	+ @ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a>
89	89	}
90	90	}
91	91	}
92	92
93	93	/*
94	94

	--- src/timeline.c
	+++ src/timeline.c
	@@ -83,11 +83,11 @@
83	void hyperlink_to_diff(const char zV1, const char zV2){
84	if( g.okHistory ){
85	if( zV2==0 ){
86	@ <a href="%s(g.zBaseURL)/diff?v2=%s(zV1)">[diff]</a>
87	}else{
88	@ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a>
89	}
90	}
91	}
92
93	/*
94

	--- src/timeline.c
	+++ src/timeline.c
	@@ -83,11 +83,11 @@
83	void hyperlink_to_diff(const char zV1, const char zV2){
84	if( g.okHistory ){
85	if( zV2==0 ){
86	@ <a href="%s(g.zBaseURL)/diff?v2=%s(zV1)">[diff]</a>
87	}else{
88	@ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a>
89	}
90	}
91	}
92
93	/*
94

M src/tkt.c

+3 -3

		--- src/tkt.c
		+++ src/tkt.c
		@@ -313,11 +313,11 @@
313	313	style_submenu_element("New Ticket", "Create a new ticket",
314	314	"%s/tktnew", g.zTop);
315	315	}
316	316	if( g.okApndTkt && g.okAttach ){
317	317	style_submenu_element("Attach", "Add An Attachment",
318		- "%s/attachadd?tkt=%T&from=%s/tktview/%t",
	318	+ "%s/attachadd?tkt=%T&from=%s/tktview/%t",
319	319	g.zTop, zUuid, g.zTop, zUuid);
320	320	}
321	321	style_header("View Ticket");
322	322	if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br />\n", -1);
323	323	ticket_init();
		@@ -347,19 +347,19 @@
347	347	@ <hr /><h2>Attachments:</h2>
348	348	@ <ul>
349	349	}
350	350	cnt++;
351	351	if( g.okRead && g.okHistory ){
352		- @ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
	352	+ @ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
353	353	@ %h(zFile)</a>
354	354	}else{
355	355	@ %h(zFile)
356	356	}
357	357	@ added by %h(zUser) on
358	358	hyperlink_to_date(zDate, ".");
359	359	if( g.okWrTkt && g.okAttach ){
360		- @ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>]
	360	+ @ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>]
361	361	}
362	362	}
363	363	if( cnt ){
364	364	@ </ul>
365	365	}
366	366

	--- src/tkt.c
	+++ src/tkt.c
	@@ -313,11 +313,11 @@
313	style_submenu_element("New Ticket", "Create a new ticket",
314	"%s/tktnew", g.zTop);
315	}
316	if( g.okApndTkt && g.okAttach ){
317	style_submenu_element("Attach", "Add An Attachment",
318	"%s/attachadd?tkt=%T&from=%s/tktview/%t",
319	g.zTop, zUuid, g.zTop, zUuid);
320	}
321	style_header("View Ticket");
322	if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br />\n", -1);
323	ticket_init();
	@@ -347,19 +347,19 @@
347	@ <hr /><h2>Attachments:</h2>
348	@ <ul>
349	}
350	cnt++;
351	if( g.okRead && g.okHistory ){
352	@ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
353	@ %h(zFile)</a>
354	}else{
355	@ %h(zFile)
356	}
357	@ added by %h(zUser) on
358	hyperlink_to_date(zDate, ".");
359	if( g.okWrTkt && g.okAttach ){
360	@ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>]
361	}
362	}
363	if( cnt ){
364	@ </ul>
365	}
366

	--- src/tkt.c
	+++ src/tkt.c
	@@ -313,11 +313,11 @@
313	style_submenu_element("New Ticket", "Create a new ticket",
314	"%s/tktnew", g.zTop);
315	}
316	if( g.okApndTkt && g.okAttach ){
317	style_submenu_element("Attach", "Add An Attachment",
318	"%s/attachadd?tkt=%T&from=%s/tktview/%t",
319	g.zTop, zUuid, g.zTop, zUuid);
320	}
321	style_header("View Ticket");
322	if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br />\n", -1);
323	ticket_init();
	@@ -347,19 +347,19 @@
347	@ <hr /><h2>Attachments:</h2>
348	@ <ul>
349	}
350	cnt++;
351	if( g.okRead && g.okHistory ){
352	@ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
353	@ %h(zFile)</a>
354	}else{
355	@ %h(zFile)
356	}
357	@ added by %h(zUser) on
358	hyperlink_to_date(zDate, ".");
359	if( g.okWrTkt && g.okAttach ){
360	@ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>]
361	}
362	}
363	if( cnt ){
364	@ </ul>
365	}
366

M src/tktsetup.c

+1 -1

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -353,11 +353,11 @@
353	353	);
354	354	}
355	355
356	356	static const char zDefaultView[] =
357	357	@ <table cellpadding="5">
358		-@ <tr><td align="right">Ticket UUID:</td><td bgcolor="#d0d0d0" colspan="3">
	358	+@ <tr><td align="right">Ticket UUID:</td><td style="background-color: #d0d0d0;" colspan="3">
359	359	@ $<tkt_uuid>
360	360	@ </td></tr>
361	361	@ <tr><td align="right">Title:</td>
362	362	@ <td bgcolor="#d0d0d0" colspan="3" valign="top">
363	363	@ <th1>wiki $title</th1>
364	364

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -353,11 +353,11 @@
353	);
354	}
355
356	static const char zDefaultView[] =
357	@ <table cellpadding="5">
358	@ <tr><td align="right">Ticket UUID:</td><td bgcolor="#d0d0d0" colspan="3">
359	@ $<tkt_uuid>
360	@ </td></tr>
361	@ <tr><td align="right">Title:</td>
362	@ <td bgcolor="#d0d0d0" colspan="3" valign="top">
363	@ <th1>wiki $title</th1>
364

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -353,11 +353,11 @@
353	);
354	}
355
356	static const char zDefaultView[] =
357	@ <table cellpadding="5">
358	@ <tr><td align="right">Ticket UUID:</td><td style="background-color: #d0d0d0;" colspan="3">
359	@ $<tkt_uuid>
360	@ </td></tr>
361	@ <tr><td align="right">Title:</td>
362	@ <td bgcolor="#d0d0d0" colspan="3" valign="top">
363	@ <th1>wiki $title</th1>
364

M src/wiki.c

+4 -4

		--- src/wiki.c
		+++ src/wiki.c
		@@ -194,11 +194,11 @@
194	194	style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
195	195	g.zTop, zPageName);
196	196	}
197	197	if( rid && g.okApndWiki && g.okAttach ){
198	198	style_submenu_element("Attach", "Add An Attachment",
199		- "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
	199	+ "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
200	200	g.zTop, zPageName, g.zTop, zPageName);
201	201	}
202	202	if( rid && g.okApndWiki ){
203	203	style_submenu_element("Append", "Add A Comment", "%s/wikiappend?name=%T",
204	204	g.zTop, zPageName);
		@@ -227,19 +227,19 @@
227	227	@ <hr><h2>Attachments:</h2>
228	228	@ <ul>
229	229	}
230	230	cnt++;
231	231	if( g.okHistory && g.okRead ){
232		- @ <li><a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)">
	232	+ @ <li><a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)">
233	233	@ %h(zFile)</a>
234	234	}else{
235	235	@ <li>%h(zFile)
236	236	}
237	237	@ added by %h(zUser) on
238	238	hyperlink_to_date(zDate, ".");
239	239	if( g.okWrWiki && g.okAttach ){
240		- @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>]
	240	+ @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>]
241	241	}
242	242	}
243	243	if( cnt ){
244	244	@ </ul>
245	245	}
		@@ -560,11 +560,11 @@
560	560	** Function called to output extra text at the end of each line in
561	561	** a wiki history listing.
562	562	*/
563	563	static void wiki_history_extra(int rid){
564	564	if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){
565		- @ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a>
	565	+ @ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a>
566	566	}
567	567	}
568	568
569	569	/*
570	570	** WEBPAGE: whistory
571	571

	--- src/wiki.c
	+++ src/wiki.c
	@@ -194,11 +194,11 @@
194	style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
195	g.zTop, zPageName);
196	}
197	if( rid && g.okApndWiki && g.okAttach ){
198	style_submenu_element("Attach", "Add An Attachment",
199	"%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
200	g.zTop, zPageName, g.zTop, zPageName);
201	}
202	if( rid && g.okApndWiki ){
203	style_submenu_element("Append", "Add A Comment", "%s/wikiappend?name=%T",
204	g.zTop, zPageName);
	@@ -227,19 +227,19 @@
227	@ <hr><h2>Attachments:</h2>
228	@ <ul>
229	}
230	cnt++;
231	if( g.okHistory && g.okRead ){
232	@ <li><a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)">
233	@ %h(zFile)</a>
234	}else{
235	@ <li>%h(zFile)
236	}
237	@ added by %h(zUser) on
238	hyperlink_to_date(zDate, ".");
239	if( g.okWrWiki && g.okAttach ){
240	@ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>]
241	}
242	}
243	if( cnt ){
244	@ </ul>
245	}
	@@ -560,11 +560,11 @@
560	** Function called to output extra text at the end of each line in
561	** a wiki history listing.
562	*/
563	static void wiki_history_extra(int rid){
564	if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){
565	@ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a>
566	}
567	}
568
569	/*
570	** WEBPAGE: whistory
571

	--- src/wiki.c
	+++ src/wiki.c
	@@ -194,11 +194,11 @@
194	style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
195	g.zTop, zPageName);
196	}
197	if( rid && g.okApndWiki && g.okAttach ){
198	style_submenu_element("Attach", "Add An Attachment",
199	"%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
200	g.zTop, zPageName, g.zTop, zPageName);
201	}
202	if( rid && g.okApndWiki ){
203	style_submenu_element("Append", "Add A Comment", "%s/wikiappend?name=%T",
204	g.zTop, zPageName);
	@@ -227,19 +227,19 @@
227	@ <hr><h2>Attachments:</h2>
228	@ <ul>
229	}
230	cnt++;
231	if( g.okHistory && g.okRead ){
232	@ <li><a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)">
233	@ %h(zFile)</a>
234	}else{
235	@ <li>%h(zFile)
236	}
237	@ added by %h(zUser) on
238	hyperlink_to_date(zDate, ".");
239	if( g.okWrWiki && g.okAttach ){
240	@ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>]
241	}
242	}
243	if( cnt ){
244	@ </ul>
245	}
	@@ -560,11 +560,11 @@
560	** Function called to output extra text at the end of each line in
561	** a wiki history listing.
562	*/
563	static void wiki_history_extra(int rid){
564	if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){
565	@ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a>
566	}
567	}
568
569	/*
570	** WEBPAGE: whistory
571

Fossil SCM

Keyboard Shortcuts