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

Merge remote-tracking branch 'calcms/master'

Browse Source 
* events.pm: load recordings for params
This commit is contained in:
www-data
2024-04-19 13:06:00 +02:00
parent 09c8bd7ded fd952dadfa
commit e896d03f4b
6 changed files with 27 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/agenda/.htaccess
View File

@@ -47,7 +47,7 @@ RewriteRule ^atom/(.*)$ events.cgi?template=event.atom.xml&time=future&limit=
RewriteRule ^atom.xml[\?]?(.*)$ events.cgi?template=event.atom.xml&time=future&limit=100&$1 [L]
RewriteRule ^rss/(.*)$ events.cgi?template=event.rss.xml&time=future&limit=100&$1 [L]
RewriteRule ^rss.xml[\?]?(.*)$ events.cgi?template=event.rss.xml&time=future&limit=100&$1 [L]
RewriteRule ^rss-media/(.*)$ events.cgi?last_days=7&only_recordings=1&template=event_media.rss.xml&$1 [L]
RewriteRule ^rss-media/(.*)$ events.cgi?last_days=7&only_active_recording=1&template=event_media.rss.xml&$1 [L]
RewriteRule ^ical/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(\d)/(.*)$ events.cgi?template=event.ics&from_date=$1&till_date=$2&weekday=$3&$4 [L]

4
website/agenda/aggregate.cgi
View File

@@ -42,7 +42,7 @@ if ( $0 =~ /aggregate.*?\.cgi$/ ) {
$params->{exclude_projects} = 1;
$params->{exclude_event_images} = 1;
$params->{ro} = 1;
$params->{recordings} = 1;
$params->{active_recording} = 1;
my $request = {
url => $ENV{QUERY_STRING},
@@ -68,7 +68,7 @@ s/\&lt\;span id\=&quot\;calcms_title&quot\;\&gt\;[^\&]*\&lt\;\/span\&gt\;/\<span
$list->{day} = $params->{from_date} if ( defined $params->{from_date} ) && ( $params->{from_date} ne '' );
$list->{day} = 'today' if $list->{day} eq '';
$params->{recordings} = 0;
$params->{active_recording} = 0;
$menu = aggregator::get_menu( $config, $request, $list->{day}, $list->{results} );
my $calendar = aggregator::get_calendar( $config, $request, $list->{day} );

2
website/agenda/all-events.cgi
View File

@@ -17,7 +17,7 @@ if ( $0 =~ /all-events.*?\.cgi$/ ) {
my $config = config::getFromScriptLocation();
$params->{template} = '' unless defined $params->{template};
$params->{recordings} = 1 if $params->{template} =~ /events_playout/;
$params->{all_recordings} = 1 if $params->{template} =~ /events_playout/; # deprecated
$params->{exclude_event_images} = 1;
my $request = {

2
website/agenda/events.cgi
View File

@@ -17,7 +17,7 @@ if ( $0 =~ /events.*?\.cgi$/ ) {
my $config = config::getFromScriptLocation();
$params->{template} = '' unless defined $params->{template};
$params->{recordings} = 1 if $params->{template} =~ /events_playout/;
$params->{all_recordings} = 1 if $params->{template} =~ /events_playout/; # deprecated
$params->{exclude_locations} = 1;
$params->{exclude_projects} = 1;

2
website/agenda/planung/calendar.cgi
View File

@@ -1922,7 +1922,7 @@ sub getSeriesEvents {
#get events (directly from database to get the ones, not assigned, yet)
delete $options->{studio_id};
delete $options->{project_id};
$options->{recordings} = 1;
$options->{active_recording} = 1;
my $request2 = {
params => {