X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FTemplates.pm;h=ecac13f623d3c6e29e5bd59fc3a8e086c129de61;hp=8bf0c1f71226ce69d16d38e8e46ebfb7ac75f581;hb=a7e30af46533d16a9ccb47b6d19c38c62d2006e4;hpb=290a2bdcb92997fd2537603dee5c67350b2bb7b1

diff --git a/perl/Sesse/pr0n/Templates.pm b/perl/Sesse/pr0n/Templates.pm
index 8bf0c1f..ecac13f 100644
--- a/perl/Sesse/pr0n/Templates.pm
+++ b/perl/Sesse/pr0n/Templates.pm
@@ -18,7 +18,7 @@ our %dirs = ();
 
 sub update_dirs {
 	my $r = shift;
-	my $base = $r->dir_config('TemplateBase');
+	my $base = $Sesse::pr0n::Config::template_base;
 	
 	for my $dir (<$base/*>) {
 		next unless -d $dir;
@@ -36,7 +36,7 @@ sub r_to_dir {
 		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 {
@@ -55,8 +55,8 @@ sub fetch_template {
 
 	my $newcache = {};
 
-	my $base = $r->dir_config('TemplateBase');
-	open TEMPLATE, "<$base/$dir/$template"
+	my $base = $Sesse::pr0n::Config::template_base;
+	open TEMPLATE, "<:utf8", "$base/$dir/$template"
 		or ($dir ne 'default' and open TEMPLATE, "<$base/default/$template")
 		or Sesse::pr0n::Common::error($r, "Couldn't open $dir/$template: $!");
 
@@ -84,8 +84,8 @@ sub process_template {
 }
 
 sub print_template {
-	my ($r, $template, $args) = @_;
-	$r->print(process_template($r, $template, $args));
+	my ($r, $io, $template, $args) = @_;
+	$io->print(Encode::encode_utf8(process_template($r, $template, $args)));
 }
 
 1;