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

Merge remote-tracking branch 'calcms/master'

Browse Source
This commit is contained in:
Milan
2023-03-18 22:19:41 +01:00
parent cf1acaaa82 feb936ed15
commit de2dcd37f7
110 changed files with 104 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/calcms/calendar.pm
+2 -5
View File
@@ -267,7 +267,7 @@ sub get($$) {
start_month => $start_month,
start_year => $start_year,
base_url => $config->{locations}->{base_url},
cache_base_url => $config->{cache}->{base_url},
widget_render_url=> $config->{locations}->{widget_render_url},
controllers => $config->{controllers},
};
@@ -283,10 +283,7 @@ sub render($$$$) {
my $parms = $request->{params}->{checked};
my $template_parameters = $calendar;
$template_parameters->{base_url} = $config->{locations}->{base_url};
$template_parameters->{cache_base_url} = $config->{cache}->{base_url};
$template_parameters->{server_cache} = $config->{cache}->{server_cache} if ( $config->{cache}->{server_cache} );
$template_parameters->{use_client_cache} = $config->{cache}->{use_client_cache}
if ( $config->{cache}->{use_client_cache} );
$template_parameters->{widget_render_url}= $config->{locations}->{widget_render_url};
template::process( $config, $_[0], $parms->{template}, $template_parameters );
}
lib/calcms/comments.pm
+1 -5
View File
@@ -173,7 +173,7 @@ sub modify_results($$$) {
$result->{short_content} = $result->{content};
}
$result->{base_url} = $config->{locations}->{base_url};
$result->{cache_base_url} = $config->{cache}->{base_url};
$result->{widget_render_url} = $config->{locations}->{widget_render_url};
if ( $params->{template} =~ /\.xml/ ) {
@@ -223,10 +223,6 @@ sub render($$$$) {
$template_parameters->{event_id} = $params->{event_id};
$template_parameters->{event_start} = $params->{event_start};
$template_parameters->{server_cache} = $config->{cache}->{server_cache} if ( $config->{cache}->{server_cache} );
$template_parameters->{use_client_cache} = $config->{cache}->{use_client_cache}
if ( $config->{cache}->{use_client_cache} );
$template_parameters->{controllers} = $config->{controllers};
template::process( $config, $_[0], $params->{template}, $template_parameters );
}
lib/calcms/events.pm
+2 -6
View File
@@ -264,7 +264,7 @@ sub modify_results ($$$$) {
$result->{static_files_url} = $config->{locations}->{static_files_url};
$result->{source_base_url} = $config->{locations}->{source_base_url};
$result->{local_base_url} = $config->{locations}->{local_base_url};
$result->{cache_base_url} = $config->{cache}->{base_url};
$result->{widget_render_url}= $config->{locations}->{widget_render_url};
$result->{is_running} = 1 if $running_event_id
&& $result->{event_id}
@@ -1204,10 +1204,6 @@ sub render($$$$;$) {
my %tparams = %$params;
my $tparams = \%tparams;
$tparams->{events} = $results;
$tparams->{server_cache} = $config->{cache}->{server_cache}
if ( $config->{cache}->{server_cache} );
$tparams->{use_client_cache} = $config->{cache}->{use_client_cache}
if ( $config->{cache}->{use_client_cache} );
if ( scalar @$results > 0 ) {
my $result = $results->[0];
@@ -1221,7 +1217,7 @@ sub render($$$$;$) {
$tparams->{base_url} = $config->{locations}->{base_url};
$tparams->{base_domain} = $config->{locations}->{base_domain};
$tparams->{local_base_url} = $config->{locations}->{local_base_url};
$tparams->{cache_base_url} = $config->{cache}->{base_url};
$tparams->{widget_render_url} = $config->{locations}->{widget_render_url};
$tparams->{modified_at} = time::time_to_datetime( time() );
if ( ( defined $params->{template} )
&& ( $params->{template} =~ /(\.xml)/ ) )