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

move config cache/base_url to locations/widget_render_url

Browse Source
This commit is contained in:
Milan
2023-02-26 22:52:22 +01:00
parent 4521c3ed6c
commit 9c2cb45047
25 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/calcms/calendar.pm
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,7 +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->{widget_render_url}= $config->{locations}->{widget_render_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} );

2
lib/calcms/comments.pm
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/ ) {

4
lib/calcms/events.pm
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}
@@ -1221,7 +1221,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)/ ) )