version 1.1.1.12, 2000/11/04 19:19:48 |
version 3.28, 2000/09/30 18:27:16 |
|
|
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
# SUCH DAMAGE. |
# SUCH DAMAGE. |
# |
# |
# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ |
# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $ |
# $kId: cvsweb.cgi,v 1.39 2000/11/04 15:32:17 knu Exp $ |
# $Id$ |
# |
# |
### |
### |
|
|
|
|
use vars qw ( |
use vars qw ( |
$config $allow_version_select $verbose |
$config $allow_version_select $verbose |
%CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES |
%CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES |
@DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS |
|
%alltags @tabcolors %fileinfo %tags @branchnames %nameprinted |
%alltags @tabcolors %fileinfo %tags @branchnames %nameprinted |
%symrev %revsym @allrevisions %date %author @revdisplayorder |
%symrev %revsym @allrevisions %date %author @revdisplayorder |
@revisions %state %difflines %log %branchpoint @revorder |
@revisions %state %difflines %log %branchpoint @revorder |
|
|
$checkoutMagic $doCheckout $scriptname $scriptwhere |
$checkoutMagic $doCheckout $scriptname $scriptwhere |
$where $pathinfo $Browser $nofilelinks $maycompress @stickyvars |
$where $pathinfo $Browser $nofilelinks $maycompress @stickyvars |
%funcline_regexp $is_mod_perl |
%funcline_regexp $is_mod_perl |
$is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased |
$is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased |
%input $query $barequery $sortby $bydate $byrev $byauthor |
%input $query $barequery $sortby $bydate $byrev $byauthor |
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot |
$bylog $byfile $hr_default $logsort $cvstree $cvsroot |
$mimetype $defaultTextPlain $defaultViewable $allow_compress |
$mimetype $defaultTextPlain $defaultViewable $allow_compress |
$GZIPBIN $backicon $diricon $fileicon $fullname $newname |
$GZIPBIN $backicon $diricon $fileicon $fullname $newname |
$cvstreedefault $body_tag $body_tag_for_src |
$cvstreedefault $body_tag $body_tag_for_src |
|
|
$difffontsize $inputTextSize $mime_types $allow_annotate |
$difffontsize $inputTextSize $mime_types $allow_annotate |
$allow_markup $use_java_script $open_extern_window |
$allow_markup $use_java_script $open_extern_window |
$extern_window_width $extern_window_height $edit_option_form |
$extern_window_width $extern_window_height $edit_option_form |
$show_subdir_lastmod $show_log_in_markup $v |
$checkout_magic $show_subdir_lastmod $show_log_in_markup $v |
$navigationHeaderColor $tableBorderColor $markupLogColor |
$navigationHeaderColor $tableBorderColor $markupLogColor |
$tabstop $state $annTable $sel $curbranch @HideModules |
$tabstop $state $annTable $sel $curbranch @HideModules |
$module $use_descriptions %descriptions @mytz $dwhere $moddate |
$module $use_descriptions %descriptions @mytz $dwhere $moddate |
$use_moddate $has_zlib $gzip_open |
$use_moddate $has_zlib $gzip_open |
$LOG_FILESEPARATOR $LOG_REVSEPARATOR |
|
); |
); |
|
|
sub printDiffSelect($); |
sub printDiffSelect($); |
sub printDiffLinks($$); |
|
sub printLogSortSelect($); |
|
sub findLastModifiedSubdirs(@); |
sub findLastModifiedSubdirs(@); |
sub htmlify_sub(&$); |
|
sub htmlify($;$); |
sub htmlify($;$); |
sub spacedHtmlText($;$); |
sub spacedHtmlText($;$); |
sub link($$); |
sub link($$); |
Line 120 sub download_url($$;$); |
|
Line 115 sub download_url($$;$); |
|
sub download_link($$$;$); |
sub download_link($$$;$); |
sub toggleQuery($$); |
sub toggleQuery($$); |
sub urlencode($); |
sub urlencode($); |
sub htmlquote($); |
|
sub htmlunquote($); |
|
sub http_header(;$); |
sub http_header(;$); |
sub html_header($); |
sub html_header($); |
sub html_footer(); |
sub html_footer(); |
Line 162 $diffcolorChange = $diffcolorAdd = $diffcolorDarkChang |
|
Line 155 $diffcolorChange = $diffcolorAdd = $diffcolorDarkChang |
|
$difffontsize = $inputTextSize = $mime_types = $allow_annotate = |
$difffontsize = $inputTextSize = $mime_types = $allow_annotate = |
$allow_markup = $use_java_script = $open_extern_window = |
$allow_markup = $use_java_script = $open_extern_window = |
$extern_window_width = $extern_window_height = $edit_option_form = |
$extern_window_width = $extern_window_height = $edit_option_form = |
$show_subdir_lastmod = $show_log_in_markup = $v = |
$checkout_magic = $show_subdir_lastmod = $show_log_in_markup = $v = |
$navigationHeaderColor = $tableBorderColor = $markupLogColor = |
$navigationHeaderColor = $tableBorderColor = $markupLogColor = |
$tabstop = $use_moddate = $moddate = $gzip_open = undef; |
$tabstop = $use_moddate = $moddate = $gzip_open = undef; |
|
|
$LOG_FILESEPARATOR = q/^={77}$/; |
|
$LOG_REVSEPARATOR = q/^-{28}$/; |
|
|
|
@DIFFTYPES = qw(h H u c s); |
|
@DIFFTYPES{@DIFFTYPES} = ( |
|
{ |
|
'descr' => 'colored', |
|
'opts' => [ '-u' ], |
|
'colored' => 1, |
|
}, |
|
{ |
|
'descr' => 'long colored', |
|
'opts' => [ '--unified=15' ], |
|
'colored' => 1, |
|
}, |
|
{ |
|
'descr' => 'unified', |
|
'opts' => [ '-u' ], |
|
'colored' => 0, |
|
}, |
|
{ |
|
'descr' => 'context', |
|
'opts' => [ '-c' ], |
|
'colored' => 0, |
|
}, |
|
{ |
|
'descr' => 'side by side', |
|
'opts' => [ '--side-by-side', '--width=164' ], |
|
'colored' => 0, |
|
}, |
|
); |
|
|
|
@LOGSORTKEYS = qw(cvs date rev); |
|
@LOGSORTKEYS{@LOGSORTKEYS} = ( |
|
{ |
|
'descr' => 'Not sorted', |
|
}, |
|
{ |
|
'descr' => 'Commit date', |
|
}, |
|
{ |
|
'descr' => 'Revision', |
|
}, |
|
); |
|
|
|
|
|
##### End of configuration variables ##### |
##### End of configuration variables ##### |
|
|
use Time::Local; |
use Time::Local; |
Line 245 $is_mod_perl = defined($ENV{MOD_PERL}); |
|
Line 192 $is_mod_perl = defined($ENV{MOD_PERL}); |
|
# per file, so disable the link at the icon |
# per file, so disable the link at the icon |
# in this case: |
# in this case: |
$Browser = $ENV{HTTP_USER_AGENT}; |
$Browser = $ENV{HTTP_USER_AGENT}; |
$is_links = ($Browser =~ m`^Links `); |
|
$is_lynx = ($Browser =~ m`^Lynx/`i); |
$is_lynx = ($Browser =~ m`^Lynx/`i); |
$is_w3m = ($Browser =~ m`^w3m/`i); |
$is_w3m = ($Browser =~ m`^w3m/`i); |
$is_msie = ($Browser =~ m`MSIE`); |
$is_msie = ($Browser =~ m`MSIE`); |
$is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`); |
$is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`); |
|
|
$is_textbased = ($is_links || $is_lynx || $is_w3m); |
$is_textbased = ($is_lynx || $is_w3m); |
|
|
$nofilelinks = $is_textbased; |
$nofilelinks = $is_textbased; |
|
|
Line 333 foreach (keys %DEFAULTVALUE) |
|
Line 279 foreach (keys %DEFAULTVALUE) |
|
} |
} |
|
|
$barequery = ""; |
$barequery = ""; |
my @barequery; |
|
foreach (@stickyvars) { |
foreach (@stickyvars) { |
# construct a query string with the sticky non default parameters set |
# construct a query string with the sticky non default parameters set |
if (defined($input{$_}) && $input{$_} ne '' && |
if (defined($input{$_}) && $input{$_} ne '' && |
!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) { |
!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) { |
push @barequery, join('=', urlencode($_), urlencode($input{$_})); |
if ($barequery) { |
|
$barequery = $barequery . "&"; |
|
} |
|
my $thisval = urlencode($_) . "=" . urlencode($input{$_}); |
|
$barequery .= $thisval; |
} |
} |
} |
} |
# is there any query ? |
# is there any query ? |
if (@barequery) { |
if ($barequery) { |
$barequery = join('&', @barequery); |
|
$query = "?$barequery"; |
$query = "?$barequery"; |
$barequery = "&$barequery"; |
$barequery = "&" . $barequery; |
} |
} |
else { |
else { |
$query = ""; |
$query = ""; |
} |
} |
undef @barequery; |
|
|
|
# get actual parameters |
# get actual parameters |
$sortby = $input{"sortby"}; |
$sortby = $input{"sortby"}; |
|
|
$byfile = 1; |
$byfile = 1; |
} |
} |
|
|
$defaultDiffType = $input{'f'}; |
$hr_default = $input{'f'} eq 'h'; |
|
|
$logsort = $input{'logsort'}; |
$logsort = $input{'logsort'}; |
|
|
Line 398 if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) |
|
Line 345 if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) |
|
$cvsroot = $CVSROOT{$cvstree}; |
$cvsroot = $CVSROOT{$cvstree}; |
|
|
# create icons out of description |
# create icons out of description |
my $k; |
foreach my $k (keys %ICONS) { |
foreach $k (keys %ICONS) { |
|
no strict 'refs'; |
no strict 'refs'; |
my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; |
my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; |
if ($ipath) { |
if ($ipath) { |
${"${k}icon"} = sprintf('<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">', |
${"${k}icon"} = "<IMG SRC=\"$ipath\" ALT=\"$itxt\" BORDER=\"0\" WIDTH=\"$iwidth\" HEIGHT=\"$iheight\">"; |
htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight) |
|
} |
} |
else { |
else { |
${"${k}icon"} = $itxt; |
${"${k}icon"} = $itxt; |
} |
} |
} |
} |
undef $k; |
|
|
|
my $config_cvstree = "$config-$cvstree"; |
my $config_cvstree = "$config-$cvstree"; |
|
|
Line 421 if (-f $config_cvstree) { |
|
Line 365 if (-f $config_cvstree) { |
|
sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>', |
sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>', |
$config_cvstree, &htmlify($@))); |
$config_cvstree, &htmlify($@))); |
} |
} |
undef $config_cvstree; |
|
|
|
$prcategories = '(?:' . join('|', @prcategories) . ')'; |
$prcategories = '(?:' . join('|', @prcategories) . ')'; |
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; |
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; |
Line 530 elsif (-d $fullname) { |
|
Line 473 elsif (-d $fullname) { |
|
} |
} |
print "<table width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n"; |
print "<table width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n"; |
$infocols++; |
$infocols++; |
printf '<tr><th align=left bgcolor="%s">', |
print "<tr><th align=left bgcolor=\"" . (($byfile) ? |
$byfile ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
$columnHeaderColorSorted : |
if ($byfile) { |
$columnHeaderColorDefault) . "\">"; |
print 'File'; |
print "<a href=\"./" . &toggleQuery("sortby","file") . |
} else { |
"#dirlist\">" if (!$byfile); |
print &link('File', sprintf('./%s#dirlist', |
print "File"; |
&toggleQuery("sortby", "file"))); |
print "</a>" if (!$byfile); |
} |
|
print "</th>"; |
print "</th>"; |
# do not display the other column-headers, if we do not have any files |
# do not display the other column-headers, if we do not have any files |
# with revision information: |
# with revision information: |
if (scalar(%fileinfo)) { |
if (scalar(%fileinfo)) { |
$infocols++; |
$infocols++; |
printf '<th align=left bgcolor="%s">', |
print "<th align=left bgcolor=\"" . (($byrev) ? |
$byrev ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
$columnHeaderColorSorted : |
if ($byrev) { |
$columnHeaderColorDefault) . "\">"; |
print 'Rev.'; |
print "<a href=\"./" . &toggleQuery ("sortby","rev") . |
} else { |
"#dirlist\">" if (!$byrev); |
print &link('Rev.', sprintf('./%s#dirlist', |
print "Rev."; |
&toggleQuery("sortby", "rev"))); |
print "</a>" if (!$byrev); |
} |
|
print "</th>"; |
print "</th>"; |
$infocols++; |
$infocols++; |
printf '<th align=left bgcolor="%s">', |
print "<th align=left bgcolor=\"" . (($bydate) ? |
$bydate ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
$columnHeaderColorSorted : |
if ($bydate) { |
$columnHeaderColorDefault) . "\">"; |
print 'Age'; |
print "<a href=\"./" . &toggleQuery ("sortby","date") . |
} else { |
"#dirlist\">" if (!$bydate); |
print &link('Age', sprintf('./%s#dirlist', |
print "Age"; |
&toggleQuery("sortby", "date"))); |
print "</a>" if (!$bydate); |
} |
|
print "</th>"; |
print "</th>"; |
if ($show_author) { |
if ($show_author) { |
$infocols++; |
$infocols++; |
printf '<th align=left bgcolor="%s">', |
print "<th align=left bgcolor=\"" . (($byauthor) ? |
$byauthor ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
$columnHeaderColorSorted : |
if ($byauthor) { |
$columnHeaderColorDefault) . "\">"; |
print 'Author'; |
print "<a href=\"./" . &toggleQuery ("sortby","author") . |
} else { |
"#dirlist\">" if (!$byauthor); |
print &link('Author', sprintf('./%s#dirlist', |
print "Author"; |
&toggleQuery("sortby", "author"))); |
print "</a>" if (!$byauthor); |
} |
|
print "</th>"; |
print "</th>"; |
} |
} |
$infocols++; |
$infocols++; |
printf '<th align=left bgcolor="%s">', |
print "<th align=left bgcolor=\"" . (($bylog) ? |
$bylog ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
$columnHeaderColorSorted : |
if ($bylog) { |
$columnHeaderColorDefault) . "\">"; |
print 'Last log entry'; |
print "<a href=\"./", toggleQuery("sortby","log"), "#dirlist\">" if (!$bylog); |
} else { |
print "Last log entry"; |
print &link('Last log entry', sprintf('./%s#dirlist', |
print "</a>" if (!$bylog); |
&toggleQuery("sortby", "log"))); |
|
} |
|
print "</th>"; |
print "</th>"; |
} |
} |
elsif ($use_descriptions) { |
elsif ($use_descriptions) { |
printf '<th align=left bgcolor="%s">', $columnHeaderColorDefault; |
print "<th align=left bgcolor=\"". $columnHeaderColorDefault . "\">"; |
print "Description"; |
print "Description"; |
$infocols++; |
$infocols++; |
} |
} |
Line 611 elsif (-d $fullname) { |
|
Line 548 elsif (-d $fullname) { |
|
closedir($dh); |
closedir($dh); |
} |
} |
|
|
my $hideAtticToggleLink = $input{'hideattic'} ? '' : |
my $hideAtticToggleLink = "<a href=\"./" . |
&link('[Hide]', sprintf('./%s#dirlist', |
&toggleQuery ("hideattic") . |
&toggleQuery ("hideattic"))); |
"#dirlist\">[Hide]</a>" if (!$input{'hideattic'}); |
|
|
# Sort without the Attic/ pathname. |
# Sort without the Attic/ pathname. |
# place directories first |
# place directories first |
Line 651 elsif (-d $fullname) { |
|
Line 588 elsif (-d $fullname) { |
|
next if ($_ eq '..' && $where eq '/'); |
next if ($_ eq '..' && $where eq '/'); |
my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} |
my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} |
if (defined($fileinfo{$_})); |
if (defined($fileinfo{$_})); |
printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable; |
print "<tr bgcolor=\"" . @tabcolors[$dirrow%2] . "\"><td>" if ($dirtable); |
if ($_ eq '..') { |
if ($_ eq '..') { |
$url = "../$query"; |
$url = "../" . $query; |
if ($nofilelinks) { |
if ($nofilelinks) { |
print $backicon; |
print $backicon; |
} |
} |
else { |
else { |
print &link($backicon, $url); |
print &link($backicon,$url); |
} |
} |
print " ", &link("Previous Directory", $url); |
print " ", &link("Previous Directory",$url); |
} |
} |
else { |
else { |
$url = urlencode($_) . "/$query"; |
$url = urlencode($_) . '/' . $query; |
print "<A NAME=\"$_\"></A>"; |
print "<A NAME=\"$_\"></A>"; |
if ($nofilelinks) { |
if ($nofilelinks) { |
print $diricon; |
print $diricon; |
} |
} |
else { |
else { |
print &link($diricon, $url); |
print &link($diricon,$url); |
} |
} |
print " ", &link("$_/", $url), $attic; |
print " ", &link($_ . "/", $url), $attic; |
if ($_ eq "Attic") { |
if ($_ eq "Attic") { |
print " "; |
print " <a href=\"./" . |
print &link("[Don't hide]", sprintf('./%s#dirlist', |
&toggleQuery ("hideattic") . |
&toggleQuery ("hideattic"))); |
"#dirlist\">[Don't hide]</a>"; |
} |
} |
} |
} |
# Show last change in dir |
# Show last change in dir |
if ($filename) { |
if ($filename) { |
print "</td><td> </td><td> " if ($dirtable); |
print "</td><td> </td><td> " if ($dirtable); |
if ($date) { |
if ($date) { |
print " <i>", readableTime(time() - $date,0), "</i>"; |
print " <i>" . readableTime(time() - $date,0) . "</i>"; |
} |
} |
if ($show_author) { |
if ($show_author) { |
print "</td><td> " if ($dirtable); |
print "</td><td> " if ($dirtable); |
Line 693 elsif (-d $fullname) { |
|
Line 630 elsif (-d $fullname) { |
|
print "$filename/$rev"; |
print "$filename/$rev"; |
print "<BR>" if ($dirtable); |
print "<BR>" if ($dirtable); |
if ($log) { |
if ($log) { |
print " <font size=-1>", |
print " <font size=-1>" |
&htmlify(substr($log,0,$shortLogLen)); |
. &htmlify(substr($log,0,$shortLogLen)); |
if (length $log > 80) { |
if (length $log > 80) { |
print "..."; |
print "..."; |
} |
} |
Line 704 elsif (-d $fullname) { |
|
Line 641 elsif (-d $fullname) { |
|
else { |
else { |
my ($dwhere) = ($where ne "/" ? $where : "") . $_; |
my ($dwhere) = ($where ne "/" ? $where : "") . $_; |
if ($use_descriptions && defined $descriptions{$dwhere}) { |
if ($use_descriptions && defined $descriptions{$dwhere}) { |
print "<TD COLSPAN=", ($infocols-1), "> " if $dirtable; |
print "<TD COLSPAN=" . ($infocols-1) . "> " if $dirtable; |
print $descriptions{$dwhere}; |
print $descriptions{$dwhere}; |
} elsif ($dirtable && $infocols > 1) { |
} elsif ($dirtable && $infocols > 1) { |
# close the row with the appropriate number of |
# close the row with the appropriate number of |
Line 735 elsif (-d $fullname) { |
|
Line 672 elsif (-d $fullname) { |
|
next if (!defined($fileinfo{$_})); |
next if (!defined($fileinfo{$_})); |
($rev,$date,$log,$author) = @{$fileinfo{$_}}; |
($rev,$date,$log,$author) = @{$fileinfo{$_}}; |
$filesfound++; |
$filesfound++; |
printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable; |
print "<tr bgcolor=\"" . @tabcolors[$dirrow%2] . "\"><td>" if ($dirtable); |
print "<A NAME=\"$_\"></A>"; |
print "<A NAME=\"$_\"></A>"; |
if ($nofilelinks) { |
if ($nofilelinks) { |
print $fileicon; |
print $fileicon; |
Line 746 elsif (-d $fullname) { |
|
Line 683 elsif (-d $fullname) { |
|
print " ", &link($_, $url), $attic; |
print " ", &link($_, $url), $attic; |
print "</td><td> " if ($dirtable); |
print "</td><td> " if ($dirtable); |
download_link($fileurl, |
download_link($fileurl, |
$rev, $rev, |
$rev, $rev, |
$defaultViewable ? "text/x-cvsweb-markup" : undef); |
$defaultViewable ? "text/x-cvsweb-markup" : undef); |
print "</td><td> " if ($dirtable); |
print "</td><td> " if ($dirtable); |
if ($date) { |
if ($date) { |
print " <i>", readableTime(time() - $date,0), "</i>"; |
print " <i>" . readableTime(time() - $date,0) . "</i>"; |
} |
} |
if ($show_author) { |
if ($show_author) { |
print "</td><td> " if ($dirtable); |
print "</td><td> " if ($dirtable); |
Line 758 elsif (-d $fullname) { |
|
Line 695 elsif (-d $fullname) { |
|
} |
} |
print "</td><td> " if ($dirtable); |
print "</td><td> " if ($dirtable); |
if ($log) { |
if ($log) { |
print " <font size=-1>", &htmlify(substr($log,0,$shortLogLen)); |
print " <font size=-1>" . &htmlify(substr($log,0,$shortLogLen)); |
if (length $log > 80) { |
if (length $log > 80) { |
print "..."; |
print "..."; |
} |
} |
Line 773 elsif (-d $fullname) { |
|
Line 710 elsif (-d $fullname) { |
|
if ($dirtable && defined($tableBorderColor)) { |
if ($dirtable && defined($tableBorderColor)) { |
print "</td></tr></table>"; |
print "</td></tr></table>"; |
} |
} |
print( $dirtable == 1 ? "</table>\n" : "</menu>\n" ); |
print "". ($dirtable == 1) ? "</table>" : "</menu>" . "\n"; |
|
|
if ($filesexists && !$filesfound) { |
if ($filesexists && !$filesfound) { |
print "<P><B>NOTE:</B> There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n"; |
print "<P><B>NOTE:</B> There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n"; |
Line 831 elsif (-d $fullname) { |
|
Line 768 elsif (-d $fullname) { |
|
print "<OPTION",$byrev ? " SELECTED" : ""," VALUE=rev>Revision"; |
print "<OPTION",$byrev ? " SELECTED" : ""," VALUE=rev>Revision"; |
print "<OPTION",$bylog ? " SELECTED" : ""," VALUE=log>Log message"; |
print "<OPTION",$bylog ? " SELECTED" : ""," VALUE=log>Log message"; |
print "</SELECT></td>"; |
print "</SELECT></td>"; |
print "<td>Sort log by: "; |
print "<td>revisions by: \n"; |
printLogSortSelect(0); |
print "<SELECT NAME=logsort>\n"; |
print "</td></tr>"; |
print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted"; |
|
print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date"; |
|
print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision"; |
|
print "</SELECT></td></tr>"; |
print "<tr><td>Diff format: "; |
print "<tr><td>Diff format: "; |
printDiffSelect(0); |
printDiffSelect(0); |
print "</td>"; |
print "</td>"; |
|
|
|
|
sub printDiffSelect($) { |
sub printDiffSelect($) { |
my ($use_java_script) = @_; |
my ($use_java_script) = @_; |
my $f = $input{'f'}; |
my ($f) = $input{'f'}; |
|
print "<SELECT NAME=\"f\""; |
print '<SELECT NAME="f"'; |
print " onchange=\"submit()\"" if ($use_java_script); |
print ' onchange="submit()"' if $use_java_script; |
print ">\n"; |
print '>'; |
print "<OPTION VALUE=h",$f eq "h" ? " SELECTED" : "", ">Colored Diff"; |
|
print "<OPTION VALUE=H",$f eq "H" ? " SELECTED" : "", ">Long Colored Diff"; |
local $_; |
print "<OPTION VALUE=u",$f eq "u" ? " SELECTED" : "", ">Unidiff"; |
for (@DIFFTYPES) { |
print "<OPTION VALUE=c",$f eq "c" ? " SELECTED" : "", ">Context Diff"; |
printf('<OPTION VALUE="%s"%s>%s', |
print "<OPTION VALUE=s",$f eq "s" ? " SELECTED" : "", ">Side by Side"; |
$_, |
|
$f eq $_ ? ' SELECTED' : '', |
|
"\u$DIFFTYPES{$_}{'descr'}" |
|
); |
|
} |
|
|
|
print "</SELECT>"; |
print "</SELECT>"; |
} |
} |
|
|
sub printLogSortSelect($) { |
|
my ($use_java_script) = @_; |
|
|
|
print '<SELECT NAME="logsort"'; |
|
print ' onchange="submit()"' if $use_java_script; |
|
print '>'; |
|
|
|
local $_; |
|
for (@LOGSORTKEYS) { |
|
printf('<OPTION VALUE="%s"%s>%s', |
|
$_, |
|
$logsort eq $_ ? ' SELECTED' : '', |
|
"\u$LOGSORTKEYS{$_}{'descr'}" |
|
); |
|
} |
|
|
|
print "</SELECT>"; |
|
} |
|
|
|
sub findLastModifiedSubdirs(@) { |
sub findLastModifiedSubdirs(@) { |
my (@dirs) = @_; |
my (@dirs) = @_; |
my ($dirname, @files); |
my ($dirname, @files); |
Line 998 sub findLastModifiedSubdirs(@) { |
|
Line 913 sub findLastModifiedSubdirs(@) { |
|
return @files; |
return @files; |
} |
} |
|
|
sub htmlify_sub(&$) { |
|
(my $proc, local $_) = @_; |
|
local @_ = split(m`(<a [^>]+>[^<]*</a>)`i); |
|
my $linked; |
|
my $result = ''; |
|
|
|
while (($_, $linked) = splice(@_, 0, 2)) { |
|
&$proc(); |
|
$result .= $_ if defined($_); |
|
$result .= $linked if defined($linked); |
|
} |
|
|
|
$result; |
|
} |
|
|
|
sub htmlify($;$) { |
sub htmlify($;$) { |
(local $_, my $extra) = @_; |
my($string, $extra) = @_; |
|
|
$_ = htmlquote($_); |
# Special Characters; RFC 1866 |
|
$string =~ s/&/&/g; |
|
$string =~ s/\"/"/g; |
|
$string =~ s/</</g; |
|
$string =~ s/>/>/g; |
|
|
# get URL's as link |
# get URL's as link .. |
s{ |
$string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`<A HREF="$1$2$3">$1$2$3</A>`g; # ` |
(http|ftp|https)://\S+ |
# get e-mails as link |
}{ |
$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`g; # ` |
&link($&, htmlunquote($&)) |
|
}egx; |
|
|
|
# get e-mails as link |
if ($extra) { |
$_ = htmlify_sub { |
# get PR #'s as link .. |
s< |
if (defined($prcgi)) { |
[\w+=\-.!]+@[\w\-]+(\.[\w\-]+)+ |
1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1 . &link($2, sprintf($prcgi, $2))`ie; # ` |
>< |
$string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo; # ` |
&link($&, "mailto:$&") |
} |
>egix; |
|
} $_; |
|
|
|
if ($extra) { |
# get manpage specs as link .. |
# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn" |
if (defined($mancgi)) { |
if (defined($prcgi)) { |
$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`&link($&, sprintf($mancgi, $2, $1))`ge; # ` |
my $prev; |
} |
|
|
do { |
|
$prev = $_; |
|
|
|
$_ = htmlify_sub { |
|
s{ |
|
(\bPR[:\#]?\s* |
|
(?: |
|
\#? |
|
\d+[,\s]\s* |
|
)* |
|
\#?) |
|
(\d+)\b |
|
}{ |
|
$1 . &link($2, sprintf($prcgi, $2)) . $3 |
|
}egix; |
|
} $_; |
|
} while ($_ ne $prev); |
|
|
|
$_ = htmlify_sub { |
|
s{ |
|
(\b$prcategories/(\d+)\b) |
|
}{ |
|
&link($1, sprintf($prcgi, $2)) . $3 |
|
}egox; |
|
} $_; |
|
} |
} |
|
|
# get manpage specs as link: "foo.1" "foo(1)" |
return $string; |
if (defined($mancgi)) { |
|
$_ = htmlify_sub { |
|
s{ |
|
(\b([a-zA-Z][\w_.]+) |
|
(?: |
|
\( ([0-9n]) \)\B |
|
| |
|
\.([0-9n])\b |
|
) |
|
) |
|
}{ |
|
&link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5 |
|
}egx; |
|
} $_; |
|
} |
|
} |
|
|
|
$_; |
|
} |
} |
|
|
sub spacedHtmlText($;$) { |
sub spacedHtmlText($;$) { |
Line 1120 sub spacedHtmlText($;$) { |
|
Line 976 sub spacedHtmlText($;$) { |
|
sub link($$) { |
sub link($$) { |
my($name, $where) = @_; |
my($name, $where) = @_; |
|
|
sprintf '<A HREF="%s">%s</A>', htmlquote($where), $name; |
return "<A HREF=\"$where\">$name</A>\n"; |
} |
} |
|
|
sub revcmp($$) { |
sub revcmp($$) { |
Line 1168 sub redirect($) { |
|
Line 1024 sub redirect($) { |
|
print "Location: $url\r\n"; |
print "Location: $url\r\n"; |
} |
} |
html_header("Moved"); |
html_header("Moved"); |
print "This document is located ", &link('here', $url), "\n"; |
print "This document is located <A HREF=$url>here</A>.\n"; |
print &html_footer; |
print &html_footer; |
exit(1); |
exit(1); |
} |
} |
Line 1194 sub safeglob($) { |
|
Line 1050 sub safeglob($) { |
|
$glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg; |
$glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg; |
foreach (readdir($dh)) { |
foreach (readdir($dh)) { |
if (/^${glob}$/) { |
if (/^${glob}$/) { |
push(@results, "$dirname/" .$_); |
push(@results, $dirname . "/" .$_); |
} |
} |
} |
} |
} |
} |
Line 1285 sub doAnnotate($$) { |
|
Line 1141 sub doAnnotate($$) { |
|
($pathname = $where) =~ s/(Attic\/)?[^\/]*$//; |
($pathname = $where) =~ s/(Attic\/)?[^\/]*$//; |
($filename = $where) =~ s/^.*\///; |
($filename = $where) =~ s/^.*\///; |
|
|
|
http_header(); |
|
|
|
navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate"); |
|
print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n"; |
|
|
# this seems to be necessary |
# this seems to be necessary |
$| = 1; $| = 0; # Flush |
$| = 1; $| = 0; # Flush |
|
|
Line 1294 sub doAnnotate($$) { |
|
Line 1155 sub doAnnotate($$) { |
|
# the public domain. |
# the public domain. |
# we could abandon the use of rlog, rcsdiff and co using |
# we could abandon the use of rlog, rcsdiff and co using |
# the cvsserver in a similiar way one day (..after rewrite) |
# the cvsserver in a similiar way one day (..after rewrite) |
$pid = open2($reader, $writer, "cvs -Rl server") || fatal ("500 Internal Error", |
$pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error", |
"Fatal Error - unable to open cvs for annotation"); |
"Fatal Error - unable to open cvs for annotation"); |
|
|
# OK, first send the request to the server. A simplified example is: |
# OK, first send the request to the server. A simplified example is: |
Line 1346 sub doAnnotate($$) { |
|
Line 1207 sub doAnnotate($$) { |
|
# were nicer about buffering, then we could just leave it open, I think. |
# were nicer about buffering, then we could just leave it open, I think. |
close ($writer) || die "cannot close: $!"; |
close ($writer) || die "cannot close: $!"; |
|
|
http_header(); |
|
|
|
navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate"); |
|
print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n"; |
|
|
|
# Ready to get the responses from the server. |
# Ready to get the responses from the server. |
# For example: |
# For example: |
# E Annotations for foo/xx |
# E Annotations for foo/xx |
Line 1383 sub doAnnotate($$) { |
|
Line 1239 sub doAnnotate($$) { |
|
} |
} |
elsif ($words[0] eq "M") { |
elsif ($words[0] eq "M") { |
$lineNr++; |
$lineNr++; |
(my $lrev = substr($_, 2, 13)) =~ y/ //d; |
my $lrev = substr ($_, 2, 13); |
(my $lusr = substr($_, 16, 9)) =~ y/ //d; |
my $lusr = substr ($_, 16, 9); |
my $line = substr($_, 36); |
my $line = substr ($_, 36); |
my $isCurrentRev = ($rev eq $lrev); |
|
# we should parse the date here .. |
# we should parse the date here .. |
if ($lrev eq $oldLrev) { |
if ($lrev eq $oldLrev) { |
$revprint = sprintf('%-8s', ''); |
$revprint = " "; |
} |
} |
else { |
else { |
$revprint = sprintf('%-8s', $lrev); |
$revprint = $lrev; $oldLusr = ""; |
$revprint =~ s`\S+`&link($&, "$scriptwhere$query#rev$&")`e; # ` |
$revprint =~ s`^(\S+)`<a href="${scriptwhere}${barequery}#rev$1">$1</A>`; # ` |
$oldLusr = ''; |
|
} |
} |
if ($lusr eq $oldLusr) { |
if ($lusr eq $oldLusr) { |
$usrprint = ''; |
$usrprint = " "; |
} |
} |
else { |
else { |
$usrprint = $lusr; |
$usrprint = $lusr; |
} |
} |
$oldLrev = $lrev; |
$oldLrev = $lrev; |
$oldLusr = $lusr; |
$oldLusr = $lusr; |
|
# is there a less timeconsuming way to strip spaces ? |
|
($lrev = $lrev) =~ s/\s+//g; |
|
my $isCurrentRev = ($rev eq $lrev); |
|
|
# Set bold for text-based browsers only - graphical |
print "<b>" if ($isCurrentRev); |
# browsers show bold fonts a bit wider than regular fonts, |
printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr); |
# so it looks irregular. |
|
print "<b>" if ($isCurrentRev && $is_textbased); |
|
|
|
printf "%s%s %-8s %4d:", |
|
$revprint, |
|
$isCurrentRev ? '!' : ' ', |
|
$usrprint, |
|
$lineNr; |
|
print spacedHtmlText($line, $d{'tabstop'}); |
print spacedHtmlText($line, $d{'tabstop'}); |
|
print "</b>" if ($isCurrentRev); |
print "</b>" if ($isCurrentRev && $is_textbased); |
|
} |
} |
elsif ($words[0] eq "ok") { |
elsif ($words[0] eq "ok") { |
# We could complain about any text received after this, like the |
# We could complain about any text received after this, like the |
# CVS command line client. But for simplicity, we don't. |
# CVS command line client. But for simplicity, we don't. |
} |
} |
elsif ($words[0] eq "error") { |
elsif ($words[0] eq "error") { |
fatal("500 Internal Error", "Error occured during annotate: <b>$_</b>"); |
fatal ("500 Internal Error", "Error occured during annotate: <b>$_</b>"); |
} |
} |
} |
} |
if ($annTable) { |
if ($annTable) { |
Line 1541 sub cvswebMarkup($$$) { |
|
Line 1389 sub cvswebMarkup($$$) { |
|
print "<HR noshade>"; |
print "<HR noshade>"; |
print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">"; |
print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">"; |
print "File: ", &clickablePath($where, 1); |
print "File: ", &clickablePath($where, 1); |
print " ("; |
print " "; |
&download_link($fileurl, $revision, "download"); |
&download_link(urlencode($fileurl), $revision, "(download)"); |
print ")"; |
|
if (!$defaultTextPlain) { |
if (!$defaultTextPlain) { |
print " ("; |
print " "; |
&download_link($fileurl, $revision, "as text", |
&download_link(urlencode($fileurl), $revision, "(as text)", |
"text/plain"); |
"text/plain"); |
print ")"; |
|
} |
} |
print "<BR>\n"; |
print "<BR>\n"; |
if ($show_log_in_markup) { |
if ($show_log_in_markup) { |
Line 1564 sub cvswebMarkup($$$) { |
|
Line 1410 sub cvswebMarkup($$$) { |
|
my $url = download_url($fileurl, $revision, $mimetype); |
my $url = download_url($fileurl, $revision, $mimetype); |
print "<HR noshade>"; |
print "<HR noshade>"; |
if ($mimetype =~ /^image/) { |
if ($mimetype =~ /^image/) { |
printf '<IMG SRC="%s"><BR>', htmlquote("$url$barequery"); |
print "<IMG SRC=\"$url$barequery\"><BR>"; |
} |
} |
elsif ($mimetype =~ m%^application/pdf%) { |
elsif ($mimetype =~ m%^application/pdf%) { |
printf '<EMBED SRC="%s" WIDTH="100%"><BR>', htmlquote("$url$barequery"); |
print "<EMBED SRC=\"$url$barequery\" WIDTH=\"100%\"><BR>"; |
} |
} |
else { |
else { |
print "<PRE>"; |
print "<PRE>"; |
Line 1598 sub viewable($) { |
|
Line 1444 sub viewable($) { |
|
sub doDiff($$$$$$) { |
sub doDiff($$$$$$) { |
my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_; |
my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_; |
my $fh = do {local(*FH);}; |
my $fh = do {local(*FH);}; |
my ($rev1, $rev2, $sym1, $sym2, $f1, $f2); |
my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2); |
|
|
if ($r1 =~ /([^:]+)(:(.+))?/) { |
if ($r1 =~ /([^:]+)(:(.+))?/) { |
$rev1 = $1; |
$rev1 = $1; |
Line 1632 sub doDiff($$$$$$) { |
|
Line 1478 sub doDiff($$$$$$) { |
|
($rev1, $sym1) = ($rev2, $sym2); |
($rev1, $sym1) = ($rev2, $sym2); |
($rev2, $sym2) = ($tmp1, $tmp2); |
($rev2, $sym2) = ($tmp1, $tmp2); |
} |
} |
my $difftype = $DIFFTYPES{$f}; |
my $human_readable = 0; |
|
if ($f eq 'c') { |
if (!$difftype) { |
@difftype = qw{-c}; |
|
$diffname = "Context diff"; |
|
} |
|
elsif ($f eq 's') { |
|
@difftype = qw{--side-by-side --width=164}; |
|
$diffname = "Side by Side"; |
|
} |
|
elsif ($f eq 'H') { |
|
$human_readable = 1; |
|
@difftype = qw{--unified=15}; |
|
$diffname = "Long Human readable"; |
|
} |
|
elsif ($f eq 'h') { |
|
@difftype =qw{-u}; |
|
$human_readable = 1; |
|
$diffname = "Human readable"; |
|
} |
|
elsif ($f eq 'u') { |
|
@difftype = qw{-u}; |
|
$diffname = "Unidiff"; |
|
} |
|
else { |
fatal ("400 Bad arguments", "Diff format $f not understood"); |
fatal ("400 Bad arguments", "Diff format $f not understood"); |
} |
} |
|
|
my @difftype = @{$difftype->{'opts'}}; |
|
my $human_readable = $difftype->{'colored'}; |
|
|
|
# apply special options |
# apply special options |
if ($showfunc) { |
if ($showfunc) { |
push @difftype, '-p' if $f ne 's'; |
push @difftype, '-p' if $f =~ /^[cHhu]$/; |
|
|
my($re1, $re2); |
my($re1, $re2); |
|
|
Line 1705 sub doDiff($$$$$$) { |
|
Line 1569 sub doDiff($$$$$$) { |
|
s|$cvsroot/||o; |
s|$cvsroot/||o; |
if ($sym1) { |
if ($sym1) { |
chop; |
chop; |
$_ .= " $sym1\n"; |
$_ .= " " . $sym1 . "\n"; |
} |
} |
} |
} |
elsif (m|^$f2 $cvsroot|o) { |
elsif (m|^$f2 $cvsroot|o) { |
s|$cvsroot/||o; |
s|$cvsroot/||o; |
if ($sym2) { |
if ($sym2) { |
chop; |
chop; |
$_ .= " $sym2\n"; |
$_ .= " " . $sym2 . "\n"; |
} |
} |
} |
} |
print $_; |
print $_; |
|
|
if ($state eq "tags" && /^\S/) { |
if ($state eq "tags" && /^\S/) { |
if (defined($tag) && (defined($symrev{$tag}) || $tag eq "HEAD")) { |
if (defined($tag) && (defined($symrev{$tag}) || $tag eq "HEAD")) { |
$revwanted = $tag eq "HEAD" ? $symrev{"MAIN"} : $symrev{$tag}; |
$revwanted = $tag eq "HEAD" ? $symrev{"MAIN"} : $symrev{$tag}; |
($branch = $revwanted) =~ s/\.0\././; |
($branch = $revwanted) =~ s/\b0\.//; |
($branchpoint = $branch) =~ s/\.?\d+$//; |
($branchpoint = $branch) =~ s/\.?\d+$//; |
$revwanted = undef if ($revwanted ne $branch); |
$revwanted = undef if ($revwanted ne $branch); |
} |
} |
|
|
$state = "head"; |
$state = "head"; |
goto again; |
goto again; |
} |
} |
if ($state eq "head" && /$LOG_REVSEPARATOR/o) { |
if ($state eq "head" && /^----------------------------$/) { |
$state = "log"; |
$state = "log"; |
$rev = undef; |
$rev = undef; |
$date = undef; |
$date = undef; |
|
|
next; |
next; |
} |
} |
if ($state eq "log") { |
if ($state eq "log") { |
if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) { |
if (/^----------------------------$/ |
|
|| /^=============================/) { |
# End of a log entry. |
# End of a log entry. |
my $revbranch; |
my $revbranch; |
($revbranch = $rev) =~ s/\.\d+$//; |
($revbranch = $rev) =~ s/\.\d+$//; |
print "$filename $rev Wanted: $revwanted ", |
print "$filename $rev Wanted: $revwanted " |
"Revbranch: $revbranch Branch: $branch ", |
. "Revbranch: $revbranch Branch: $branch " |
"Branchpoint: $branchpoint\n" if ($verbose); |
. "Branchpoint: $branchpoint\n" if ($verbose); |
if (!defined($revwanted) && defined($branch) |
if (!defined($revwanted) && defined($branch) |
&& $branch eq $revbranch || !defined($tag)) { |
&& $branch eq $revbranch || !defined($tag)) { |
print "File revision $rev found for branch $branch\n" |
print "File revision $rev found for branch $branch\n" |
|
|
next; |
next; |
} |
} |
else { |
else { |
$log .= $_; |
$log = $log . $_; |
} |
} |
} |
} |
if (/$LOG_FILESEPARATOR/o) { |
if (/^===============/) { |
$state = "start"; |
$state = "start"; |
next; |
next; |
} |
} |
Line 1951 sub readLog($;$) { |
|
Line 1816 sub readLog($;$) { |
|
# log info |
# log info |
# ---------------------------- |
# ---------------------------- |
logentry: |
logentry: |
while (!/$LOG_FILESEPARATOR/o) { |
while (!/^=========/) { |
$_ = <$fh>; |
$_ = <$fh>; |
last logentry if (!defined($_)); # EOF |
last logentry if (!defined($_)); # EOF |
print "R:", $_ if ($verbose); |
print "R:", $_ if ($verbose); |
Line 1959 sub readLog($;$) { |
|
Line 1824 sub readLog($;$) { |
|
$rev = $1; |
$rev = $1; |
unshift(@allrevisions,$rev); |
unshift(@allrevisions,$rev); |
} |
} |
elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) { |
elsif (/^========/ || /^----------------------------$/) { |
next logentry; |
next logentry; |
} |
} |
else { |
else { |
Line 1993 sub readLog($;$) { |
|
Line 1858 sub readLog($;$) { |
|
while (<$fh>) { |
while (<$fh>) { |
print "L:", $_ if ($verbose); |
print "L:", $_ if ($verbose); |
next line if (/^branches:\s/); |
next line if (/^branches:\s/); |
last line if (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o); |
last line if (/^----------------------------$/ || /^=========/); |
$log{$rev} .= $_; |
$log{$rev} .= $_; |
} |
} |
print "E:", $_ if ($verbose); |
print "E:", $_ if ($verbose); |
Line 2034 sub readLog($;$) { |
|
Line 1899 sub readLog($;$) { |
|
|
|
foreach (reverse sort keys %symrev) { |
foreach (reverse sort keys %symrev) { |
$rev = $symrev{$_}; |
$rev = $symrev{$_}; |
if ($rev =~ /^((.*)\.)0\.(\d+)$/) { |
if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) { |
push(@branchnames, $_); |
push(@branchnames, $_); |
# |
# |
# A revision number of A.B.0.D really translates into |
# A revision number of A.B.0.D really translates into |
Line 2047 sub readLog($;$) { |
|
Line 1912 sub readLog($;$) { |
|
# with the branch number 0.A, with the exception that |
# with the branch number 0.A, with the exception that |
# it has no head to translate to if there is nothing on |
# it has no head to translate to if there is nothing on |
# the branch, but I guess this can never happen? |
# the branch, but I guess this can never happen? |
|
# (the code below gracefully forgets about the branch |
|
# if it should happen) |
# |
# |
# Since some stupid people actually import/check in |
|
# files with version 0.X we assume that the above cannot |
|
# happen, and regard 0.X(.*) as a revision and not a branch. |
|
# |
|
$head = defined($2) ? $2 : ""; |
$head = defined($2) ? $2 : ""; |
$branch = $3; |
$branch = $3; |
$branchrev = $head . ($head ne "" ? "." : "") . $branch; |
$branchrev = $head . ($head ne "" ? "." : "") . $branch; |
Line 2081 sub readLog($;$) { |
|
Line 1944 sub readLog($;$) { |
|
my ($onlyonbranch, $onlybranchpoint); |
my ($onlyonbranch, $onlybranchpoint); |
if ($onlyonbranch = $input{'only_with_tag'}) { |
if ($onlyonbranch = $input{'only_with_tag'}) { |
$onlyonbranch = $symrev{$onlyonbranch}; |
$onlyonbranch = $symrev{$onlyonbranch}; |
if ($onlyonbranch =~ s/\.0\././) { |
if ($onlyonbranch =~ s/\b0\.//) { |
($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//; |
($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//; |
} |
} |
else { |
else { |
Line 2119 sub readLog($;$) { |
|
Line 1982 sub readLog($;$) { |
|
|
|
} |
} |
|
|
sub printDiffLinks($$) { |
|
my($text, $url) = @_; |
|
my @extra; |
|
|
|
local $_; |
|
for ($DIFFTYPES{$defaultDiffType}{'colored'} ? qw(u) : qw(h)) { |
|
my $f = $_ eq $defaultDiffType ? '' : $_; |
|
|
|
push @extra, &link(lc $DIFFTYPES{$_}{'descr'}, "$url&f=$f"); |
|
} |
|
|
|
print &link($text, $url), ' (', join(', ', @extra), ')'; |
|
} |
|
|
|
sub printLog($;$) { |
sub printLog($;$) { |
my ($link, $br, $brp); |
my ($link, $br, $brp); |
($_,$link) = @_; |
($_,$link) = @_; |
Line 2161 sub printLog($;$) { |
|
Line 2010 sub printLog($;$) { |
|
} |
} |
print "\n Revision "; |
print "\n Revision "; |
&download_link($fileurl, $_, $_, |
&download_link($fileurl, $_, $_, |
$defaultViewable ? "text/x-cvsweb-markup" : undef); |
$defaultViewable ? "text/x-cvsweb-markup" : undef); |
if ($defaultViewable) { |
if ($defaultViewable) { |
print " / ("; |
print " / "; |
&download_link($fileurl, $_, "download", $mimetype); |
&download_link($fileurl, $_, "(download)", $mimetype); |
print ")"; |
|
} |
} |
if (not $defaultTextPlain) { |
if (not $defaultTextPlain) { |
print " / ("; |
print " / "; |
&download_link($fileurl, $_, "as text", "text/plain"); |
&download_link($fileurl, $_, "(as text)", |
print ")"; |
"text/plain"); |
} |
} |
if (!$defaultViewable) { |
if (!$defaultViewable) { |
print " / ("; |
print " / "; |
&download_link($fileurl, $_, "view", "text/x-cvsweb-markup"); |
&download_link($fileurl, $_, "(view)", "text/x-cvsweb-markup"); |
print ")"; |
|
} |
} |
if ($allow_annotate) { |
if ($allow_annotate) { |
print " - "; |
print " - <a href=\"" . $scriptname . "/" . urlencode($where) . "?annotate=$_$barequery\">"; |
print &link('annotate', |
print "annotate</a>"; |
sprintf('%s/%s?annotate=%s%s', |
|
$scriptname, |
|
urlencode($where), |
|
$_, |
|
$barequery)); |
|
} |
} |
# Plus a select link if enabled, and this version isn't selected |
# Plus a select link if enabled, and this version isn't selected |
if ($allow_version_select) { |
if ($allow_version_select) { |
if ((!defined($input{"r1"}) || $input{"r1"} ne $_)) { |
if ((!defined($input{"r1"}) || $input{"r1"} ne $_)) { |
print " - "; |
print " - <A HREF=\"${scriptwhere}?r1=$_$barequery" . |
print &link('[select for diffs]', |
"\">[select for diffs]</A>\n"; |
sprintf('%s?r1=%s%s', |
|
$scriptwhere, |
|
$_, |
|
$barequery)); |
|
} |
} |
else { |
else { |
print " - <b>[selected]</b>"; |
print " - <b>[selected]</b>"; |
Line 2209 sub printLog($;$) { |
|
Line 2047 sub printLog($;$) { |
|
} |
} |
if (defined @mytz) { |
if (defined @mytz) { |
my ($est) = $mytz[(localtime($date{$_}))[8]]; |
my ($est) = $mytz[(localtime($date{$_}))[8]]; |
print ", <i>", scalar localtime($date{$_}), " $est</i> ("; |
print ", <i>" . scalar localtime($date{$_}) . " $est</i> ("; |
} else { |
} else { |
print ", <i>", scalar gmtime($date{$_}), " UTC</i> ("; |
print ", <i>" . scalar gmtime($date{$_}) . " UTC</i> ("; |
} |
} |
print readableTime(time() - $date{$_},1), " ago)"; |
print readableTime(time() - $date{$_},1) . " ago)"; |
print " by "; |
print " by "; |
print "<i>", $author{$_}, "</i>\n"; |
print "<i>" . $author{$_} . "</i>\n"; |
print "<BR>Branch: <b>",$link?link_tags($revsym{$br}):$revsym{$br},"</b>\n" |
print "<BR>Branch: <b>",$link?link_tags($revsym{$br}):$revsym{$br},"</b>\n" |
if ($revsym{$br}); |
if ($revsym{$br}); |
print "<BR>CVS Tags: <b>",$link?link_tags($revsym{$_}):$revsym{$_},"</b>" |
print "<BR>CVS Tags: <b>",$link?link_tags($revsym{$_}):$revsym{$_},"</b>" |
Line 2249 sub printLog($;$) { |
|
Line 2087 sub printLog($;$) { |
|
# Offer diff to previous revision |
# Offer diff to previous revision |
if ($prev) { |
if ($prev) { |
$diffrev{$prev} = 1; |
$diffrev{$prev} = 1; |
|
print " to previous <A HREF=\"${scriptwhere}.diff?r1=$prev"; |
my $url = sprintf('%s.diff?r1=%s&r2=%s%s', |
print "&r2=$_" . $barequery . "\">$prev</A>\n"; |
$scriptwhere, |
if (!$hr_default) { # offer a human readable version if not default |
$prev, |
print "(<A HREF=\"${scriptwhere}.diff?r1=$prev"; |
$_, |
print "&r2=$_" . $barequery . "&f=h\">colored</A>)\n"; |
$barequery); |
} |
|
|
print " to previous "; |
|
printDiffLinks($prev, $url); |
|
} |
} |
# |
# |
# Plus, if it's on a branch, and it's not a vendor branch, |
# Plus, if it's on a branch, and it's not a vendor branch, |
# offer a diff with the branch point. |
# offer a diff with the branch point. |
if ($revsym{$brp} && !/^1\.1\.1\.\d+$/ && !defined($diffrev{$brp})) { |
if ($revsym{$brp} && !/^1\.1\.1\.\d+$/ && !defined($diffrev{$brp})) { |
my $url = sprintf('%s.diff?r1=%s&r2=%s%s', |
print " to branchpoint <A HREF=\"${scriptwhere}.diff?r1=$brp"; |
$scriptwhere, |
print "&r2=$_" . $barequery . "\">$brp</A>\n"; |
$brp, |
if (!$hr_default) { # offer a human readable version if not default |
$_, |
print "(<A HREF=\"${scriptwhere}.diff?r1=$brp"; |
$barequery); |
print "&r2=$_" . $barequery . "&f=h\">colored</A>)\n"; |
|
} |
print " to branchpoint "; |
|
printDiffLinks($brp, $url); |
|
} |
} |
# |
# |
# Plus, if it's on a branch, and it's not a vendor branch, |
# Plus, if it's on a branch, and it's not a vendor branch, |
Line 2295 sub printLog($;$) { |
|
Line 2128 sub printLog($;$) { |
|
} |
} |
if (!defined($diffrev{$nextmain})) { |
if (!defined($diffrev{$nextmain})) { |
$diffrev{$nextmain} = 1; |
$diffrev{$nextmain} = 1; |
|
print " next main <A HREF=\"${scriptwhere}.diff?r1=$nextmain"; |
my $url = sprintf('%s.diff?r1=%s&r2=%s%s', |
print "&r2=$_" . $barequery . |
$scriptwhere, |
"\">$nextmain</A>\n"; |
$nextmain, |
if (!$hr_default) { # offer a human readable version if not default |
$_, |
print "(<A HREF=\"${scriptwhere}.diff?r1=$nextmain"; |
$barequery); |
print "&r2=$_" . $barequery . |
|
"&f=h\">colored</A>)\n"; |
print " next main "; |
} |
printDiffLinks($nextmain, $url); |
|
} |
} |
} |
} |
# Plus if user has selected only r1, then present a link |
# Plus if user has selected only r1, then present a link |
# to make a diff to that revision |
# to make a diff to that revision |
if (defined($input{"r1"}) && !defined($diffrev{$input{"r1"}})) { |
if (defined($input{"r1"}) && !defined($diffrev{$input{"r1"}})) { |
$diffrev{$input{"r1"}} = 1; |
$diffrev{$input{"r1"}} = 1; |
|
print " to selected <A HREF=\"${scriptwhere}.diff?" |
|
. "r1=$input{'r1'}&r2=$_" . $barequery |
|
. "\">$input{'r1'}</A>\n"; |
|
if (!$hr_default) { # offer a human readable version if not default |
|
print "(<A HREF=\"${scriptwhere}.diff?r1=$input{'r1'}"; |
|
print "&r2=$_" . $barequery . |
|
"&f=h\">colored</A>)\n"; |
|
|
my $url = sprintf('%s.diff?r1=%s&r2=%s%s', |
} |
$scriptwhere, |
|
$input{'r1'}, |
|
$_, |
|
$barequery); |
|
|
|
print " to selected "; |
|
printDiffLinks($input{'r1'}, $url); |
|
} |
} |
} |
} |
print "<PRE>\n"; |
print "<PRE>\n"; |
|
|
($filename = $where) =~ s|^.*/||; |
($filename = $where) =~ s|^.*/||; |
$backurl = $scriptname . "/" . urlencode($upwhere) . $query; |
$backurl = $scriptname . "/" . urlencode($upwhere) . $query; |
print &link($backicon, "$backurl#$filename"), |
print &link($backicon, "$backurl#$filename"), |
" <b>Up to ", &clickablePath($upwhere, 1), "</b><p>\n"; |
" <b>Up to ", &clickablePath($upwhere, 1), "</b><p>\n"; |
print &link('Request diff between arbitrary revisions', '#diff'); |
print <<EOF; |
print '<HR NOSHADE>'; |
<A HREF="#diff">Request diff between arbitrary revisions</A> |
|
<HR NOSHADE> |
|
EOF |
if ($curbranch) { |
if ($curbranch) { |
print "Default branch: ", ($revsym{$curbranch} || $curbranch); |
print "Default branch: ", ($revsym{$curbranch} || $curbranch); |
} |
} |
|
|
print "</A><P>\n"; |
print "</A><P>\n"; |
print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\" NAME=\"diff_select\">\n"; |
print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\" NAME=\"diff_select\">\n"; |
foreach (@stickyvars) { |
foreach (@stickyvars) { |
printf('<INPUT TYPE=HIDDEN NAME="%s" VALUE="%s">', $_, $input{$_}) |
print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n" |
if (defined($input{$_}) |
if (defined($input{$_}) |
&& ((!defined($DEFAULTVALUE{$_}) |
&& ((!defined($DEFAULTVALUE{$_}) |
|| $input{$_} ne $DEFAULTVALUE{$_}) |
|| $input{$_} ne $DEFAULTVALUE{$_}) |
|
|
print "<HR noshade>\n"; |
print "<HR noshade>\n"; |
print "<TABLE>"; |
print "<TABLE>"; |
print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n"; |
print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n"; |
print "<TR><TD align=right>Preferred Diff type:</TD>"; |
print "<TR><TD align=right>Preferred Diff type:</TD>"; |
print "<TD>"; |
print "<TD>"; |
printDiffSelect($use_java_script); |
printDiffSelect($use_java_script); |
print "</TD><TD></TD></TR>\n"; |
print "</TD><TD></TD></TR>\n"; |
if (@branchnames) { |
if (@branchnames) { |
|
|
print "<TR><TD align=right>"; |
print "<TR><TD align=right>"; |
print "<A name=logsort></A>\n"; |
print "<A name=logsort></A>\n"; |
print "Sort log by:</TD>"; |
print "Sort log by:</TD>"; |
print "<TD>"; |
print "<TD><SELECT NAME=\"logsort\""; |
printLogSortSelect($use_java_script); |
print " onchange=\"submit()\"" if ($use_java_script); |
print "</TD>"; |
print ">\n"; |
|
print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted"; |
|
print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date"; |
|
print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision"; |
|
print "</SELECT></TD>"; |
print "<TD><INPUT TYPE=SUBMIT VALUE=\" Set \"></TD>"; |
print "<TD><INPUT TYPE=SUBMIT VALUE=\" Set \"></TD>"; |
print "</FORM>\n"; |
print "</FORM>\n"; |
print "</TR></TABLE>"; |
print "</TR></TABLE>"; |
Line 2506 sub human_readable_diff($){ |
|
Line 2343 sub human_readable_diff($){ |
|
$date2 = $r2d; |
$date2 = $r2d; |
} |
} |
|
|
print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n", |
print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n"; |
"<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n", |
|
"<tr bgcolor=\"#ffffff\">\n", |
print "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n"; |
"<th width=\"50%\" valign=TOP>", |
print "<tr bgcolor=\"#ffffff\">\n"; |
"version $rev1"; |
print "<th width=\"50%\" valign=TOP>"; |
|
print "version $rev1"; |
print ", $date1" if (defined($date1)); |
print ", $date1" if (defined($date1)); |
print "<br>Tag: $sym1\n" if ($sym1); |
print "<br>Tag: $sym1\n" if ($sym1); |
print "</th>\n", |
print "</th>\n"; |
"<th width=\"50%\" valign=TOP>", |
print "<th width=\"50%\" valign=TOP>"; |
"version $rev2"; |
print "version $rev2"; |
print ", $date2" if (defined($date2)); |
print ", $date2" if (defined($date2)); |
print "<br>Tag: $sym2\n" if ($sym1); |
print "<br>Tag: $sym2\n" if ($sym1); |
print "</th>\n"; |
print "</th>\n"; |
Line 2640 sub navigateHeader($$$$$) { |
|
Line 2478 sub navigateHeader($$$$$) { |
|
$swhere = urlencode($filename) if ($swhere eq ""); |
$swhere = urlencode($filename) if ($swhere eq ""); |
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"; |
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"; |
print "<HTML>\n<HEAD>\n"; |
print "<HTML>\n<HEAD>\n"; |
print '<!-- CVSweb $zRevision: 1.104 $ $kRevision: 1.39 $ -->'; |
print '<!-- CVSweb $zRevision: 1.103 $ $Revision$ -->'; |
print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n"; |
print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n"; |
print "$body_tag_for_src\n"; |
print "$body_tag_for_src\n"; |
print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">"; |
print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">"; |
print "<tr valign=bottom><td>"; |
print "<tr valign=bottom><td>"; |
print &link($backicon, "$swhere$query#rev$rev"); |
print "<a href=\"$swhere$query#rev$rev\">$backicon"; |
print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log"; |
print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log"; |
print "</b> $fileicon</td>"; |
print "</b> $fileicon</td>"; |
|
|
Line 2656 sub navigateHeader($$$$$) { |
|
Line 2494 sub navigateHeader($$$$$) { |
|
sub plural_write($$) { |
sub plural_write($$) { |
my ($num,$text) = @_; |
my ($num,$text) = @_; |
if ($num != 1) { |
if ($num != 1) { |
$text .= "s"; |
$text = $text . "s"; |
} |
} |
if ($num > 0) { |
if ($num > 0) { |
return join(' ', $num, $text); |
return $num . " " . $text; |
} |
} |
else { |
else { |
return ""; |
return ""; |
Line 2703 sub readableTime($$) { |
|
Line 2541 sub readableTime($$) { |
|
my $resttime = plural_write(int ($rest / $break), |
my $resttime = plural_write(int ($rest / $break), |
$desc{$break}); |
$desc{$break}); |
if ($resttime) { |
if ($resttime) { |
$retval .= ", $resttime"; |
$retval = $retval . ", " . $resttime; |
} |
} |
} |
} |
|
|
Line 2727 sub clickablePath($$) { |
|
Line 2565 sub clickablePath($$) { |
|
$retval = "[$cvstree]"; |
$retval = "[$cvstree]"; |
} |
} |
else { |
else { |
$retval .= ' ' . &link("[$cvstree]", sprintf('%s/%s#dirlist', |
$retval = $retval . " <a href=\"${scriptname}/${query}#dirlist\">[$cvstree]</a>"; |
$scriptname, |
|
$query)); |
|
my $wherepath = ''; |
my $wherepath = ''; |
my ($lastslash) = $pathname =~ m|/$|; |
my ($lastslash) = $pathname =~ m|/$|; |
foreach (split(/\//, $pathname)) { |
foreach (split(/\//, $pathname)) { |
$retval .= " / "; |
$retval = $retval . " / "; |
$wherepath .= "/$_"; |
$wherepath = $wherepath . '/' . $_; |
my ($last) = "$wherepath/" eq "/$pathname" |
my ($last) = "$wherepath/" eq "/$pathname" |
|| $wherepath eq "/$pathname"; |
|| $wherepath eq "/$pathname"; |
if ($clickLast || !$last) { |
if ($clickLast || !$last) { |
$retval .= &link($_, join('', |
$retval = $retval . "<a href=\"${scriptname}" |
$scriptname, |
. urlencode($wherepath) |
urlencode($wherepath), |
. (!$last || $lastslash ? '/' : '') |
(!$last || $lastslash ? '/' : ''), |
. ${query} |
$query, |
. (!$last || $lastslash ? "#dirlist" : "") |
(!$last || $lastslash ? "#dirlist" : ""))); |
. "\">$_</a>"; |
} |
} |
else { # do not make a link to the current dir |
else { # do not make a link to the current dir |
$retval .= $_; |
$retval = $retval . $_; |
} |
} |
} |
} |
} |
} |
Line 2778 sub chooseCVSRoot() { |
|
Line 2614 sub chooseCVSRoot() { |
|
foreach $k (@foo) { |
foreach $k (@foo) { |
print "<option value=\"$k\""; |
print "<option value=\"$k\""; |
print " selected" if ($k eq $cvstree); |
print " selected" if ($k eq $cvstree); |
print ">", ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : $k), "</option>\n"; |
print ">" . ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : |
|
$k). "</option>\n"; |
} |
} |
print "</select>\n</td>"; |
print "</select>\n</td>"; |
print "<td><input type=submit value=\"Go\"></td>"; |
print "<td><input type=submit value=\"Go\"></td>"; |
Line 2802 sub chooseMirror() { |
|
Line 2639 sub chooseMirror() { |
|
print "\nThis cvsweb is mirrored in:\n"; |
print "\nThis cvsweb is mirrored in:\n"; |
foreach $mirror (keys %MIRRORS) { |
foreach $mirror (keys %MIRRORS) { |
print ", " if ($moremirrors); |
print ", " if ($moremirrors); |
print &link(htmlquote($mirror),$MIRRORS{$mirror}); |
print qq(<a href="$MIRRORS{$mirror}">$mirror</A>\n); |
$moremirrors = 1; |
$moremirrors = 1; |
} |
} |
print "<p>\n"; |
print "<p>\n"; |
Line 2843 sub fileSortCmp() { |
|
Line 2680 sub fileSortCmp() { |
|
sub download_url($$;$) { |
sub download_url($$;$) { |
my ($url,$revision,$mimetype) = @_; |
my ($url,$revision,$mimetype) = @_; |
|
|
$revision =~ s/\.0\././; |
$revision =~ s/\b0\.//; |
|
|
if (defined($checkoutMagic) |
if (defined($checkout_magic) |
&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
my $path = $where; |
my ($path); |
$path =~ s|/[^/]*$|/|; |
($path = $where) =~ s|/[^/]*$|/|; |
$url = "$scriptname/$checkoutMagic/${path}$url"; |
$url = "$scriptname/$checkoutMagic/${path}$url"; |
} |
} |
$url .= "?rev=$revision"; |
$url .= "?rev=$revision"; |
$url .= '&content-type=' . urlencode($mimetype) if (defined($mimetype)); |
$url .= "&content-type=$mimetype" if (defined($mimetype)); |
|
|
$url; |
return $url; |
} |
} |
|
|
# Presents a link to download the |
# Presents a link to download the |
# selected revision |
# selected revision |
sub download_link($$$;$) { |
sub download_link($$$;$) { |
my ($url, $revision, $textlink, $mimetype) = @_; |
my ($url,$revision,$textlink,$mimetype) = @_; |
my ($fullurl) = download_url($url, $revision, $mimetype); |
my ($fullurl) = download_url($url,$revision,$mimetype); |
|
my ($paren) = $textlink =~ /^\(/; |
printf '<A HREF="%s"', htmlquote("$fullurl$barequery"); |
$textlink =~ s/^\(// if ($paren); |
|
$textlink =~ s/\)$// if ($paren); |
|
print "(" if ($paren); |
|
print "<A HREF=\"$fullurl"; |
|
print $barequery; |
|
print "\""; |
if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
print ' target="cvs_checkout"'; |
print " target=\"cvs_checkout\""; |
# we should have |
# we should have |
# 'if (document.cvswin==null) document.cvswin=window.open(...' |
# 'if (document.cvswin==null) document.cvswin=window.open(...' |
# in order to allow the user to resize the window; otherwise |
# in order to allow the user to resize the window; otherwise |
Line 2885 sub download_link($$$;$) { |
|
Line 2726 sub download_link($$$;$) { |
|
# currently, the best way is to comment out the size parameters |
# currently, the best way is to comment out the size parameters |
# ($extern_window...) in cvsweb.conf. |
# ($extern_window...) in cvsweb.conf. |
if ($use_java_script) { |
if ($use_java_script) { |
my @attr = qw(resizeable scrollbars); |
print " onClick=\"window.open('$fullurl','cvs_checkout',"; |
|
print "'resizeable,scrollbars"; |
push @attr, qw(status toolbar) |
print ",status,toolbar" if (defined($mimetype) |
if (defined($mimetype) && $mimetype eq "text/html"); |
&& $mimetype eq "text/html"); |
|
print ",width=$extern_window_width" if (defined($extern_window_width)); |
push @attr, "width=$extern_window_width" |
print ",height=$extern_window_height" if (defined($extern_window_height)); |
if (defined($extern_window_width)); |
print"');\""; |
|
|
push @attr, "height=$extern_window_height" |
|
if (defined($extern_window_height)); |
|
|
|
printf q` onClick="window.open('%s','cvs_checkout','%s');"`, |
|
htmlquote($fullurl), join(',', @attr); |
|
} |
} |
} |
} |
print "><b>$textlink</b></A>"; |
print "><b>$textlink</b></A>"; |
|
print ")" if ($paren); |
} |
} |
|
|
# Returns a Query string with the |
# Returns a Query string with the |
Line 2922 sub toggleQuery($$) { |
|
Line 2758 sub toggleQuery($$) { |
|
my ($value) = defined($vars{$var}) ? $vars{$var} : ""; |
my ($value) = defined($vars{$var}) ? $vars{$var} : ""; |
my ($default) = defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : ""; |
my ($default) = defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : ""; |
if ($value ne $default) { |
if ($value ne $default) { |
$newquery .= "&" if ($newquery ne ""); |
$newquery .= "&" if ($newquery ne ""); |
$newquery .= urlencode($var) . "=" . urlencode($value); |
$newquery .= urlencode($var) . "=" . urlencode($value); |
} |
} |
} |
} |
Line 2933 sub toggleQuery($$) { |
|
Line 2769 sub toggleQuery($$) { |
|
} |
} |
|
|
sub urlencode($) { |
sub urlencode($) { |
local($_) = @_; |
my ($in) = @_; |
|
my ($out); |
s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge; |
($out = $in) =~ s/([\000-+{-\377])/sprintf("%%%02x", ord($1))/ge; |
|
return $out; |
|
|
$_; |
|
} |
} |
|
|
sub htmlquote($) { |
|
local($_) = @_; |
|
|
|
# Special Characters; RFC 1866 |
|
s/&/&/g; |
|
s/\"/"/g; |
|
s/</</g; |
|
s/>/>/g; |
|
|
|
$_; |
|
} |
|
|
|
sub htmlunquote($) { |
|
local($_) = @_; |
|
|
|
# Special Characters; RFC 1866 |
|
s/"/\"/g; |
|
s/</</g; |
|
s/>/>/g; |
|
s/&/&/g; |
|
|
|
$_; |
|
} |
|
|
|
sub http_header(;$) { |
sub http_header(;$) { |
my $content_type = shift || "text/html"; |
my $content_type = shift || "text/html"; |
if (defined($moddate)) { |
if (defined($moddate)) { |
Line 2972 sub http_header(;$) { |
|
Line 2782 sub http_header(;$) { |
|
Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT"); |
Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT"); |
} |
} |
else { |
else { |
print "Last-Modified: ", scalar gmtime($moddate), " GMT\r\n"; |
print "Last-Modified: " . scalar gmtime($moddate) . " GMT\r\n"; |
} |
} |
} |
} |
if ($is_mod_perl) { |
if ($is_mod_perl) { |
Line 3023 sub http_header(;$) { |
|
Line 2833 sub http_header(;$) { |
|
|
|
sub html_header($) { |
sub html_header($) { |
my ($title) = @_; |
my ($title) = @_; |
my $version = '$zRevision: 1.104 $ $kRevision: 1.39 $'; #' |
my $version = '$zRevision: 1.103 $ $Revision$'; #' |
http_header(); |
http_header(); |
print <<EOH; |
print <<EOH; |
<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" |
<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" |
Line 3051 sub link_tags($) { |
|
Line 2861 sub link_tags($) { |
|
|
|
foreach my $sym (split(", ", $tags)) { |
foreach my $sym (split(", ", $tags)) { |
$ret .= ",\n" if ($ret ne ""); |
$ret .= ",\n" if ($ret ne ""); |
$ret .= &link($sym, $fileurl . toggleQuery('only_with_tag',$sym)); |
$ret .= "<A HREF=\"$fileurl" |
|
. toggleQuery('only_with_tag',$sym) . "\">$sym</A>"; |
} |
} |
return "$ret\n"; |
return $ret."\n"; |
} |
} |
|
|
# |
# |