Update of /cvsroot/lxr/lxr
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17058
Modified Files:
search
Log Message:
search, Template.pm, templates/lxr.css & classic.css: prevent access to free-text search when disabled
Free-text search is disabled when there is no search engine or when tree is stored in VCS
Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- search 23 Jan 2013 16:29:05 -0000 1.49
+++ search 24 Jan 2013 15:09:52 -0000 1.50
@@ -594,11 +594,11 @@
makeheader('search');
if ($files->isa("LXR::Files::Plain")) {
if ( $config->{'glimpsebin'}
- && $config->{'glimpsebin'} =~ m!$(.*/)?true$!
+ && $config->{'glimpsebin'} =~ m!^(.*/)?true$!
|| $config->{'swishbin'}
- && $config->{'swishbin'} =~ m!$(.*/)?true$!
+ && $config->{'swishbin'} =~ m!^(.*/)?true$!
) {
- print "<h2 class='error'>Free-text search disabled in configuration!</h2>\n";
+ print "<h2 class='error'>Free-text search disabled by configuration file!</h2>\n";
} else {
&search;
}
|
