[PATCH] gitweb: use common parameter parsing and generation for "o", too.
From: Martin Waitz <hidden>
Date: 2016-06-15 22:42:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
The "o" (list order) parameter was handled special. Now it is generated with the common href() function and parsed together with all other parameters. Signed-off-by: Martin Waitz <redacted> --- gitweb/gitweb.perl | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 72e687e..ed6bd0e 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl@@ -91,6 +91,11 @@ if (defined $action) { } } +our $order = $cgi->param('o'); +if (defined $order && $order !~ m/project|descr|owner|age/) { + die_error(undef, "Unknown order parameter"); +} + our $project = ($cgi->param('p') || $ENV{'PATH_INFO'}); if (defined $project) { $project =~ s|^/||;
@@ -197,6 +202,7 @@ sub href(%) { hash_base => "hb", page => "pg", searchtext => "s", + order => "o", ); my %params = @_;
@@ -1577,11 +1583,6 @@ ## ===================================== ## actions sub git_project_list { - my $order = $cgi->param('o'); - if (defined $order && $order !~ m/project|descr|owner|age/) { - die_error(undef, "Unknown order parameter"); - } - my @list = git_get_projects_list(); my @projects; if (!@list) {
@@ -1624,7 +1625,7 @@ sub git_project_list { print "<th>Project</th>\n"; } else { print "<th>" . - $cgi->a({-href => "$my_uri?" . esc_param("o=project"), + $cgi->a({-href => href(order=>"project"), -class => "header"}, "Project") . "</th>\n"; }
@@ -1633,7 +1634,7 @@ sub git_project_list { print "<th>Description</th>\n"; } else { print "<th>" . - $cgi->a({-href => "$my_uri?" . esc_param("o=descr"), + $cgi->a({-href => href(order=>"descr"), -class => "header"}, "Description") . "</th>\n"; }
@@ -1642,7 +1643,7 @@ sub git_project_list { print "<th>Owner</th>\n"; } else { print "<th>" . - $cgi->a({-href => "$my_uri?" . esc_param("o=owner"), + $cgi->a({-href => href(order=>"owner"), -class => "header"}, "Owner") . "</th>\n"; }
@@ -1651,7 +1652,7 @@ sub git_project_list { print "<th>Last Change</th>\n"; } else { print "<th>" . - $cgi->a({-href => "$my_uri?" . esc_param("o=age"), + $cgi->a({-href => href(order=>"age"), -class => "header"}, "Last Change") . "</th>\n"; }
--
1.4.2.rc2.gf055