[PATCH 4/6] gitweb: use_pathinfo creates parent..current paths
- From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
- Date
- Sep 21, 2008, 20:57 UTC
- Message-ID
- <1222030663-22540-5-git-send-email-giuseppe.bilotta@gmail.com>
- In-Reply-To
- <1222030663-22540-4-git-send-email-giuseppe.bilotta@gmail.com>
If use_pathinfo is enabled, href now creates links that contain paths in the form $project/$action/oldhash:/oldname..newhash:/newname for actions that use hash_parent etc, unless oldname contains two consecutive dots, since this would cause ambiguity when parsing the resulting path.
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> --- gitweb/gitweb.perl | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 9868bf4..0dd2526 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -682,9 +682,29 @@ sub href (%) { delete $params{'action'}; } - # next, we put either hash_base:file_name or hash + # next, we put hash_parent_base:/file_parent..hash_base:/file_name, stripping nonexistent or useless pieces + $href .= "/" if ($params{'hash_base'} || $params{'hash_parent_base'} || $params{'hash_parent'} || $params{'hash'}); if (defined $params{'hash_base'}) { - $href .= "/".esc_url($params{'hash_base'}); + if (defined $params{'hash_parent_base'}) { + $href .= esc_url($params{'hash_parent_base'}); + if (defined $params{'file_parent'} && $params{'file_parent'} !~ /\.\./) { + $href .= ":/".esc_url($params{'file_parent'}) unless $params{'file_parent'} eq $params{'file_name'}; + delete $params{'hash_parent'} if $params{'hash_parent'} eq git_get_hash_by_path($params{'hash_parent_base'},$params{'file_parent'}); + delete $params{'file_parent'}; + } else { + delete $params{'hash_parent'} if $params{'hash_parent'} eq $params{'hash_parent_base'}; + if ($params{'file_name'}) { + delete $params{'hash_parent'} if $params{'hash_parent'} eq git_get_hash_by_path($params{'hash_parent_base'},$params{'file_name'}); + } + } + $href .= ".."; + delete $params{'hash_parent_base'}; + } elsif (defined $params{'hash_parent'}) { + $href .= esc_url($params{'hash_parent'}). ".."; + delete $params{'hash_parent'}; + } + + $href .= esc_url($params{'hash_base'}); - if (defined $params{'file_name'}) { + if (defined $params{'file_name'} && $params{'file_name'} !~ /\.\./) { $href .= ":/".esc_url($params{'file_name'}); delete $params{'hash'} if $params{'hash'} eq git_get_hash_by_path($params{'hash_base'},$params{'file_name'}); @@ -694,7 +714,7 @@ sub href (%) { } delete $params{'hash_base'}; } elsif (defined $params{'hash'}) { - $href .= "/".esc_url($params{'hash'}); + $href .= esc_url($params{'hash'}); delete $params{'hash'}; } }
-- 1.5.6.5