gitweb: simplify gitweb.min.* generation and clean-up rules

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index fbafc186a90fc836bfb0387b5472c8e749c675e7133c7dcf6e6b4fe3c7c58de5..d2bb028a66e95965b0304cd801b0bf6cc2432a0550233c2ad5e5cc5c8f4f11f5 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -455,7 +455,11 @@ sub gitweb_get_feature {
                $feature{$name}{'sub'},
                $feature{$name}{'override'},
                @{$feature{$name}{'default'}});
                $feature{$name}{'sub'},
                $feature{$name}{'override'},
                @{$feature{$name}{'default'}});

-       if (!$override) { return @defaults; }
+       # project specific override is possible only if we have project
+       our $git_dir; # global variable, declared later
+       if (!$override || !defined $git_dir) {
+               return @defaults;
+       }

        if (!defined $sub) {
                warn "feature $name is not overridable";
                return @defaults;
        if (!defined $sub) {
                warn "feature $name is not overridable";
                return @defaults;


@@ -551,11 +555,14 @@ sub filter_snapshot_fmts {
 }
 
 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
 }
 
 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";

+our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
+# die if there are errors parsing config file

 if (-e $GITWEB_CONFIG) {
        do $GITWEB_CONFIG;
 if (-e $GITWEB_CONFIG) {
        do $GITWEB_CONFIG;

-} else {
-       our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
-       do $GITWEB_CONFIG_SYSTEM if -e $GITWEB_CONFIG_SYSTEM;
+       die $@ if $@;
+} elsif (-e $GITWEB_CONFIG_SYSTEM) {
+       do $GITWEB_CONFIG_SYSTEM;
+       die $@ if $@;

 }
 
 # Get loadavg of system, to compare against $maxload.
 }
 
 # Get loadavg of system, to compare against $maxload.


@@ -1144,6 +1151,7 @@ sub validate_refname {
 # in utf-8 thanks to "binmode STDOUT, ':utf8'" at beginning
 sub to_utf8 {
        my $str = shift;
 # in utf-8 thanks to "binmode STDOUT, ':utf8'" at beginning
 sub to_utf8 {
        my $str = shift;

+       return undef unless defined $str;

        if (utf8::valid($str)) {
                utf8::decode($str);
                return $str;
        if (utf8::valid($str)) {
                utf8::decode($str);
                return $str;


@@ -1156,6 +1164,7 @@ sub to_utf8 {
 # correct, but quoted slashes look too horrible in bookmarks
 sub esc_param {
        my $str = shift;
 # correct, but quoted slashes look too horrible in bookmarks
 sub esc_param {
        my $str = shift;

+       return undef unless defined $str;

        $str =~ s/([^A-Za-z0-9\-_.~()\/:@ ]+)/CGI::escape($1)/eg;
        $str =~ s/ /\+/g;
        return $str;
        $str =~ s/([^A-Za-z0-9\-_.~()\/:@ ]+)/CGI::escape($1)/eg;
        $str =~ s/ /\+/g;
        return $str;


@@ -1164,6 +1173,7 @@ sub esc_param {
 # quote unsafe chars in whole URL, so some charactrs cannot be quoted
 sub esc_url {
        my $str = shift;
 # quote unsafe chars in whole URL, so some charactrs cannot be quoted
 sub esc_url {
        my $str = shift;

+       return undef unless defined $str;

        $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
        $str =~ s/\+/%2B/g;
        $str =~ s/ /\+/g;
        $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
        $str =~ s/\+/%2B/g;
        $str =~ s/ /\+/g;


@@ -1175,6 +1185,8 @@ sub esc_html {
        my $str = shift;
        my %opts = @_;
 
        my $str = shift;
        my %opts = @_;
 

+       return undef unless defined $str;
+

        $str = to_utf8($str);
        $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {
        $str = to_utf8($str);
        $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {


@@ -1189,6 +1201,8 @@ sub esc_path {
        my $str = shift;
        my %opts = @_;
 
        my $str = shift;
        my %opts = @_;
 

+       return undef unless defined $str;
+

        $str = to_utf8($str);
        $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {
        $str = to_utf8($str);
        $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {


@@ -1331,7 +1345,6 @@ sub chop_str {
                $str =~ m/^(.*?)($begre)$/;
                my ($lead, $body) = ($1, $2);
                if (length($lead) > 4) {
                $str =~ m/^(.*?)($begre)$/;
                my ($lead, $body) = ($1, $2);
                if (length($lead) > 4) {

-                       $body =~ s/^[^;]*;// if ($lead =~ m/&[^;]*$/);

                        $lead = " ...";
                }
                return "$lead$body";
                        $lead = " ...";
                }
                return "$lead$body";


@@ -1342,8 +1355,6 @@ sub chop_str {
                $str =~ m/^(.*?)($begre)$/;
                my ($mid, $right) = ($1, $2);
                if (length($mid) > 5) {
                $str =~ m/^(.*?)($begre)$/;
                my ($mid, $right) = ($1, $2);
                if (length($mid) > 5) {

-                       $left  =~ s/&[^;]*$//;
-                       $right =~ s/^[^;]*;// if ($mid =~ m/&[^;]*$/);

                        $mid = " ... ";
                }
                return "$left$mid$right";
                        $mid = " ... ";
                }
                return "$left$mid$right";


@@ -1353,7 +1364,6 @@ sub chop_str {
                my $body = $1;
                my $tail = $2;
                if (length($tail) > 4) {
                my $body = $1;
                my $tail = $2;
                if (length($tail) > 4) {

-                       $body =~ s/&[^;]*$//;

                        $tail = "... ";
                }
                return "$body$tail";
                        $tail = "... ";
                }
                return "$body$tail";


@@ -2207,6 +2217,8 @@ sub config_to_multi {
 sub git_get_project_config {
        my ($key, $type) = @_;
 
 sub git_get_project_config {
        my ($key, $type) = @_;
 

+       return unless defined $git_dir;
+

        # key sanity check
        return unless ($key);
        $key =~ s/^gitweb\.//;
        # key sanity check
        return unless ($key);
        $key =~ s/^gitweb\.//;


@@ -3377,7 +3389,7 @@ sub git_footer_html {
              "</html>";
 }
 
              "</html>";
 }
 

-# die_error(<http_status_code>, <error_message>)
+# die_error(<http_status_code>, <error_message>[, <detailed_html_description>])

 # Example: die_error(404, 'Hash not found')
 # By convention, use the following status codes (as defined in RFC 2616):
 # 400: Invalid or missing CGI parameters, or
 # Example: die_error(404, 'Hash not found')
 # By convention, use the following status codes (as defined in RFC 2616):
 # 400: Invalid or missing CGI parameters, or


@@ -3392,7 +3404,8 @@ sub git_footer_html {
 #      or down for maintenance).  Generally, this is a temporary state.
 sub die_error {
        my $status = shift || 500;
 #      or down for maintenance).  Generally, this is a temporary state.
 sub die_error {
        my $status = shift || 500;

-       my $error = shift || "Internal server error";
+       my $error = esc_html(shift) || "Internal Server Error";
+       my $extra = shift;

 
        my %http_responses = (
                400 => '400 Bad Request',
 
        my %http_responses = (
                400 => '400 Bad Request',


@@ -3407,8 +3420,13 @@ sub die_error {
 <br /><br />
 $status - $error
 <br />
 <br /><br />
 $status - $error
 <br />

-</div>

 EOF
 EOF

+       if (defined $extra) {
+               print "<hr />\n" .
+                     "$extra\n";
+       }
+       print "</div>\n";
+

        git_footer_html();
        exit;
 }
        git_footer_html();
        exit;
 }


@@ -3510,14 +3528,21 @@ sub git_print_header_div {
 }
 
 sub print_local_time {
 }
 
 sub print_local_time {

+       print format_local_time(@_);
+}
+
+sub format_local_time {
+       my $localtime = '';

        my %date = @_;
        if ($date{'hour_local'} < 6) {
        my %date = @_;
        if ($date{'hour_local'} < 6) {

-               printf(" (<span class=\"atnight\">%02d:%02d</span> %s)",
+               $localtime .= sprintf(" (<span class=\"atnight\">%02d:%02d</span> %s)",

                        $date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
        } else {
                        $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'});
        }
                        $date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
        }

+
+       return $localtime;

 }
 
 # Outputs the author name and date in long form
 }
 
 # Outputs the author name and date in long form


@@ -4341,17 +4366,24 @@ sub fill_project_list_info {
 # print 'sort by' <th> element, generating 'sort by $name' replay link
 # if that order is not selected
 sub print_sort_th {
 # print 'sort by' <th> 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 ($name, $order, $header) = @_;

+       my $sort_th = "";

        $header ||= ucfirst($name);
 
        if ($order eq $name) {
        $header ||= ucfirst($name);
 
        if ($order eq $name) {

-               print "<th>$header</th>\n";
+               $sort_th .= "<th>$header</th>\n";

        } else {
        } else {

-               print "<th>" .
-                     $cgi->a({-href => href(-replay=>1, order=>$name),
-                              -class => "header"}, $header) .
-                     "</th>\n";
+               $sort_th .= "<th>" .
+                           $cgi->a({-href => href(-replay=>1, order=>$name),
+                                    -class => "header"}, $header) .
+                           "</th>\n";

        }
        }

+
+       return $sort_th;

 }
 
 sub git_project_list_body {
 }
 
 sub git_project_list_body {