X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/d2cbbf810674b5255fd8382381a83a2d990379d1a0524e0b0c41439d51aaeb99..0a1276bd4b16b1fdf71b6b852fc9ba6c094d67edbec5ca8f06c9170b6445284d:/gitweb.perl
diff --git a/gitweb.perl b/gitweb.perl
index 3f88ed5..04e1c56 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -3255,7 +3255,7 @@ EOF
print "\n" .
"\n";
- if (-f $site_header) {
+ if (defined $site_header && -f $site_header) {
insert_file($site_header);
}
@@ -3356,7 +3356,7 @@ sub git_footer_html {
print "\n"; # class="page_footer"
}
- if (-f $site_footer) {
+ if (defined $site_footer && -f $site_footer) {
insert_file($site_footer);
}
@@ -3393,6 +3393,7 @@ sub git_footer_html {
sub die_error {
my $status = shift || 500;
my $error = shift || "Internal server error";
+ my $extra = shift;
my %http_responses = (
400 => '400 Bad Request',
@@ -3407,8 +3408,13 @@ sub die_error {
$status - $error
-
EOF
+ if (defined $extra) {
+ print "
\n" .
+ "$extra\n";
+ }
+ print "\n";
+
git_footer_html();
exit;
}
@@ -3510,14 +3516,21 @@ sub git_print_header_div {
}
sub print_local_time {
+ print format_local_time(@_);
+}
+
+sub format_local_time {
+ my $localtime = '';
my %date = @_;
if ($date{'hour_local'} < 6) {
- printf(" (%02d:%02d %s)",
+ $localtime .= sprintf(" (%02d:%02d %s)",
$date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
} else {
- printf(" (%02d:%02d %s)",
+ $localtime .= sprintf(" (%02d:%02d %s)",
$date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
}
+
+ return $localtime;
}
# Outputs the author name and date in long form
@@ -4341,17 +4354,24 @@ sub fill_project_list_info {
# print 'sort by' element, generating 'sort by $name' replay link
# if that order is not selected
sub print_sort_th {
+ print format_sort_th(@_);
+}
+
+sub format_sort_th {
my ($name, $order, $header) = @_;
+ my $sort_th = "";
$header ||= ucfirst($name);
if ($order eq $name) {
- print " | $header | \n";
+ $sort_th .= "$header | \n";
} else {
- print "" .
- $cgi->a({-href => href(-replay=>1, order=>$name),
- -class => "header"}, $header) .
- " | \n";
+ $sort_th .= "" .
+ $cgi->a({-href => href(-replay=>1, order=>$name),
+ -class => "header"}, $header) .
+ " | \n";
}
+
+ return $sort_th;
}
sub git_project_list_body {
@@ -4782,7 +4802,7 @@ sub git_project_list {
}
git_header_html();
- if (-f $home_text) {
+ if (defined $home_text && -f $home_text) {
print "\n";
insert_file($home_text);
print "
\n";