Move from mod_perl to being a PSGI app.

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

diff --git a/perl/Sesse/pr0n/Templates.pm b/perl/Sesse/pr0n/Templates.pm
index 8ff1e0353457360b2cc69dd3356610f23a8d4d79..aac4058fc8ab183bef468f9d938f97201013e2e2 100644 (file)
--- a/perl/Sesse/pr0n/Templates.pm
+++ b/perl/Sesse/pr0n/Templates.pm
@@ -14,12 +14,11 @@ BEGIN {
        %EXPORT_TAGS = qw();
        @EXPORT_OK   = qw();
 }
-our %dirs;
+our %dirs = ();
 
 sub update_dirs {
        my $r = shift;
-       my $base = $r->dir_config('TemplateBase');
-       %dirs = ();
+       my $base = $Sesse::pr0n::Config::template_base;
        
        for my $dir (<$base/*>) {
                next unless -d $dir;
@@ -33,11 +32,11 @@ sub update_dirs {
 sub r_to_dir {
        my $r = shift;
 
-       if (!defined(%dirs)) {
+       if (scalar(keys %dirs) == 0) {
                update_dirs($r);
        }
        
-       my $site = $r->get_server_name();
+       my $site = Sesse::pr0n::Common::get_server_name($r);
        if (defined($dirs{$site})) {
                return $site;
        } else {
@@ -56,7 +55,7 @@ sub fetch_template {
 
        my $newcache = {};
 
-       my $base = $r->dir_config('TemplateBase');
+       my $base = $Sesse::pr0n::Config::template_base;
        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: $!");
@@ -71,7 +70,7 @@ sub fetch_template {
        return $newcache->{'contents'};
 }
 
-sub print_template {
+sub process_template {
        my ($r, $template, $args) = @_;
        my $text = fetch_template($r, $template);
 
@@ -81,7 +80,12 @@ sub print_template {
                $text =~ s/$key/$value/g;
        }
 
-       $r->print($text);
+       return $text;
+}
+
+sub print_template {
+       my ($r, $io, $template, $args) = @_;
+       $io->print(process_template($r, $template, $args));
 }
 
 1;