gitweb: Harden and improve $project_filter page title

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 71c16dc1f9cbe8705d48f3002d48492d65e798c80460126c5964bcb66855d799..dac4129e203c54695238a0acbe57407ff131bbaf42d32ba54c55f9097f74ec8d 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -52,7 +52,7 @@ sub evaluate_uri {
        # as base URL.
        # Therefore, if we needed to strip PATH_INFO, then we know that we have
        # to build the base URL ourselves:
        # as base URL.
        # Therefore, if we needed to strip PATH_INFO, then we know that we have
        # to build the base URL ourselves:

-       our $path_info = $ENV{"PATH_INFO"};
+       our $path_info = decode_utf8($ENV{"PATH_INFO"});

        if ($path_info) {
                if ($my_url =~ s,\Q$path_info\E$,, &&
                    $my_uri =~ s,\Q$path_info\E$,, &&
        if ($path_info) {
                if ($my_url =~ s,\Q$path_info\E$,, &&
                    $my_uri =~ s,\Q$path_info\E$,, &&


@@ -818,9 +818,9 @@ sub evaluate_query_params {
 
        while (my ($name, $symbol) = each %cgi_param_mapping) {
                if ($symbol eq 'opt') {
 
        while (my ($name, $symbol) = each %cgi_param_mapping) {
                if ($symbol eq 'opt') {

-                       $input_params{$name} = [ $cgi->param($symbol) ];
+                       $input_params{$name} = [ map { decode_utf8($_) } $cgi->param($symbol) ];

                } else {
                } else {

-                       $input_params{$name} = $cgi->param($symbol);
+                       $input_params{$name} = decode_utf8($cgi->param($symbol));

                }
        }
 }
                }
        }
 }


@@ -2776,7 +2776,7 @@ sub git_populate_project_tagcloud {
        }
 
        my $cloud;
        }
 
        my $cloud;

-       my $matched = $cgi->param('by_tag');
+       my $matched = $input_params{'ctag'};

        if (eval { require HTML::TagCloud; 1; }) {
                $cloud = HTML::TagCloud->new;
                foreach my $ctag (sort keys %ctags_lc) {
        if (eval { require HTML::TagCloud; 1; }) {
                $cloud = HTML::TagCloud->new;
                foreach my $ctag (sort keys %ctags_lc) {


@@ -3745,7 +3745,7 @@ sub get_page_title {
 
        unless (defined $project) {
                if (defined $project_filter) {
 
        unless (defined $project) {
                if (defined $project_filter) {

-                       $title .= " - " . to_utf8($project_filter);
+                       $title .= " - projects in '" . esc_path($project_filter) . "'";

                }
                return $title;
        }
                }
                return $title;
        }


@@ -3907,7 +3907,7 @@ sub print_search_form {
                               -values => ['commit', 'grep', 'author', 'committer', 'pickaxe']) .
              $cgi->sup($cgi->a({-href => href(action=>"search_help")}, "?")) .
              " search:\n",
                               -values => ['commit', 'grep', 'author', 'committer', 'pickaxe']) .
              $cgi->sup($cgi->a({-href => href(action=>"search_help")}, "?")) .
              " search:\n",

-             $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
+             $cgi->textfield(-name => "s", -value => $searchtext, -override => 1) . "\n" .

              "<span title=\"Extended regular expression\">" .
              $cgi->checkbox(-name => 'sr', -value => 1, -label => 're',
                             -checked => $search_use_regexp) .
              "<span title=\"Extended regular expression\">" .
              $cgi->checkbox(-name => 'sr', -value => 1, -label => 're',
                             -checked => $search_use_regexp) .


@@ -5346,7 +5346,7 @@ sub git_project_list_body {
 
        my $check_forks = gitweb_check_feature('forks');
        my $show_ctags  = gitweb_check_feature('ctags');
 
        my $check_forks = gitweb_check_feature('forks');
        my $show_ctags  = gitweb_check_feature('ctags');

-       my $tagfilter = $show_ctags ? $cgi->param('by_tag') : undef;
+       my $tagfilter = $show_ctags ? $input_params{'ctag'} : undef;

        $check_forks = undef
                if ($tagfilter || $searchtext);
 
        $check_forks = undef
                if ($tagfilter || $searchtext);
 


@@ -6262,7 +6262,7 @@ sub git_tag {
 
 sub git_blame_common {
        my $format = shift || 'porcelain';
 
 sub git_blame_common {
        my $format = shift || 'porcelain';

-       if ($format eq 'porcelain' && $cgi->param('js')) {
+       if ($format eq 'porcelain' && $input_params{'javascript'}) {

                $format = 'incremental';
                $action = 'blame_incremental'; # for page title etc
        }
                $format = 'incremental';
                $action = 'blame_incremental'; # for page title etc
        }