From: Steinar H. Gunderson Date: Wed, 25 Jul 2007 10:35:02 +0000 (+0200) Subject: Implement unfiltering. X-Git-Url: https://git.sesse.net/?p=pr0n;a=commitdiff_plain;h=d42e1d2179dbbfb06b4251344bbe96f1a62cb89b Implement unfiltering. --- diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index ee4c0f9..b8b954f 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -253,15 +253,25 @@ sub handler { $eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'})); my %newsettings = %defsettings; - $newsettings{'model'} = $e->{'model'}; - $newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : ''; + + my $action; + if (defined($model) && defined($lens)) { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter")); + $newsettings{'model'} = undef; + $newsettings{'lens'} = undef; + } else { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter")); + $newsettings{'model'} = $e->{'model'}; + $newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : ''; + } + my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings); # This isn't correct for all languages. Fix if we ever need to care. :-) if ($e->{'num'} == 1) { - Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec, filterurl => $url }); + Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec, filterurl => $url, action => $action }); } else { - Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url }); + Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url, action => $action }); } } Sesse::pr0n::Templates::print_template($r, "equipment-end"); diff --git a/templates/bilder.knatten.com/equipment-item b/templates/bilder.knatten.com/equipment-item index 1ffac4b..307a5a8 100644 --- a/templates/bilder.knatten.com/equipment-item +++ b/templates/bilder.knatten.com/equipment-item @@ -1 +1 @@ -
  • %EQSPEC% (%NUM% bilder) (filtrer)
    • +
  • %EQSPEC% (%NUM% bilder) (%ACTION%)
    • diff --git a/templates/bilder.knatten.com/equipment-item-singular b/templates/bilder.knatten.com/equipment-item-singular index 3911531..747bc9f 100644 --- a/templates/bilder.knatten.com/equipment-item-singular +++ b/templates/bilder.knatten.com/equipment-item-singular @@ -1 +1 @@ -
  • %EQSPEC% (ett bilde) (filtrer)
    • +
  • %EQSPEC% (ett bilde) (%ACTION%)
    • diff --git a/templates/bilder.knatten.com/filter b/templates/bilder.knatten.com/filter new file mode 100644 index 0000000..eb92ea7 --- /dev/null +++ b/templates/bilder.knatten.com/filter @@ -0,0 +1 @@ +filtrer diff --git a/templates/bilder.knatten.com/unfilter b/templates/bilder.knatten.com/unfilter new file mode 100644 index 0000000..ea84948 --- /dev/null +++ b/templates/bilder.knatten.com/unfilter @@ -0,0 +1 @@ +avfiltrer diff --git a/templates/default/equipment-item b/templates/default/equipment-item index f8ce70f..861f5f9 100644 --- a/templates/default/equipment-item +++ b/templates/default/equipment-item @@ -1 +1 @@ -
  • %EQSPEC% (%NUM% images) (filter)
    • +
  • %EQSPEC% (%NUM% images) (%ACTION%)
    • diff --git a/templates/default/equipment-item-singular b/templates/default/equipment-item-singular index e95d222..d99d4af 100644 --- a/templates/default/equipment-item-singular +++ b/templates/default/equipment-item-singular @@ -1 +1 @@ -
  • %EQSPEC% (one image) (filter)
    • +
  • %EQSPEC% (one image) (%ACTION%)
    • diff --git a/templates/default/filter b/templates/default/filter new file mode 100644 index 0000000..76f654e --- /dev/null +++ b/templates/default/filter @@ -0,0 +1 @@ +filter diff --git a/templates/default/unfilter b/templates/default/unfilter new file mode 100644 index 0000000..3f87e65 --- /dev/null +++ b/templates/default/unfilter @@ -0,0 +1 @@ +unfilter diff --git a/templates/images.tg05.gathering.org/equipment-item b/templates/images.tg05.gathering.org/equipment-item index f8ce70f..861f5f9 100644 --- a/templates/images.tg05.gathering.org/equipment-item +++ b/templates/images.tg05.gathering.org/equipment-item @@ -1 +1 @@ -
  • %EQSPEC% (%NUM% images) (filter)
    • +
  • %EQSPEC% (%NUM% images) (%ACTION%)
    • diff --git a/templates/images.tg05.gathering.org/equipment-item-singular b/templates/images.tg05.gathering.org/equipment-item-singular index e95d222..d99d4af 100644 --- a/templates/images.tg05.gathering.org/equipment-item-singular +++ b/templates/images.tg05.gathering.org/equipment-item-singular @@ -1 +1 @@ -
  • %EQSPEC% (one image) (filter)
    • +
  • %EQSPEC% (one image) (%ACTION%)
    • diff --git a/templates/images.tg05.gathering.org/filter b/templates/images.tg05.gathering.org/filter new file mode 100644 index 0000000..76f654e --- /dev/null +++ b/templates/images.tg05.gathering.org/filter @@ -0,0 +1 @@ +filter diff --git a/templates/images.tg05.gathering.org/unfilter b/templates/images.tg05.gathering.org/unfilter new file mode 100644 index 0000000..3f87e65 --- /dev/null +++ b/templates/images.tg05.gathering.org/unfilter @@ -0,0 +1 @@ +unfilter diff --git a/templates/itk-bilder.samfundet.no/equipment-item b/templates/itk-bilder.samfundet.no/equipment-item index 1ffac4b..307a5a8 100644 --- a/templates/itk-bilder.samfundet.no/equipment-item +++ b/templates/itk-bilder.samfundet.no/equipment-item @@ -1 +1 @@ -
  • %EQSPEC% (%NUM% bilder) (filtrer)
    • +
  • %EQSPEC% (%NUM% bilder) (%ACTION%)
    • diff --git a/templates/itk-bilder.samfundet.no/equipment-item-singular b/templates/itk-bilder.samfundet.no/equipment-item-singular index 3911531..747bc9f 100644 --- a/templates/itk-bilder.samfundet.no/equipment-item-singular +++ b/templates/itk-bilder.samfundet.no/equipment-item-singular @@ -1 +1 @@ -
  • %EQSPEC% (ett bilde) (filtrer)
    • +
  • %EQSPEC% (ett bilde) (%ACTION%)
    • diff --git a/templates/itk-bilder.samfundet.no/filter b/templates/itk-bilder.samfundet.no/filter new file mode 100644 index 0000000..eb92ea7 --- /dev/null +++ b/templates/itk-bilder.samfundet.no/filter @@ -0,0 +1 @@ +filtrer diff --git a/templates/itk-bilder.samfundet.no/unfilter b/templates/itk-bilder.samfundet.no/unfilter new file mode 100644 index 0000000..ea84948 --- /dev/null +++ b/templates/itk-bilder.samfundet.no/unfilter @@ -0,0 +1 @@ +avfiltrer diff --git a/templates/skoyen.bilder.knatten.com/equipment-item b/templates/skoyen.bilder.knatten.com/equipment-item index 1ffac4b..307a5a8 100644 --- a/templates/skoyen.bilder.knatten.com/equipment-item +++ b/templates/skoyen.bilder.knatten.com/equipment-item @@ -1 +1 @@ -
  • %EQSPEC% (%NUM% bilder) (filtrer)
    • +
  • %EQSPEC% (%NUM% bilder) (%ACTION%)
    • diff --git a/templates/skoyen.bilder.knatten.com/equipment-item-singular b/templates/skoyen.bilder.knatten.com/equipment-item-singular index 3911531..747bc9f 100644 --- a/templates/skoyen.bilder.knatten.com/equipment-item-singular +++ b/templates/skoyen.bilder.knatten.com/equipment-item-singular @@ -1 +1 @@ -
  • %EQSPEC% (ett bilde) (filtrer)
    • +
  • %EQSPEC% (ett bilde) (%ACTION%)
    • diff --git a/templates/skoyen.bilder.knatten.com/filter b/templates/skoyen.bilder.knatten.com/filter new file mode 100644 index 0000000..eb92ea7 --- /dev/null +++ b/templates/skoyen.bilder.knatten.com/filter @@ -0,0 +1 @@ +filtrer diff --git a/templates/skoyen.bilder.knatten.com/unfilter b/templates/skoyen.bilder.knatten.com/unfilter new file mode 100644 index 0000000..ea84948 --- /dev/null +++ b/templates/skoyen.bilder.knatten.com/unfilter @@ -0,0 +1 @@ +avfiltrer diff --git a/templates/skoyen.bildereks.knatten.com/equipment-item b/templates/skoyen.bildereks.knatten.com/equipment-item index 1ffac4b..307a5a8 100644 --- a/templates/skoyen.bildereks.knatten.com/equipment-item +++ b/templates/skoyen.bildereks.knatten.com/equipment-item @@ -1 +1 @@ -
  • %EQSPEC% (%NUM% bilder) (filtrer)
    • +
  • %EQSPEC% (%NUM% bilder) (%ACTION%)
    • diff --git a/templates/skoyen.bildereks.knatten.com/equipment-item-singular b/templates/skoyen.bildereks.knatten.com/equipment-item-singular index 3911531..747bc9f 100644 --- a/templates/skoyen.bildereks.knatten.com/equipment-item-singular +++ b/templates/skoyen.bildereks.knatten.com/equipment-item-singular @@ -1 +1 @@ -
  • %EQSPEC% (ett bilde) (filtrer)
    • +
  • %EQSPEC% (ett bilde) (%ACTION%)
    • diff --git a/templates/skoyen.bildereks.knatten.com/filter b/templates/skoyen.bildereks.knatten.com/filter new file mode 100644 index 0000000..eb92ea7 --- /dev/null +++ b/templates/skoyen.bildereks.knatten.com/filter @@ -0,0 +1 @@ +filtrer diff --git a/templates/skoyen.bildereks.knatten.com/unfilter b/templates/skoyen.bildereks.knatten.com/unfilter new file mode 100644 index 0000000..ea84948 --- /dev/null +++ b/templates/skoyen.bildereks.knatten.com/unfilter @@ -0,0 +1 @@ +avfiltrer