From 219d6d69650e6e7ab818484ddcf20ac985a9bcc6 Mon Sep 17 00:00:00 2001
From: Milan <mc@radiopiloten.de>
Date: Thu, 26 Mar 2020 16:11:19 +0100
Subject: [PATCH] fix image publishing and refactor

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

diff --git a/website/agenda/planung/image.cgi b/website/agenda/planung/image.cgi
index c77ae2c..75cfe29 100755
--- a/website/agenda/planung/image.cgi
+++ b/website/agenda/planung/image.cgi
@@ -14,6 +14,7 @@ use time();
 use images();
 use params();
 use config();
+use entry();
 use log();
 use template();
 use db();
@@ -139,7 +140,7 @@ sub show_image {
     }
 
     #load images matching by search
-    if ( $params->{search} =~ /\S/ ) {
+    if ( ($params->{search}//'') =~ /\S/ ) {
 
         #remove filename from search
         #delete $params->{filename};
@@ -208,6 +209,8 @@ sub show_image {
 
     my $search = $params->{search} || '';
     $search =~ s/\%+/ /g;
+    
+    $params->{target} //= '';
 
     my $template_params = {
         'search'     => $search,
@@ -287,8 +290,6 @@ sub save_image {
     $config->{access}->{write} = 1;
     my $dbh = db::connect($config);
 
-    print STDERR "going to save\n";
-
     my $entries = images::get(
         $config,
         {
@@ -438,14 +439,14 @@ sub check_params {
         'save_image', 'delete_image', 'show', 'filename', 'target' ]);
 
     #checkboxes
-    entry::set_bools( $checked, $params, [ 'public ']);
+    entry::set_bools( $checked, $params, [ 'public']);
 
     #map show to filename, but overwrite if filename given
-    if ( $checked->{show} ne '' ) {
+    if ( ($checked->{show}//'') ne '' ) {
         $checked->{filename} = $checked->{show};
         delete $checked->{show};
         $checked->{limit} = 1;
-    } elsif ( $checked->{filename} ne '' ) {
+    } elsif ( ($checked->{filename}//'') ne '' ) {
         delete $checked->{show};
     }