summaryrefslogtreecommitdiff
path: root/www/p5-Apache-Gallery/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'www/p5-Apache-Gallery/patches/patch-aa')
-rw-r--r--www/p5-Apache-Gallery/patches/patch-aa49
1 files changed, 39 insertions, 10 deletions
diff --git a/www/p5-Apache-Gallery/patches/patch-aa b/www/p5-Apache-Gallery/patches/patch-aa
index 81590a562aa..9b10a04d96f 100644
--- a/www/p5-Apache-Gallery/patches/patch-aa
+++ b/www/p5-Apache-Gallery/patches/patch-aa
@@ -1,11 +1,40 @@
-$NetBSD: patch-aa,v 1.4 2004/04/01 19:21:50 kim Exp $
+$NetBSD: patch-aa,v 1.5 2004/07/10 22:21:40 kim Exp $
-Convert newlines to <BR> tags in visible folder names on the directory
-page, but not in the menu bar.
-
---- lib/Apache/Gallery.pm.orig 2004-03-13 13:02:03.000000000 -0500
-+++ lib/Apache/Gallery.pm 2004-03-13 13:02:49.000000000 -0500
-@@ -272,7 +272,7 @@
+--- lib/Apache/Gallery.pm.orig 2003-09-07 13:28:42.000000000 -0400
++++ lib/Apache/Gallery.pm 2004-07-10 18:10:49.000000000 -0400
+@@ -206,9 +206,28 @@
+
+ # Combine directories and files to one listing
+ my @listing;
+- push (@listing, @directories);
+- push (@listing, @files);
+- push (@listing, @downloadable_files);
++ if (!defined($r->dir_config('GallerySortReverse'))
++ || $r->dir_config('GallerySortReverse') eq '0') {
++ push (@listing, @directories);
++ push (@listing, @files);
++ push (@listing, @downloadable_files);
++ } else {
++ if ($r->dir_config('GallerySortReverse') & 1) {
++ push (@listing, reverse @directories);
++ } else {
++ push (@listing, @directories);
++ }
++ if ($r->dir_config('GallerySortReverse') & 2) {
++ push (@listing, reverse @files);
++ } else {
++ push (@listing, @files);
++ }
++ if ($r->dir_config('GallerySortReverse') & 4) {
++ push (@listing, reverse @downloadable_files);
++ } else {
++ push (@listing, @downloadable_files);
++ }
++ }
+
+ if (@listing) {
+
+@@ -272,7 +291,7 @@
if (-d $thumbfilename) {
my $dirtitle = '';
if (-e $thumbfilename . ".folder") {
@@ -14,7 +43,7 @@ page, but not in the menu bar.
}
$tpl->assign(FILEURL => uri_escape($fileurl, $escape_rule), FILE => ($dirtitle ? $dirtitle : $file));
-@@ -1041,6 +1041,7 @@
+@@ -1041,6 +1060,7 @@
sub get_filecontent {
my $file = shift;
@@ -22,7 +51,7 @@ page, but not in the menu bar.
open(FH, $file) or return undef;
my $content = '';
{
-@@ -1048,6 +1049,7 @@
+@@ -1048,6 +1068,7 @@
$content = <FH>;
}
close(FH);
@@ -30,7 +59,7 @@ page, but not in the menu bar.
return $content;
}
-@@ -1145,7 +1147,7 @@
+@@ -1145,7 +1166,7 @@
$dirname = File::Spec->catdir($dirname, $link);
if (-e $dirname . ".folder") {