correct a few doubled-word nits in comments and documentation

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index eac264c266909b25af34b696623410bb4d623aea484edb554d895a5509c1a4fb..ae9d115dedfa7963b44fb11517020b667f764435e0a320348b3058381d82eeb9 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -1082,7 +1082,16 @@ sub evaluate_and_validate_params {
                if (length($searchtext) < 2) {
                        die_error(403, "At least two characters are required for search parameter");
                }
                if (length($searchtext) < 2) {
                        die_error(403, "At least two characters are required for search parameter");
                }

-               $search_regexp = $search_use_regexp ? $searchtext : quotemeta $searchtext;
+               if ($search_use_regexp) {
+                       $search_regexp = $searchtext;
+                       if (!eval { qr/$search_regexp/; 1; }) {
+                               (my $error = $@) =~ s/ at \S+ line \d+.*\n?//;
+                               die_error(400, "Invalid search regexp '$search_regexp'",
+                                         esc_html($error));
+                       }
+               } else {
+                       $search_regexp = quotemeta $searchtext;
+               }

        }
 }
 
        }
 }
 


@@ -3065,15 +3074,15 @@ sub filter_forks_from_projects_list {
 sub search_projects_list {
        my ($projlist, %opts) = @_;
        my $tagfilter  = $opts{'tagfilter'};
 sub search_projects_list {
        my ($projlist, %opts) = @_;
        my $tagfilter  = $opts{'tagfilter'};

-       my $searchtext = $opts{'searchtext'};
+       my $search_re = $opts{'search_regexp'};

 
        return @$projlist
 
        return @$projlist

-               unless ($tagfilter || $searchtext);
+               unless ($tagfilter || $search_re);

 
        # searching projects require filling to be run before it;
        fill_project_list_info($projlist,
                               $tagfilter  ? 'ctags' : (),
 
        # searching projects require filling to be run before it;
        fill_project_list_info($projlist,
                               $tagfilter  ? 'ctags' : (),

-                              $searchtext ? ('path', 'descr') : ());
+                              $search_re ? ('path', 'descr') : ());

        my @projects;
  PROJECT:
        foreach my $pr (@$projlist) {
        my @projects;
  PROJECT:
        foreach my $pr (@$projlist) {


@@ -3084,10 +3093,10 @@ sub search_projects_list {
                                grep { lc($_) eq lc($tagfilter) } keys %{$pr->{'ctags'}};
                }
 
                                grep { lc($_) eq lc($tagfilter) } keys %{$pr->{'ctags'}};
                }
 

-               if ($searchtext) {
+               if ($search_re) {

                        next unless
                        next unless

-                               $pr->{'path'} =~ /$searchtext/ ||
-                               $pr->{'descr_long'} =~ /$searchtext/;
+                               $pr->{'path'} =~ /$search_re/ ||
+                               $pr->{'descr_long'} =~ /$search_re/;

                }
 
                push @projects, $pr;
                }
 
                push @projects, $pr;


@@ -5248,7 +5257,7 @@ sub git_patchset_body {
 # . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 sub git_project_search_form {
 # . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 sub git_project_search_form {

-       my ($searchtext, $search_use_regexp);
+       my ($searchtext, $search_use_regexp) = @_;

 
        my $limit = '';
        if ($project_filter) {
 
        my $limit = '';
        if ($project_filter) {


@@ -5476,16 +5485,16 @@ sub git_project_list_body {
        my $show_ctags  = gitweb_check_feature('ctags');
        my $tagfilter = $show_ctags ? $input_params{'ctag'} : undef;
        $check_forks = undef
        my $show_ctags  = gitweb_check_feature('ctags');
        my $tagfilter = $show_ctags ? $input_params{'ctag'} : undef;
        $check_forks = undef

-               if ($tagfilter || $searchtext);
+               if ($tagfilter || $search_regexp);

 
        # filtering out forks before filling info allows to do less work
        @projects = filter_forks_from_projects_list(\@projects)
                if ($check_forks);
        # search_projects_list pre-fills required info
        @projects = search_projects_list(\@projects,
 
        # filtering out forks before filling info allows to do less work
        @projects = filter_forks_from_projects_list(\@projects)
                if ($check_forks);
        # search_projects_list pre-fills required info
        @projects = search_projects_list(\@projects,

-                                        'searchtext' => $searchtext,
+                                        'search_regexp' => $search_regexp,

                                         'tagfilter'  => $tagfilter)
                                         'tagfilter'  => $tagfilter)

-               if ($tagfilter || $searchtext);
+               if ($tagfilter || $search_regexp);

        # fill the rest
        @projects = fill_project_list_info(\@projects);
 
        # fill the rest
        @projects = fill_project_list_info(\@projects);