From 9c2cb45047b22d6e64a057c7b9bc5780b8edb9e0 Mon Sep 17 00:00:00 2001 From: Milan Date: Sun, 26 Feb 2023 22:52:22 +0100 Subject: [PATCH] move config cache/base_url to locations/widget_render_url --- lib/calcms/calendar.pm | 4 ++-- lib/calcms/comments.pm | 2 +- lib/calcms/events.pm | 4 ++-- website/agenda/config/config.cgi.off | 5 +---- website/agenda/planung/comment.cgi | 2 +- website/agenda/planung/notify-events.cgi | 2 +- website/agenda/planung/templates/comments.html | 2 +- website/agenda/planung/templates/edit-event.html | 2 +- website/agenda/templates/default/calendar.html | 8 ++++---- website/agenda/templates/default/comments.xml | 8 ++++---- website/agenda/templates/default/comments_newest.html | 2 +- website/agenda/templates/default/event.atom.xml | 10 +++++----- website/agenda/templates/default/event.ics | 2 +- website/agenda/templates/default/event.json-p | 6 +++--- website/agenda/templates/default/event.rss.xml | 10 +++++----- website/agenda/templates/default/event_file_export.txt | 2 +- website/agenda/templates/default/event_freefm.xml | 2 +- website/agenda/templates/default/event_list.html | 6 +++--- website/agenda/templates/default/event_media.rss.xml | 2 +- website/agenda/templates/default/event_menu.html | 4 ++-- website/agenda/templates/default/event_playlist.html | 2 +- website/agenda/templates/default/event_playlist.txt | 2 +- .../agenda/templates/default/event_playlist_long.html | 2 +- website/agenda/templates/default/event_redirect.html | 2 +- website/agenda/templates/default/event_running.html | 6 +++--- 25 files changed, 48 insertions(+), 51 deletions(-) diff --git a/lib/calcms/calendar.pm b/lib/calcms/calendar.pm index cb5b070..3d91395 100644 --- a/lib/calcms/calendar.pm +++ b/lib/calcms/calendar.pm @@ -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} ); diff --git a/lib/calcms/comments.pm b/lib/calcms/comments.pm index e6c1991..fd39fe8 100644 --- a/lib/calcms/comments.pm +++ b/lib/calcms/comments.pm @@ -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/ ) { diff --git a/lib/calcms/events.pm b/lib/calcms/events.pm index d783d0a..fe02a98 100644 --- a/lib/calcms/events.pm +++ b/lib/calcms/events.pm @@ -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)/ ) ) diff --git a/website/agenda/config/config.cgi.off b/website/agenda/config/config.cgi.off index f0391e6..fc19e65 100755 --- a/website/agenda/config/config.cgi.off +++ b/website/agenda/config/config.cgi.off @@ -35,10 +35,6 @@ domain ${DOMAIN} config_file ${BASE_DIR}/agenda/config/config.cgi - - base_url /programm - - temp_dir ${BASE_DIR}/temp/ @@ -50,6 +46,7 @@ domain ${DOMAIN} source_base_url https://${DOMAIN}/ local_base_url /agenda/ editor_base_url /agenda/planung/ + widget_render_url /programm # ajax base_domain https://${DOMAIN}/ diff --git a/website/agenda/planung/comment.cgi b/website/agenda/planung/comment.cgi index aa72211..315b87c 100755 --- a/website/agenda/planung/comment.cgi +++ b/website/agenda/planung/comment.cgi @@ -138,7 +138,7 @@ sub showComments { for my $event (@$events) { $event->{start} = time::date_time_format( $config, $event->{start}, $language ); $comment_count += $event->{comment_count} if defined $event->{comment_count}; - $event->{cache_base_url} = $config->{cache}->{base_url}; + $event->{widget_render_url} = $config->{locations}->{widget_render_url}; } } for my $param (%$comment) { diff --git a/website/agenda/planung/notify-events.cgi b/website/agenda/planung/notify-events.cgi index 5b65193..5741281 100755 --- a/website/agenda/planung/notify-events.cgi +++ b/website/agenda/planung/notify-events.cgi @@ -215,7 +215,7 @@ sub getMail { $mail->{Data} .= "nur zur Erinnerung...\n\n"; $mail->{Data} .= "am $event->{weekday_name} ist die naechste '$event->{series_name}'-Sendung.\n\n"; $mail->{Data} .= - "$event->{source_base_url}$event->{cache_base_url}/$config->{controllers}->{event}/$event->{event_id}.html\n\n"; + "$event->{source_base_url}$event->{widget_render_url}/$config->{controllers}->{event}/$event->{event_id}.html\n\n"; $mail->{Data} .= "Gruss, $request->{user}\n"; return $mail; } diff --git a/website/agenda/planung/templates/comments.html b/website/agenda/planung/templates/comments.html index fd483f4..48712d4 100644 --- a/website/agenda/planung/templates/comments.html +++ b/website/agenda/planung/templates/comments.html @@ -58,7 +58,7 @@ - + - diff --git a/website/agenda/planung/templates/edit-event.html b/website/agenda/planung/templates/edit-event.html index d0b71ac..833fd86 100644 --- a/website/agenda/planung/templates/edit-event.html +++ b/website/agenda/planung/templates/edit-event.html @@ -138,7 +138,7 @@ diff --git a/website/agenda/templates/default/calendar.html b/website/agenda/templates/default/calendar.html index 78f84a0..f5daaa0 100644 --- a/website/agenda/templates/default/calendar.html +++ b/website/agenda/templates/default/calendar.html @@ -16,15 +16,15 @@ Access-Control-Allow-Origin: * - « - - » @@ -43,7 +43,7 @@ Access-Control-Allow-Origin: * - + diff --git a/website/agenda/templates/default/comments.xml b/website/agenda/templates/default/comments.xml index 28ae71b..de11102 100644 --- a/website/agenda/templates/default/comments.xml +++ b/website/agenda/templates/default/comments.xml @@ -4,7 +4,7 @@ Access-Control-Allow-Origin: * -comments +comments <TMPL_VAR project_title> - Kommentare @@ -15,7 +15,7 @@ Access-Control-Allow-Origin: * info@radiopiloten.de - + calcms @@ -30,8 +30,8 @@ Access-Control-Allow-Origin: * ]]> - - + + diff --git a/website/agenda/templates/default/comments_newest.html b/website/agenda/templates/default/comments_newest.html index 7bb95f5..19ab16c 100644 --- a/website/agenda/templates/default/comments_newest.html +++ b/website/agenda/templates/default/comments_newest.html @@ -10,7 +10,7 @@ Access-Control-Allow-Origin: * - +
: diff --git a/website/agenda/templates/default/event.atom.xml b/website/agenda/templates/default/event.atom.xml index b9b1f7e..f8984cc 100644 --- a/website/agenda/templates/default/event.atom.xml +++ b/website/agenda/templates/default/event.atom.xml @@ -3,7 +3,7 @@ Access-Control-Allow-Origin: * - + <TMPL_VAR project_title> @@ -15,14 +15,14 @@ Access-Control-Allow-Origin: * - + calcms -//.html +//.html @@ -31,8 +31,8 @@ Access-Control-Allow-Origin: * , - - |

]]> - - + + diff --git a/website/agenda/templates/default/event.ics b/website/agenda/templates/default/event.ics index a2872db..6126b51 100644 --- a/website/agenda/templates/default/event.ics +++ b/website/agenda/templates/default/event.ics @@ -41,7 +41,7 @@ LOCATION: SEQUENCE:0 STATUS:CONFIRMED SUMMARY: -URL://.html# +URL://.html# TRANSP:OPAQUE CATEGORIES: END:VEVENT diff --git a/website/agenda/templates/default/event.json-p b/website/agenda/templates/default/event.json-p index 817034d..7991296 100644 --- a/website/agenda/templates/default/event.json-p +++ b/website/agenda/templates/default/event.json-p @@ -35,7 +35,7 @@ Feed = { "openSearch$totalResults" : { "$t" : "" }, "entry" : [ { - "id" : { "$t" : "//.html/" }, + "id" : { "$t" : "//.html/" }, "published" : { "$t": "" }, "updated" : { "$t": "" }, "category" : [ { @@ -49,11 +49,11 @@ Feed = { "link" : [ { "rel" : "alternate", "type" : "text/html", - "href" : "//.html#" + "href" : "//.html#" },{ "rel" : "self", "type" : "application/atom+xml", - "href" : "//.html#" + "href" : "//.html#" } ], "author" : [ { "name" : { "$t" : "" }, diff --git a/website/agenda/templates/default/event.rss.xml b/website/agenda/templates/default/event.rss.xml index a0321c7..f48b5ad 100644 --- a/website/agenda/templates/default/event.rss.xml +++ b/website/agenda/templates/default/event.rss.xml @@ -4,8 +4,8 @@ Content-type:application/rss+xml; charset=UTF-8 - - http:/event.rss.xml + + http:/event.rss.xml <TMPL_VAR project_title> de-de @@ -14,7 +14,7 @@ Content-type:application/rss+xml; charset=UTF-8 3600 http:sites/default/files/images/piradio-logo-kreis.preview.gif - http:/event.rss.xml + http:/event.rss.xml <TMPL_VAR project_title> @@ -23,8 +23,8 @@ Content-type:application/rss+xml; charset=UTF-8 <TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name> - <TMPL_VAR start_time_name> - <TMPL_VAR end_time_name> | <TMPL_VAR full_title> - http://.html# - http://.html + http://.html# + http://.html http://.html#comments diff --git a/website/agenda/templates/default/event_file_export.txt b/website/agenda/templates/default/event_file_export.txt index 5ce3ae1..367c635 100644 --- a/website/agenda/templates/default/event_file_export.txt +++ b/website/agenda/templates/default/event_file_export.txt @@ -5,7 +5,7 @@ $events=[ { '__last__' => q||, 'base_url' => q||, - 'cache_base_url' => q||, + 'widget_render_url' => q||, 'comment_count' => q||, '.controllers.event' => q||, '.controllers.events' => q||, diff --git a/website/agenda/templates/default/event_freefm.xml b/website/agenda/templates/default/event_freefm.xml index 68edae7..738f200 100644 --- a/website/agenda/templates/default/event_freefm.xml +++ b/website/agenda/templates/default/event_freefm.xml @@ -69,7 +69,7 @@ Content-type:text/xml; charset=UTF-8 Sendebeschreibung - https://piradio.de//.html# + https://piradio.de//.html# diff --git a/website/agenda/templates/default/event_list.html b/website/agenda/templates/default/event_list.html index cb6abc7..a77e5d0 100644 --- a/website/agenda/templates/default/event_list.html +++ b/website/agenda/templates/default/event_list.html @@ -22,18 +22,18 @@ Content-type:text/html; charset=utf-8;

- - +
- Kommentare diff --git a/website/agenda/templates/default/event_media.rss.xml b/website/agenda/templates/default/event_media.rss.xml index b4cab4c..c0bb1c0 100644 --- a/website/agenda/templates/default/event_media.rss.xml +++ b/website/agenda/templates/default/event_media.rss.xml @@ -9,7 +9,7 @@ Content-type:application/rss+xml; charset=UTF-8 - http:/event.rss.xml + http:/event.rss.xml <TMPL_VAR project_title> diff --git a/website/agenda/templates/default/event_menu.html b/website/agenda/templates/default/event_menu.html index 0fa0f95..a7e88b4 100644 --- a/website/agenda/templates/default/event_menu.html +++ b/website/agenda/templates/default/event_menu.html @@ -18,14 +18,14 @@ Content-type:text/html; charset=UTF-8;
- + ,