Fossil SCM

Honor the "y=h" query option on the /search page even if help-search is disabled, but otherwise do not advertise help-search when it is disabled.

drh 2025-02-26 19:44 trunk

Commit 2e9e3695ae6f837e668e8398c34c9eed6c02ee6e091317d1c6dd7a87f7108ccd

Parent 32f954a1f2bfa6a…

9 files changed +1 -1 +1 -1 +27 -18 +1 -1 +1 -1 +1 -1 +1 -1 +2 -2 +3 -3

~ src/dispatch.c ~ src/forum.c ~ src/search.c ~ src/setup.c ~ src/sitemap.c ~ src/th_main.c ~ src/timeline.c ~ src/tkt.c ~ src/wiki.c

M src/dispatch.c

+1 -1

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -832,11 +832,11 @@
832	832
833	833	style_set_current_feature("tkt");
834	834	style_header("Help: %s", zCmd);
835	835
836	836	style_submenu_element("Command-List", "%R/help");
837		- if( search_restrict(SRCH_HELP,0)!=0 ){
	837	+ if( search_restrict(SRCH_HELP)!=0 ){
838	838	style_submenu_element("Search","%R/search?y=h");
839	839	}
840	840	rc = dispatch_name_search(zCmd, CMDFLAG_ANY\|CMDFLAG_PREFIX, &pCmd);
841	841	if( *zCmd=='/' ){
842	842	/* Some of the webpages require query parameters in order to work.
843	843

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -832,11 +832,11 @@
832
833	style_set_current_feature("tkt");
834	style_header("Help: %s", zCmd);
835
836	style_submenu_element("Command-List", "%R/help");
837	if( search_restrict(SRCH_HELP,0)!=0 ){
838	style_submenu_element("Search","%R/search?y=h");
839	}
840	rc = dispatch_name_search(zCmd, CMDFLAG_ANY\|CMDFLAG_PREFIX, &pCmd);
841	if( *zCmd=='/' ){
842	/* Some of the webpages require query parameters in order to work.
843

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -832,11 +832,11 @@
832
833	style_set_current_feature("tkt");
834	style_header("Help: %s", zCmd);
835
836	style_submenu_element("Command-List", "%R/help");
837	if( search_restrict(SRCH_HELP)!=0 ){
838	style_submenu_element("Search","%R/search?y=h");
839	}
840	rc = dispatch_name_search(zCmd, CMDFLAG_ANY\|CMDFLAG_PREFIX, &pCmd);
841	if( *zCmd=='/' ){
842	/* Some of the webpages require query parameters in order to work.
843

M src/forum.c

+1 -1

		--- src/forum.c
		+++ src/forum.c
		@@ -1927,11 +1927,11 @@
1927	1927	int srchFlags;
1928	1928	const int isSearch = P("s")!=0;
1929	1929	char const *zLimit = 0;
1930	1930
1931	1931	login_check_credentials();
1932		- srchFlags = search_restrict(SRCH_FORUM,0);
	1932	+ srchFlags = search_restrict(SRCH_FORUM);
1933	1933	if( !g.perm.RdForum ){
1934	1934	login_needed(g.anon.RdForum);
1935	1935	return;
1936	1936	}
1937	1937	cgi_check_for_malice();
1938	1938

	--- src/forum.c
	+++ src/forum.c
	@@ -1927,11 +1927,11 @@
1927	int srchFlags;
1928	const int isSearch = P("s")!=0;
1929	char const *zLimit = 0;
1930
1931	login_check_credentials();
1932	srchFlags = search_restrict(SRCH_FORUM,0);
1933	if( !g.perm.RdForum ){
1934	login_needed(g.anon.RdForum);
1935	return;
1936	}
1937	cgi_check_for_malice();
1938

	--- src/forum.c
	+++ src/forum.c
	@@ -1927,11 +1927,11 @@
1927	int srchFlags;
1928	const int isSearch = P("s")!=0;
1929	char const *zLimit = 0;
1930
1931	login_check_credentials();
1932	srchFlags = search_restrict(SRCH_FORUM);
1933	if( !g.perm.RdForum ){
1934	login_needed(g.anon.RdForum);
1935	return;
1936	}
1937	cgi_check_for_malice();
1938

M src/search.c

+27 -18

		--- src/search.c
		+++ src/search.c
		@@ -739,11 +739,11 @@
739	739
740	740	db_find_and_open_repository(0, 0);
741	741	verify_all_options();
742	742	if( g.argc<3 ) return;
743	743	login_set_capabilities("s", 0);
744		- if( search_restrict(srchFlags, 1)==0 ){
	744	+ if( search_restrict(srchFlags)==0 && (srchFlags & SRCH_HELP)==0 ){
745	745	const char zC1 = 0, zPlural = "s";
746	746	if( srchFlags & SRCH_TECHNOTE ){ zC1 = "technote"; }
747	747	if( srchFlags & SRCH_TKT ){ zC1 = "ticket"; }
748	748	if( srchFlags & SRCH_FORUM ){ zC1 = "forum"; zPlural = ""; }
749	749	if( srchFlags & SRCH_DOC ){ zC1 = "document"; }
		@@ -861,11 +861,11 @@
861	861	** the revised search flags mask.
862	862	**
863	863	** If bFlex is true, that means allow through the SRCH_HELP option
864	864	** even if it is not explicitly enabled.
865	865	*/
866		-unsigned int search_restrict(unsigned int srchFlags, int bFlex){
	866	+unsigned int search_restrict(unsigned int srchFlags){
867	867	static unsigned int knownGood = 0;
868	868	static unsigned int knownBad = 0;
869	869	static const struct { unsigned m; const char *zKey; } aSetng[] = {
870	870	{ SRCH_CKIN, "search-ci" },
871	871	{ SRCH_DOC, "search-doc" },
		@@ -888,11 +888,10 @@
888	888	knownGood \|= m;
889	889	}else{
890	890	knownBad \|= m;
891	891	}
892	892	}
893		- if( bFlex ) knownBad &= ~SRCH_HELP;
894	893	return srchFlags & ~knownBad;
895	894	}
896	895
897	896	/*
898	897	** When this routine is called, there already exists a table
		@@ -1296,11 +1295,11 @@
1296	1295	int nLimit = db_get_int("search-limit", 100);
1297	1296
1298	1297	if( P("searchlimit")!=0 ){
1299	1298	nLimit = atoi(P("searchlimit"));
1300	1299	}
1301		- srchFlags = search_restrict(srchFlags, 1);
	1300	+ srchFlags = search_restrict(srchFlags) \| (srchFlags & SRCH_HELP);
1302	1301	if( srchFlags==0 ) return 0;
1303	1302	search_sql_setup(g.db);
1304	1303	add_content_sql_commands(g.db);
1305	1304	db_multi_exec(
1306	1305	"CREATE TEMP TABLE x(label,url,score,id,date,snip);"
		@@ -1365,29 +1364,35 @@
1365	1364	**
1366	1365	** 0x02 Show nothing if search is disabled.
1367	1366	**
1368	1367	** Return true if there are search results.
1369	1368	*/
1370		-int search_screen(unsigned srchFlags, int mFlags){
	1369	+int search_screen(unsigned srchAllowed, int mFlags){
1371	1370	const char *zType = 0;
1372	1371	const char *zClass = 0;
1373	1372	const char *zDisable1;
1374	1373	const char *zDisable2;
1375	1374	const char *zPattern;
1376	1375	int fDebug = PB("debug");
1377	1376	int haveResult = 0;
1378		- srchFlags = search_restrict(srchFlags, 0);
1379		- switch( srchFlags ){
	1377	+ int srchThisTime;
	1378	+ const char *zY = PD("y","all");
	1379	+ if( zY[0]=='h' && zY[1]==0 ){
	1380	+ srchAllowed = search_restrict(srchAllowed) \| (srchAllowed & SRCH_HELP);
	1381	+ }else{
	1382	+ srchAllowed = search_restrict(srchAllowed);
	1383	+ }
	1384	+ switch( srchAllowed ){
1380	1385	case SRCH_CKIN: zType = " Check-ins"; zClass = "Ckin"; break;
1381	1386	case SRCH_DOC: zType = " Docs"; zClass = "Doc"; break;
1382	1387	case SRCH_TKT: zType = " Tickets"; zClass = "Tkt"; break;
1383	1388	case SRCH_WIKI: zType = " Wiki"; zClass = "Wiki"; break;
1384	1389	case SRCH_TECHNOTE: zType = " Tech Notes"; zClass = "Note"; break;
1385	1390	case SRCH_FORUM: zType = " Forum"; zClass = "Frm"; break;
1386	1391	case SRCH_HELP: zType = " Help"; zClass = "Hlp"; break;
1387	1392	}
1388		- if( srchFlags==0 ){
	1393	+ if( srchAllowed==0 ){
1389	1394	if( mFlags & 0x02 ) return 0;
1390	1395	zDisable1 = " disabled";
1391	1396	zDisable2 = " disabled";
1392	1397	zPattern = "";
1393	1398	}else{
		@@ -1400,42 +1405,46 @@
1400	1405	@ <div class='searchForm searchForm%s(zClass)'>
1401	1406	}else{
1402	1407	@ <div class='searchForm'>
1403	1408	}
1404	1409	@ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)>
1405		- if( (mFlags & 0x01)!=0 && (srchFlags & (srchFlags-1))!=0 ){
1406		- static const struct { const char z; const char zNm; unsigned m; } aY[] = {
	1410	+ srchThisTime = srchAllowed;
	1411	+ if( (mFlags & 0x01)!=0 && (srchAllowed & (srchAllowed-1))!=0 ){
	1412	+ static const struct {
	1413	+ const char *z;
	1414	+ const char *zNm;
	1415	+ unsigned m;
	1416	+ } aY[] = {
1407	1417	{ "all", "All", SRCH_ALL },
1408	1418	{ "c", "Check-ins", SRCH_CKIN },
1409	1419	{ "d", "Docs", SRCH_DOC },
1410	1420	{ "t", "Tickets", SRCH_TKT },
1411	1421	{ "w", "Wiki", SRCH_WIKI },
1412	1422	{ "e", "Tech Notes", SRCH_TECHNOTE },
1413	1423	{ "f", "Forum", SRCH_FORUM },
1414	1424	{ "h", "Help", SRCH_HELP },
1415	1425	};
1416		- const char *zY = PD("y","all");
1417		- unsigned newFlags = srchFlags;
1418	1426	int i;
1419	1427	@ <select size='1' name='y'>
1420	1428	for(i=0; i<count(aY); i++){
1421		- if( (aY[i].m & srchFlags)==0 ) continue;
	1429	+ if( (aY[i].m & srchAllowed)==0 ) continue;
	1430	+ if( aY[i].m==SRCH_HELP && fossil_strcmp(zY,"h")!=0
	1431	+ && search_restrict(SRCH_HELP)==0 ) continue;
1422	1432	cgi_printf("<option value='%s'", aY[i].z);
1423	1433	if( fossil_strcmp(zY,aY[i].z)==0 ){
1424		- newFlags &= aY[i].m;
	1434	+ srchThisTime &= aY[i].m;
1425	1435	cgi_printf(" selected");
1426	1436	}
1427	1437	cgi_printf(">%s</option>\n", aY[i].zNm);
1428	1438	}
1429	1439	@ </select>
1430		- srchFlags = newFlags;
1431	1440	}
1432	1441	if( fDebug ){
1433	1442	@ <input type="hidden" name="debug" value="1">
1434	1443	}
1435	1444	@ <input type="submit" value="Search%s(zType)"%s(zDisable2)>
1436		- if( srchFlags==0 ){
	1445	+ if( srchAllowed==0 && srchThisTime==0 ){
1437	1446	@ <p class="generalError">Search is disabled</p>
1438	1447	}
1439	1448	@ </div></form>
1440	1449	while( fossil_isspace(zPattern[0]) ) zPattern++;
1441	1450	if( zPattern[0] ){
		@@ -1442,11 +1451,11 @@
1442	1451	if( zClass ){
1443	1452	@ <div class='searchResult searchResult%s(zClass)'>
1444	1453	}else{
1445	1454	@ <div class='searchResult'>
1446	1455	}
1447		- if( search_run_and_output(zPattern, srchFlags, fDebug)==0 ){
	1456	+ if( search_run_and_output(zPattern, srchThisTime, fDebug)==0 ){
1448	1457	@ <p class='searchEmpty'>No matches for: <span>%h(zPattern)</span></p>
1449	1458	}
1450	1459	@ </div>
1451	1460	haveResult = 1;
1452	1461	}
		@@ -2245,11 +2254,11 @@
2245	2254	void search_rebuild_index(void){
2246	2255	fossil_print("rebuilding the search index...");
2247	2256	fflush(stdout);
2248	2257	search_create_index();
2249	2258	search_fill_index();
2250		- search_update_index(search_restrict(SRCH_ALL, 0));
	2259	+ search_update_index(search_restrict(SRCH_ALL));
2251	2260	if( db_table_exists("repository","chat") ){
2252	2261	chat_rebuild_index(1);
2253	2262	}
2254	2263	fossil_print(" done\n");
2255	2264	}
2256	2265

	--- src/search.c
	+++ src/search.c
	@@ -739,11 +739,11 @@
739
740	db_find_and_open_repository(0, 0);
741	verify_all_options();
742	if( g.argc<3 ) return;
743	login_set_capabilities("s", 0);
744	if( search_restrict(srchFlags, 1)==0 ){
745	const char zC1 = 0, zPlural = "s";
746	if( srchFlags & SRCH_TECHNOTE ){ zC1 = "technote"; }
747	if( srchFlags & SRCH_TKT ){ zC1 = "ticket"; }
748	if( srchFlags & SRCH_FORUM ){ zC1 = "forum"; zPlural = ""; }
749	if( srchFlags & SRCH_DOC ){ zC1 = "document"; }
	@@ -861,11 +861,11 @@
861	** the revised search flags mask.
862	**
863	** If bFlex is true, that means allow through the SRCH_HELP option
864	** even if it is not explicitly enabled.
865	*/
866	unsigned int search_restrict(unsigned int srchFlags, int bFlex){
867	static unsigned int knownGood = 0;
868	static unsigned int knownBad = 0;
869	static const struct { unsigned m; const char *zKey; } aSetng[] = {
870	{ SRCH_CKIN, "search-ci" },
871	{ SRCH_DOC, "search-doc" },
	@@ -888,11 +888,10 @@
888	knownGood \|= m;
889	}else{
890	knownBad \|= m;
891	}
892	}
893	if( bFlex ) knownBad &= ~SRCH_HELP;
894	return srchFlags & ~knownBad;
895	}
896
897	/*
898	** When this routine is called, there already exists a table
	@@ -1296,11 +1295,11 @@
1296	int nLimit = db_get_int("search-limit", 100);
1297
1298	if( P("searchlimit")!=0 ){
1299	nLimit = atoi(P("searchlimit"));
1300	}
1301	srchFlags = search_restrict(srchFlags, 1);
1302	if( srchFlags==0 ) return 0;
1303	search_sql_setup(g.db);
1304	add_content_sql_commands(g.db);
1305	db_multi_exec(
1306	"CREATE TEMP TABLE x(label,url,score,id,date,snip);"
	@@ -1365,29 +1364,35 @@
1365	**
1366	** 0x02 Show nothing if search is disabled.
1367	**
1368	** Return true if there are search results.
1369	*/
1370	int search_screen(unsigned srchFlags, int mFlags){
1371	const char *zType = 0;
1372	const char *zClass = 0;
1373	const char *zDisable1;
1374	const char *zDisable2;
1375	const char *zPattern;
1376	int fDebug = PB("debug");
1377	int haveResult = 0;
1378	srchFlags = search_restrict(srchFlags, 0);
1379	switch( srchFlags ){






1380	case SRCH_CKIN: zType = " Check-ins"; zClass = "Ckin"; break;
1381	case SRCH_DOC: zType = " Docs"; zClass = "Doc"; break;
1382	case SRCH_TKT: zType = " Tickets"; zClass = "Tkt"; break;
1383	case SRCH_WIKI: zType = " Wiki"; zClass = "Wiki"; break;
1384	case SRCH_TECHNOTE: zType = " Tech Notes"; zClass = "Note"; break;
1385	case SRCH_FORUM: zType = " Forum"; zClass = "Frm"; break;
1386	case SRCH_HELP: zType = " Help"; zClass = "Hlp"; break;
1387	}
1388	if( srchFlags==0 ){
1389	if( mFlags & 0x02 ) return 0;
1390	zDisable1 = " disabled";
1391	zDisable2 = " disabled";
1392	zPattern = "";
1393	}else{
	@@ -1400,42 +1405,46 @@
1400	@ <div class='searchForm searchForm%s(zClass)'>
1401	}else{
1402	@ <div class='searchForm'>
1403	}
1404	@ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)>
1405	if( (mFlags & 0x01)!=0 && (srchFlags & (srchFlags-1))!=0 ){
1406	static const struct { const char z; const char zNm; unsigned m; } aY[] = {





1407	{ "all", "All", SRCH_ALL },
1408	{ "c", "Check-ins", SRCH_CKIN },
1409	{ "d", "Docs", SRCH_DOC },
1410	{ "t", "Tickets", SRCH_TKT },
1411	{ "w", "Wiki", SRCH_WIKI },
1412	{ "e", "Tech Notes", SRCH_TECHNOTE },
1413	{ "f", "Forum", SRCH_FORUM },
1414	{ "h", "Help", SRCH_HELP },
1415	};
1416	const char *zY = PD("y","all");
1417	unsigned newFlags = srchFlags;
1418	int i;
1419	@ <select size='1' name='y'>
1420	for(i=0; i<count(aY); i++){
1421	if( (aY[i].m & srchFlags)==0 ) continue;


1422	cgi_printf("<option value='%s'", aY[i].z);
1423	if( fossil_strcmp(zY,aY[i].z)==0 ){
1424	newFlags &= aY[i].m;
1425	cgi_printf(" selected");
1426	}
1427	cgi_printf(">%s</option>\n", aY[i].zNm);
1428	}
1429	@ </select>
1430	srchFlags = newFlags;
1431	}
1432	if( fDebug ){
1433	@ <input type="hidden" name="debug" value="1">
1434	}
1435	@ <input type="submit" value="Search%s(zType)"%s(zDisable2)>
1436	if( srchFlags==0 ){
1437	@ <p class="generalError">Search is disabled</p>
1438	}
1439	@ </div></form>
1440	while( fossil_isspace(zPattern[0]) ) zPattern++;
1441	if( zPattern[0] ){
	@@ -1442,11 +1451,11 @@
1442	if( zClass ){
1443	@ <div class='searchResult searchResult%s(zClass)'>
1444	}else{
1445	@ <div class='searchResult'>
1446	}
1447	if( search_run_and_output(zPattern, srchFlags, fDebug)==0 ){
1448	@ <p class='searchEmpty'>No matches for: <span>%h(zPattern)</span></p>
1449	}
1450	@ </div>
1451	haveResult = 1;
1452	}
	@@ -2245,11 +2254,11 @@
2245	void search_rebuild_index(void){
2246	fossil_print("rebuilding the search index...");
2247	fflush(stdout);
2248	search_create_index();
2249	search_fill_index();
2250	search_update_index(search_restrict(SRCH_ALL, 0));
2251	if( db_table_exists("repository","chat") ){
2252	chat_rebuild_index(1);
2253	}
2254	fossil_print(" done\n");
2255	}
2256

	--- src/search.c
	+++ src/search.c
	@@ -739,11 +739,11 @@
739
740	db_find_and_open_repository(0, 0);
741	verify_all_options();
742	if( g.argc<3 ) return;
743	login_set_capabilities("s", 0);
744	if( search_restrict(srchFlags)==0 && (srchFlags & SRCH_HELP)==0 ){
745	const char zC1 = 0, zPlural = "s";
746	if( srchFlags & SRCH_TECHNOTE ){ zC1 = "technote"; }
747	if( srchFlags & SRCH_TKT ){ zC1 = "ticket"; }
748	if( srchFlags & SRCH_FORUM ){ zC1 = "forum"; zPlural = ""; }
749	if( srchFlags & SRCH_DOC ){ zC1 = "document"; }
	@@ -861,11 +861,11 @@
861	** the revised search flags mask.
862	**
863	** If bFlex is true, that means allow through the SRCH_HELP option
864	** even if it is not explicitly enabled.
865	*/
866	unsigned int search_restrict(unsigned int srchFlags){
867	static unsigned int knownGood = 0;
868	static unsigned int knownBad = 0;
869	static const struct { unsigned m; const char *zKey; } aSetng[] = {
870	{ SRCH_CKIN, "search-ci" },
871	{ SRCH_DOC, "search-doc" },
	@@ -888,11 +888,10 @@
888	knownGood \|= m;
889	}else{
890	knownBad \|= m;
891	}
892	}

893	return srchFlags & ~knownBad;
894	}
895
896	/*
897	** When this routine is called, there already exists a table
	@@ -1296,11 +1295,11 @@
1295	int nLimit = db_get_int("search-limit", 100);
1296
1297	if( P("searchlimit")!=0 ){
1298	nLimit = atoi(P("searchlimit"));
1299	}
1300	srchFlags = search_restrict(srchFlags) \| (srchFlags & SRCH_HELP);
1301	if( srchFlags==0 ) return 0;
1302	search_sql_setup(g.db);
1303	add_content_sql_commands(g.db);
1304	db_multi_exec(
1305	"CREATE TEMP TABLE x(label,url,score,id,date,snip);"
	@@ -1365,29 +1364,35 @@
1364	**
1365	** 0x02 Show nothing if search is disabled.
1366	**
1367	** Return true if there are search results.
1368	*/
1369	int search_screen(unsigned srchAllowed, int mFlags){
1370	const char *zType = 0;
1371	const char *zClass = 0;
1372	const char *zDisable1;
1373	const char *zDisable2;
1374	const char *zPattern;
1375	int fDebug = PB("debug");
1376	int haveResult = 0;
1377	int srchThisTime;
1378	const char *zY = PD("y","all");
1379	if( zY[0]=='h' && zY[1]==0 ){
1380	srchAllowed = search_restrict(srchAllowed) \| (srchAllowed & SRCH_HELP);
1381	}else{
1382	srchAllowed = search_restrict(srchAllowed);
1383	}
1384	switch( srchAllowed ){
1385	case SRCH_CKIN: zType = " Check-ins"; zClass = "Ckin"; break;
1386	case SRCH_DOC: zType = " Docs"; zClass = "Doc"; break;
1387	case SRCH_TKT: zType = " Tickets"; zClass = "Tkt"; break;
1388	case SRCH_WIKI: zType = " Wiki"; zClass = "Wiki"; break;
1389	case SRCH_TECHNOTE: zType = " Tech Notes"; zClass = "Note"; break;
1390	case SRCH_FORUM: zType = " Forum"; zClass = "Frm"; break;
1391	case SRCH_HELP: zType = " Help"; zClass = "Hlp"; break;
1392	}
1393	if( srchAllowed==0 ){
1394	if( mFlags & 0x02 ) return 0;
1395	zDisable1 = " disabled";
1396	zDisable2 = " disabled";
1397	zPattern = "";
1398	}else{
	@@ -1400,42 +1405,46 @@
1405	@ <div class='searchForm searchForm%s(zClass)'>
1406	}else{
1407	@ <div class='searchForm'>
1408	}
1409	@ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)>
1410	srchThisTime = srchAllowed;
1411	if( (mFlags & 0x01)!=0 && (srchAllowed & (srchAllowed-1))!=0 ){
1412	static const struct {
1413	const char *z;
1414	const char *zNm;
1415	unsigned m;
1416	} aY[] = {
1417	{ "all", "All", SRCH_ALL },
1418	{ "c", "Check-ins", SRCH_CKIN },
1419	{ "d", "Docs", SRCH_DOC },
1420	{ "t", "Tickets", SRCH_TKT },
1421	{ "w", "Wiki", SRCH_WIKI },
1422	{ "e", "Tech Notes", SRCH_TECHNOTE },
1423	{ "f", "Forum", SRCH_FORUM },
1424	{ "h", "Help", SRCH_HELP },
1425	};


1426	int i;
1427	@ <select size='1' name='y'>
1428	for(i=0; i<count(aY); i++){
1429	if( (aY[i].m & srchAllowed)==0 ) continue;
1430	if( aY[i].m==SRCH_HELP && fossil_strcmp(zY,"h")!=0
1431	&& search_restrict(SRCH_HELP)==0 ) continue;
1432	cgi_printf("<option value='%s'", aY[i].z);
1433	if( fossil_strcmp(zY,aY[i].z)==0 ){
1434	srchThisTime &= aY[i].m;
1435	cgi_printf(" selected");
1436	}
1437	cgi_printf(">%s</option>\n", aY[i].zNm);
1438	}
1439	@ </select>

1440	}
1441	if( fDebug ){
1442	@ <input type="hidden" name="debug" value="1">
1443	}
1444	@ <input type="submit" value="Search%s(zType)"%s(zDisable2)>
1445	if( srchAllowed==0 && srchThisTime==0 ){
1446	@ <p class="generalError">Search is disabled</p>
1447	}
1448	@ </div></form>
1449	while( fossil_isspace(zPattern[0]) ) zPattern++;
1450	if( zPattern[0] ){
	@@ -1442,11 +1451,11 @@
1451	if( zClass ){
1452	@ <div class='searchResult searchResult%s(zClass)'>
1453	}else{
1454	@ <div class='searchResult'>
1455	}
1456	if( search_run_and_output(zPattern, srchThisTime, fDebug)==0 ){
1457	@ <p class='searchEmpty'>No matches for: <span>%h(zPattern)</span></p>
1458	}
1459	@ </div>
1460	haveResult = 1;
1461	}
	@@ -2245,11 +2254,11 @@
2254	void search_rebuild_index(void){
2255	fossil_print("rebuilding the search index...");
2256	fflush(stdout);
2257	search_create_index();
2258	search_fill_index();
2259	search_update_index(search_restrict(SRCH_ALL));
2260	if( db_table_exists("repository","chat") ){
2261	chat_rebuild_index(1);
2262	}
2263	fossil_print(" done\n");
2264	}
2265

M src/setup.c

+1 -1

		--- src/setup.c
		+++ src/setup.c
		@@ -2265,11 +2265,11 @@
2265	2265	const char *zTokenizer = PD("ftstok","off");
2266	2266	search_set_tokenizer(zTokenizer);
2267	2267	search_drop_index();
2268	2268	search_create_index();
2269	2269	search_fill_index();
2270		- search_update_index(search_restrict(SRCH_ALL,0));
	2270	+ search_update_index(search_restrict(SRCH_ALL));
2271	2271	}
2272	2272	if( search_index_exists() ){
2273	2273	int pgsz = db_int64(0, "PRAGMA repository.page_size;");
2274	2274	i64 nTotal = db_int64(0, "PRAGMA repository.page_count;")*pgsz;
2275	2275	i64 nFts = db_int64(0, "SELECT count(*) FROM dbstat"
2276	2276

	--- src/setup.c
	+++ src/setup.c
	@@ -2265,11 +2265,11 @@
2265	const char *zTokenizer = PD("ftstok","off");
2266	search_set_tokenizer(zTokenizer);
2267	search_drop_index();
2268	search_create_index();
2269	search_fill_index();
2270	search_update_index(search_restrict(SRCH_ALL,0));
2271	}
2272	if( search_index_exists() ){
2273	int pgsz = db_int64(0, "PRAGMA repository.page_size;");
2274	i64 nTotal = db_int64(0, "PRAGMA repository.page_count;")*pgsz;
2275	i64 nFts = db_int64(0, "SELECT count(*) FROM dbstat"
2276

	--- src/setup.c
	+++ src/setup.c
	@@ -2265,11 +2265,11 @@
2265	const char *zTokenizer = PD("ftstok","off");
2266	search_set_tokenizer(zTokenizer);
2267	search_drop_index();
2268	search_create_index();
2269	search_fill_index();
2270	search_update_index(search_restrict(SRCH_ALL));
2271	}
2272	if( search_index_exists() ){
2273	int pgsz = db_int64(0, "PRAGMA repository.page_size;");
2274	i64 nTotal = db_int64(0, "PRAGMA repository.page_count;")*pgsz;
2275	i64 nFts = db_int64(0, "SELECT count(*) FROM dbstat"
2276

M src/sitemap.c

+1 -1

		--- src/sitemap.c
		+++ src/sitemap.c
		@@ -64,11 +64,11 @@
64	64	** then disable anti-robot defenses */
65	65	isPopup = 1;
66	66	g.perm.Hyperlink = 1;
67	67	g.jsHref = 0;
68	68	}
69		- srchFlags = search_restrict(SRCH_ALL,0);
	69	+ srchFlags = search_restrict(SRCH_ALL);
70	70	if( !isPopup ){
71	71	style_header("Site Map");
72	72	style_adunit_config(ADUNIT_RIGHT_OK);
73	73	}
74	74
75	75

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -64,11 +64,11 @@
64	** then disable anti-robot defenses */
65	isPopup = 1;
66	g.perm.Hyperlink = 1;
67	g.jsHref = 0;
68	}
69	srchFlags = search_restrict(SRCH_ALL,0);
70	if( !isPopup ){
71	style_header("Site Map");
72	style_adunit_config(ADUNIT_RIGHT_OK);
73	}
74
75

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -64,11 +64,11 @@
64	** then disable anti-robot defenses */
65	isPopup = 1;
66	g.perm.Hyperlink = 1;
67	g.jsHref = 0;
68	}
69	srchFlags = search_restrict(SRCH_ALL);
70	if( !isPopup ){
71	style_header("Site Map");
72	style_adunit_config(ADUNIT_RIGHT_OK);
73	}
74
75

M src/th_main.c

+1 -1

		--- src/th_main.c
		+++ src/th_main.c
		@@ -915,11 +915,11 @@
915	915	int argc,
916	916	const char **argv,
917	917	int *argl
918	918	){
919	919	int rc = 1, i, j;
920		- unsigned int searchCap = search_restrict(SRCH_ALL, 0);
	920	+ unsigned int searchCap = search_restrict(SRCH_ALL);
921	921	if( argc<2 ){
922	922	return Th_WrongNumArgs(interp, "hascap STRING ...");
923	923	}
924	924	for(i=1; i<argc && rc; i++){
925	925	int match = 0;
926	926

	--- src/th_main.c
	+++ src/th_main.c
	@@ -915,11 +915,11 @@
915	int argc,
916	const char **argv,
917	int *argl
918	){
919	int rc = 1, i, j;
920	unsigned int searchCap = search_restrict(SRCH_ALL, 0);
921	if( argc<2 ){
922	return Th_WrongNumArgs(interp, "hascap STRING ...");
923	}
924	for(i=1; i<argc && rc; i++){
925	int match = 0;
926

	--- src/th_main.c
	+++ src/th_main.c
	@@ -915,11 +915,11 @@
915	int argc,
916	const char **argv,
917	int *argl
918	){
919	int rc = 1, i, j;
920	unsigned int searchCap = search_restrict(SRCH_ALL);
921	if( argc<2 ){
922	return Th_WrongNumArgs(interp, "hascap STRING ...");
923	}
924	for(i=1; i<argc && rc; i++){
925	int match = 0;
926

M src/timeline.c

+1 -1

		--- src/timeline.c
		+++ src/timeline.c
		@@ -3005,11 +3005,11 @@
3005	3005	if( showSql ){
3006	3006	db_append_dml_to_blob(0);
3007	3007	@ <pre>%h(blob_str(&allSql))</pre>
3008	3008	blob_reset(&allSql);
3009	3009	}
3010		- if( search_restrict(SRCH_CKIN, 0)!=0 ){
	3010	+ if( search_restrict(SRCH_CKIN)!=0 ){
3011	3011	style_submenu_element("Search", "%R/search?y=c");
3012	3012	}
3013	3013	if( advancedMenu ){
3014	3014	style_submenu_element("Basic", "%s",
3015	3015	url_render(&url, "advm", "0", "udc", "1"));
3016	3016

	--- src/timeline.c
	+++ src/timeline.c
	@@ -3005,11 +3005,11 @@
3005	if( showSql ){
3006	db_append_dml_to_blob(0);
3007	@ <pre>%h(blob_str(&allSql))</pre>
3008	blob_reset(&allSql);
3009	}
3010	if( search_restrict(SRCH_CKIN, 0)!=0 ){
3011	style_submenu_element("Search", "%R/search?y=c");
3012	}
3013	if( advancedMenu ){
3014	style_submenu_element("Basic", "%s",
3015	url_render(&url, "advm", "0", "udc", "1"));
3016

	--- src/timeline.c
	+++ src/timeline.c
	@@ -3005,11 +3005,11 @@
3005	if( showSql ){
3006	db_append_dml_to_blob(0);
3007	@ <pre>%h(blob_str(&allSql))</pre>
3008	blob_reset(&allSql);
3009	}
3010	if( search_restrict(SRCH_CKIN)!=0 ){
3011	style_submenu_element("Search", "%R/search?y=c");
3012	}
3013	if( advancedMenu ){
3014	style_submenu_element("Basic", "%s",
3015	url_render(&url, "advm", "0", "udc", "1"));
3016

M src/tkt.c

+2 -2

		--- src/tkt.c
		+++ src/tkt.c
		@@ -1858,11 +1858,11 @@
1858	1858
1859	1859	/*
1860	1860	** Add some standard submenu elements for ticket screens.
1861	1861	*/
1862	1862	void ticket_standard_submenu(unsigned int ok){
1863		- if( (ok & T_SRCH)!=0 && search_restrict(SRCH_TKT, 0)!=0 ){
	1863	+ if( (ok & T_SRCH)!=0 && search_restrict(SRCH_TKT)!=0 ){
1864	1864	style_submenu_element("Search", "%R/tktsrch");
1865	1865	}
1866	1866	if( (ok & T_REPLIST)!=0 ){
1867	1867	style_submenu_element("Reports", "%R/reportlist");
1868	1868	}
		@@ -1878,11 +1878,11 @@
1878	1878	** either ticket-search (if search is enabled) or as the
1879	1879	** /reportlist page (if ticket search is disabled).
1880	1880	*/
1881	1881	void tkt_home_page(void){
1882	1882	login_check_credentials();
1883		- if( search_restrict(SRCH_TKT, 0)!=0 ){
	1883	+ if( search_restrict(SRCH_TKT)!=0 ){
1884	1884	tkt_srchpage();
1885	1885	}else{
1886	1886	view_list();
1887	1887	}
1888	1888	}
1889	1889

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1858,11 +1858,11 @@
1858
1859	/*
1860	** Add some standard submenu elements for ticket screens.
1861	*/
1862	void ticket_standard_submenu(unsigned int ok){
1863	if( (ok & T_SRCH)!=0 && search_restrict(SRCH_TKT, 0)!=0 ){
1864	style_submenu_element("Search", "%R/tktsrch");
1865	}
1866	if( (ok & T_REPLIST)!=0 ){
1867	style_submenu_element("Reports", "%R/reportlist");
1868	}
	@@ -1878,11 +1878,11 @@
1878	** either ticket-search (if search is enabled) or as the
1879	** /reportlist page (if ticket search is disabled).
1880	*/
1881	void tkt_home_page(void){
1882	login_check_credentials();
1883	if( search_restrict(SRCH_TKT, 0)!=0 ){
1884	tkt_srchpage();
1885	}else{
1886	view_list();
1887	}
1888	}
1889

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1858,11 +1858,11 @@
1858
1859	/*
1860	** Add some standard submenu elements for ticket screens.
1861	*/
1862	void ticket_standard_submenu(unsigned int ok){
1863	if( (ok & T_SRCH)!=0 && search_restrict(SRCH_TKT)!=0 ){
1864	style_submenu_element("Search", "%R/tktsrch");
1865	}
1866	if( (ok & T_REPLIST)!=0 ){
1867	style_submenu_element("Reports", "%R/reportlist");
1868	}
	@@ -1878,11 +1878,11 @@
1878	** either ticket-search (if search is enabled) or as the
1879	** /reportlist page (if ticket search is disabled).
1880	*/
1881	void tkt_home_page(void){
1882	login_check_credentials();
1883	if( search_restrict(SRCH_TKT)!=0 ){
1884	tkt_srchpage();
1885	}else{
1886	view_list();
1887	}
1888	}
1889

M src/wiki.c

+3 -3

		--- src/wiki.c
		+++ src/wiki.c
		@@ -332,11 +332,11 @@
332	332
333	333	/*
334	334	** Add some standard submenu elements for wiki screens.
335	335	*/
336	336	static void wiki_standard_submenu(unsigned int ok){
337		- if( (ok & W_SRCH)!=0 && search_restrict(SRCH_WIKI,0)!=0 ){
	337	+ if( (ok & W_SRCH)!=0 && search_restrict(SRCH_WIKI)!=0 ){
338	338	style_submenu_element("Search", "%R/wikisrch");
339	339	}
340	340	if( (ok & W_LIST)!=0 ){
341	341	style_submenu_element("List", "%R/wcontent");
342	342	}
		@@ -379,11 +379,11 @@
379	379	@ <li> %z(href("%R/timeline?y=e"))List of All Tech-notes</a>
380	380	@ available on this server.</li>
381	381	if( g.perm.ModWiki ){
382	382	@ <li> %z(href("%R/modreq"))Tend to pending moderation requests</a></li>
383	383	}
384		- if( search_restrict(SRCH_WIKI,0)!=0 ){
	384	+ if( search_restrict(SRCH_WIKI)!=0 ){
385	385	@ <li> %z(href("%R/wikisrch"))Search</a> for wiki pages containing key
386	386	@ words</li>
387	387	}
388	388	@ </ul>
389	389	style_finish_page();
		@@ -580,11 +580,11 @@
580	580	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
581	581	zPageName = P("name");
582	582	(void)P("s")/for cgi_check_for_malice(). "s" == search stringy/;
583	583	cgi_check_for_malice();
584	584	if( zPageName==0 ){
585		- if( search_restrict(SRCH_WIKI,0)!=0 ){
	585	+ if( search_restrict(SRCH_WIKI)!=0 ){
586	586	wiki_srchpage();
587	587	}else{
588	588	wiki_helppage();
589	589	}
590	590	return;
591	591

	--- src/wiki.c
	+++ src/wiki.c
	@@ -332,11 +332,11 @@
332
333	/*
334	** Add some standard submenu elements for wiki screens.
335	*/
336	static void wiki_standard_submenu(unsigned int ok){
337	if( (ok & W_SRCH)!=0 && search_restrict(SRCH_WIKI,0)!=0 ){
338	style_submenu_element("Search", "%R/wikisrch");
339	}
340	if( (ok & W_LIST)!=0 ){
341	style_submenu_element("List", "%R/wcontent");
342	}
	@@ -379,11 +379,11 @@
379	@ <li> %z(href("%R/timeline?y=e"))List of All Tech-notes</a>
380	@ available on this server.</li>
381	if( g.perm.ModWiki ){
382	@ <li> %z(href("%R/modreq"))Tend to pending moderation requests</a></li>
383	}
384	if( search_restrict(SRCH_WIKI,0)!=0 ){
385	@ <li> %z(href("%R/wikisrch"))Search</a> for wiki pages containing key
386	@ words</li>
387	}
388	@ </ul>
389	style_finish_page();
	@@ -580,11 +580,11 @@
580	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
581	zPageName = P("name");
582	(void)P("s")/for cgi_check_for_malice(). "s" == search stringy/;
583	cgi_check_for_malice();
584	if( zPageName==0 ){
585	if( search_restrict(SRCH_WIKI,0)!=0 ){
586	wiki_srchpage();
587	}else{
588	wiki_helppage();
589	}
590	return;
591

	--- src/wiki.c
	+++ src/wiki.c
	@@ -332,11 +332,11 @@
332
333	/*
334	** Add some standard submenu elements for wiki screens.
335	*/
336	static void wiki_standard_submenu(unsigned int ok){
337	if( (ok & W_SRCH)!=0 && search_restrict(SRCH_WIKI)!=0 ){
338	style_submenu_element("Search", "%R/wikisrch");
339	}
340	if( (ok & W_LIST)!=0 ){
341	style_submenu_element("List", "%R/wcontent");
342	}
	@@ -379,11 +379,11 @@
379	@ <li> %z(href("%R/timeline?y=e"))List of All Tech-notes</a>
380	@ available on this server.</li>
381	if( g.perm.ModWiki ){
382	@ <li> %z(href("%R/modreq"))Tend to pending moderation requests</a></li>
383	}
384	if( search_restrict(SRCH_WIKI)!=0 ){
385	@ <li> %z(href("%R/wikisrch"))Search</a> for wiki pages containing key
386	@ words</li>
387	}
388	@ </ul>
389	style_finish_page();
	@@ -580,11 +580,11 @@
580	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
581	zPageName = P("name");
582	(void)P("s")/for cgi_check_for_malice(). "s" == search stringy/;
583	cgi_check_for_malice();
584	if( zPageName==0 ){
585	if( search_restrict(SRCH_WIKI)!=0 ){
586	wiki_srchpage();
587	}else{
588	wiki_helppage();
589	}
590	return;
591

Fossil SCM

Keyboard Shortcuts