From 20ab78e6ee5e9ef800eb124a0b05602ed7fae12a Mon Sep 17 00:00:00 2001
From: Milan <mc@radiopiloten.de>
Date: Fri, 18 Nov 2022 00:20:30 +0100
Subject: [PATCH] aggregate.cgi: slurp file and return scalar

---
 website/agenda/aggregate.cgi | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/website/agenda/aggregate.cgi b/website/agenda/aggregate.cgi
index 8213fc3..2aa544c 100755
--- a/website/agenda/aggregate.cgi
+++ b/website/agenda/aggregate.cgi
@@ -55,7 +55,6 @@ if ( $0 =~ /aggregate.*?\.cgi$/ ) {
     $params = $request->{params}->{checked};
 
     my $content = load_file( $base_dir . './index.html' );
-    $content = $$content || '';
 
     #replace HTML escaped calcms_title span by unescaped one
     $content =~
@@ -133,11 +132,11 @@ s/\&lt\;span id\=&quot\;calcms_title&quot\;\&gt\;[^\&]*\&lt\;\/span\&gt\;/\<span
 }
 
 sub load_file {
-    my $filename = shift;
-    my $content  = "cannot load '$filename'";
-    open my $FILE, '<:utf8', $filename or return \$content;
-    $content = join( "", (<$FILE>) );
-    close $FILE;
-    return \$content;
+    my ($filename) = @_;
+    open my $fh, '<:utf8', $filename or return qq{cannot load '$filename'};
+    local $/ = undef;
+    my $content = <$fh>;
+    close $fh or return qq{cannot load '$filename'};
+    return $content;
 }