Make pr0n-upload.pl output a list of failed files at the end, so it's easier to do...

[pr0n] / perl / Sesse / pr0n / Templates.pm

diff --git a/perl/Sesse/pr0n/Templates.pm b/perl/Sesse/pr0n/Templates.pm
index 422748640f3682bf8f2931b78f368deead793e84..3e65a9a9217767f9bb7592a4e6f917023c3aacea 100644 (file)
--- a/perl/Sesse/pr0n/Templates.pm
+++ b/perl/Sesse/pr0n/Templates.pm
@@ -58,6 +58,7 @@ sub fetch_template {
 
        my $base = $r->dir_config('TemplateBase');
        open TEMPLATE, "<$base/$dir/$template"
+               or ($dir ne 'default' and open TEMPLATE, "<$base/default/$template")
                or Sesse::pr0n::Common::error($r, "Couldn't open $dir/$template: $!");
 
        local $/;
@@ -70,7 +71,7 @@ sub fetch_template {
        return $newcache->{'contents'};
 }
 
-sub print_template {
+sub process_template {
        my ($r, $template, $args) = @_;
        my $text = fetch_template($r, $template);
 
@@ -80,7 +81,12 @@ sub print_template {
                $text =~ s/$key/$value/g;
        }
 
-       $r->print($text);
+       return $text;
+}
+
+sub print_template {
+       my ($r, $template, $args) = @_;
+       $r->print(process_template($r, $template, $args));
 }
 
 1;