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

add user password reset, add series image switch, add image licences, redesign exclude filters

Browse Source
This commit is contained in:
Milan
2018-03-17 13:14:13 +01:00
parent b3f743dee9
commit aadf3fd06e
48 changed files with 1329 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/calcms/events.pm
View File

@@ -246,20 +246,20 @@ sub modify_results {
$result->{no_comment} = 1 if ( $result->{comment_count} == 0 );
#fix image url
if ((defined $config->{permissions}->{hide_event_images}) && ($config->{permissions}->{hide_event_images} eq '1')){
$result->{image} = $result->{series_image};
$result->{image_label} = $result->{series_image_label};
}
if ( defined $result->{image} ) {
$result->{thumb} = $result->{image};
$result->{icon} = $result->{image};
$result->{image} =~ s/thumbs/images/g;
$result->{image} =~ s/icons/images/g;
#fix thumbs url
$result->{thumb} =~ s/images/thumbs/s;
$result->{thumb} =~ s/icons/thumbs/s;
#fix icon url
$result->{icon} =~ s/thumbs/icons/s;
$result->{icon} =~ s/images/icons/s;
my $url=$config->{locations}->{local_media_url}||'';
if (defined $result->{image}){
my $image=$result->{image};
$result->{thumb} = $url.'/thumbs/'.$image;
$result->{icon} = $url.'/icons/'.$image;
$result->{image} = $url.'/images/'.$image;
}
}
$result->{location_css} = $result->{location} || '';
@@ -1019,6 +1019,9 @@ sub get_query {
,e.modified_by
,e.comment_count
,e.image
,e.image_label
,e.series_image
,e.series_image_label
,e.reference
,e.recurrence
,e.recurrence_count