kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix image publishing and refactor

Browse Source
This commit is contained in:
Milan
2020-03-26 16:11:19 +01:00
parent accc9393c7
commit 219d6d6965
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
website/agenda/planung/image.cgi
View File

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