diff --git a/lib/calcms/calendar.pm b/lib/calcms/calendar.pm index cb5b070..5131920 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,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 ); } diff --git a/lib/calcms/comments.pm b/lib/calcms/comments.pm index e6c1991..5673604 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/ ) { @@ -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 ); } diff --git a/lib/calcms/events.pm b/lib/calcms/events.pm index 11445db..341c88f 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} @@ -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)/ ) ) diff --git a/tools/setUserPassword.pl b/tools/setUserPassword.pl index dc918a8..2f69f6e 100644 --- a/tools/setUserPassword.pl +++ b/tools/setUserPassword.pl @@ -15,7 +15,6 @@ my $cgi=new CGI(); my $params=$cgi->Vars(); my $config =config::get('../../piradio.de/agenda/config/config.cgi'); -my $debug =$config->{system}->{debug}; $params=check_params($params); our $errors=[]; diff --git a/tools/sync_cms/config/jobs.config b/tools/sync_cms/config/jobs.config deleted file mode 100644 index 110b3c5..0000000 --- a/tools/sync_cms/config/jobs.config +++ /dev/null @@ -1,18 +0,0 @@ - - -start_dir /home/calcms/agenda/admin/jobs/start/ -log_dir /home/calcms/agenda/admin/jobs/logs/ - - - title potsdam : sender berlin -> 88vier.de - name potsdam_to_88vier.de - command /home/radio/calcms/sync_cms/sync_jobs/calcms_to_google.sh -7 31 potsdam - - - - title frb : sender berlin -> 88vier.de - name frb_to_88vier.de - command /home/radio/calcms/sync_cms/sync_jobs/calcms_to_google.sh -7 31 frb - - - diff --git a/tools/sync_cms/config/source/calcms_ansage.cfg b/tools/sync_cms/config/source/calcms_ansage.cfg deleted file mode 100644 index 3083ea4..0000000 --- a/tools/sync_cms/config/source/calcms_ansage.cfg +++ /dev/null @@ -1,33 +0,0 @@ - - - hostname localhost - port 3306 - database calcms - username calcms_read - password password - - - - time_zone Europe/Berlin - - - project 88vier - - <88vier> - name 88vier - title 88vier Studio Ansage - start_date 2010-05-01 - end_date 2020-06-01 - - - location ansage - - - event_details_url http://senderberlin.org/programm/sendung/.html - - - - debug 1 - - - diff --git a/tools/sync_cms/config/source/calcms_colabo.cfg b/tools/sync_cms/config/source/calcms_colabo.cfg deleted file mode 100644 index 4be6dcd..0000000 --- a/tools/sync_cms/config/source/calcms_colabo.cfg +++ /dev/null @@ -1,33 +0,0 @@ - - - hostname localhost - port 3306 - database calcms - username calcms_read - password password - - - - time_zone Europe/Berlin - - - project 88vier - - <88vier> - name 88vier - title 88vier Colaboradio - start_date 2010-05-01 - end_date 2020-06-01 - - - location colabo - - - event_details_url http://senderberlin.org/programm/sendung/.html - - - - debug 1 - - - diff --git a/tools/sync_cms/config/source/calcms_frb.cfg b/tools/sync_cms/config/source/calcms_frb.cfg deleted file mode 100644 index 5d89ead..0000000 --- a/tools/sync_cms/config/source/calcms_frb.cfg +++ /dev/null @@ -1,33 +0,0 @@ - - - hostname localhost - port 3306 - database calcms - username calcms_read - password password - - - - time_zone Europe/Berlin - - - project 88vier - - <88vier> - name 88vier - title 88vier FRB - start_date 2010-05-01 - end_date 2020-06-01 - - - location frb - - - event_details_url http://senderberlin.org/programm/sendung/.html - - - - debug 1 - - - diff --git a/tools/sync_cms/config/source/calcms_piradio.cfg b/tools/sync_cms/config/source/calcms_piradio.cfg deleted file mode 100644 index 1f689ed..0000000 --- a/tools/sync_cms/config/source/calcms_piradio.cfg +++ /dev/null @@ -1,33 +0,0 @@ - - - hostname localhost - port 3306 - database calcms - username calcms_read - password password - - - - time_zone Europe/Berlin - - - project 88vier - - <88vier> - name 88vier - title 88vier PI-Radio - start_date 2010-05-01 - end_date 2020-06-01 - - - location piradio - - - event_details_url http://piradio.de/programm/sendung/.html - - - - debug 1 - - - diff --git a/tools/sync_cms/config/source/calcms_potsdam.cfg b/tools/sync_cms/config/source/calcms_potsdam.cfg deleted file mode 100644 index 28d49c1..0000000 --- a/tools/sync_cms/config/source/calcms_potsdam.cfg +++ /dev/null @@ -1,33 +0,0 @@ - - - hostname localhost - port 3306 - database calcms - username calcms_read - password password - - - - time_zone Europe/Berlin - - - project 88vier - - <88vier> - name 88vier - title 88vier Frrapo - start_date 2010-05-01 - end_date 2020-06-01 - - - location potsdam - - - event_details_url http://senderberlin.org/programm/sendung/.html - - - - debug 1 - - - diff --git a/tools/sync_cms/config/target/88vier_ansage.cfg b/tools/sync_cms/config/target/88vier_ansage.cfg deleted file mode 100644 index bb7991e..0000000 --- a/tools/sync_cms/config/target/88vier_ansage.cfg +++ /dev/null @@ -1,21 +0,0 @@ - - - calendarId your-id - serviceAccount your-accounr@developer.gserviceaccount.com - serviceAccountKeyFile googleApi.key - - - - time_zone Europe/Berlin - - - - title : - - content mehr zur Sendung - - - - debug 1 - - - diff --git a/tools/sync_cms/config/target/88vier_colabo.cfg b/tools/sync_cms/config/target/88vier_colabo.cfg deleted file mode 100644 index fbd2c13..0000000 --- a/tools/sync_cms/config/target/88vier_colabo.cfg +++ /dev/null @@ -1,21 +0,0 @@ - - - calendarId your-calendar-id - serviceAccount your-account@developer.gserviceaccount.com - serviceAccountKeyFile googleApi.key - - - - time_zone Europe/Berlin - - - - title : - - content mehr zur Sendung - - - - debug 1 - - - diff --git a/tools/sync_cms/config/target/88vier_frb.cfg b/tools/sync_cms/config/target/88vier_frb.cfg deleted file mode 100644 index a02aa9d..0000000 --- a/tools/sync_cms/config/target/88vier_frb.cfg +++ /dev/null @@ -1,21 +0,0 @@ - - - calendarId your-id@group.calendar.google.com - serviceAccount your-account@developer.gserviceaccount.com - serviceAccountKeyFile googleApi.key - - - - time_zone Europe/Berlin - - - - title : - - content mehr zur Sendung - - - - debug 1 - - - diff --git a/tools/sync_cms/config/target/88vier_piradio.cfg b/tools/sync_cms/config/target/88vier_piradio.cfg deleted file mode 100644 index 8359efb..0000000 --- a/tools/sync_cms/config/target/88vier_piradio.cfg +++ /dev/null @@ -1,21 +0,0 @@ - - - calendarId your-id@group.calendar.google.com - serviceAccount your-account@developer.gserviceaccount.com - serviceAccountKeyFile googleApi.key - - - - time_zone Europe/Berlin - - - - title - - - content mehr zur Sendung - - - - debug 1 - - - diff --git a/tools/sync_cms/config/target/88vier_potsdam.cfg b/tools/sync_cms/config/target/88vier_potsdam.cfg deleted file mode 100644 index 5551f67..0000000 --- a/tools/sync_cms/config/target/88vier_potsdam.cfg +++ /dev/null @@ -1,23 +0,0 @@ - - type google_calendar2 - - - calendarId 8nh18f858098u4ji4qrsmfrcr4@group.calendar.google.com - serviceAccount 433089473368-bv26eveq03b7nhb9p62nu3ts7htgb4g3@developer.gserviceaccount.com - serviceAccountKeyFile /home/radio/googleApi.key - - - - time_zone Europe/Berlin - - - - title : - - content mehr zur Sendung - - - - debug 1 - - - diff --git a/tools/sync_cms/lib/CalcmsEvents.pm b/tools/sync_cms/lib/CalcmsEvents.pm deleted file mode 100644 index 9f9d45e..0000000 --- a/tools/sync_cms/lib/CalcmsEvents.pm +++ /dev/null @@ -1,135 +0,0 @@ -package CalcmsEvents; - -use strict; -use warnings; - -use Common ('info','error'); -use DateTime; -use Data::Dumper; - -use creole_wiki; -use events; -use time; -#use config; - -my $settings = {}; - -sub init($) { - $settings = shift || {}; -} - -sub set($$) { - my $key = shift; - my $value = shift; - $settings->{$key} = $value; -} - -sub get($) { - my $key = shift; - return $settings->{$key}; -} - -# return a list of start_min, start_max request parameters. -sub splitRequest($$$) { - my $from = shift; - my $till = shift; - my $timeZone = shift; - - return undef unless defined $from; - return undef unless defined $till; - return undef if $from eq ''; - return undef if $till eq ''; - - my $dates = []; - - my $start = time::get_datetime( $from, $timeZone ); - my $end = time::get_datetime( $till, $timeZone ); - - #build a list of dates - my $date = $start; - my @dates = (); - while ( $date < $end ) { - push @dates, $date; - $date = $date->clone->add( days => 7 ); - } - my $duration = $end - $date; - - push @dates, $end->clone if $duration->delta_seconds <= 0; - - #build a list of parameters from dates - $start = shift @dates; - for my $end (@dates) { - push @$dates, - { - from => $start, - till => $end - }; - $start = $end; - } - - return $dates; - -} - -#get a hash with per-day-lists days of a google calendar, given by its url defined at $calendar_name -sub getEvents($$) { - my $from = shift; - my $till = shift; - - my $last_update = get('last_update'); - info "getEvents from $from till $till"; - - my $request_parameters = { - from_date => $from, - till_date => $till, - project => get('project'), - archive => 'all', - template => 'no' - }; - my $location = get('location') || ''; - $request_parameters->{location} = $location if $location ne ''; - - my $config = $settings; - my %params = (); - my $request = { - url => $ENV{QUERY_STRING}, - params => { - original => \%params, - checked => events::check_params( $config, $request_parameters, $settings ), - }, - }; - - my $sourceEvents = events::get( $config, $request, $settings ); - - #return events by date - my $eventsByDate = {}; - for my $source (@$sourceEvents) { - $source->{calcms_start} = $source->{start}; - my $key = substr( $source->{start}, 0, 10 ); - push @{ $eventsByDate->{$key} }, $source; - } - return $eventsByDate; -} - -sub mapToSchema { - my $event = shift; - - #override settings by source map filter - for my $key ( keys %{ get('mapping') } ) { - $event->{$key} = get('mapping')->{$key}; - } - - #resolve variables set in mapped values - for my $mkey ( keys %{ get('mapping') } ) { - for my $key ( keys %{$event} ) { - my $val = $event->{$key}; - $val = $event->{$key} if ( $mkey eq $key ); - $event->{$mkey} =~ s//$val/g; - } - } - - return $event; -} - -#do not delete last line -1; diff --git a/tools/sync_cms/lib/Common.pm b/tools/sync_cms/lib/Common.pm deleted file mode 100644 index 90b78ca..0000000 --- a/tools/sync_cms/lib/Common.pm +++ /dev/null @@ -1,75 +0,0 @@ -package Common; -use warnings; -use strict; - -use Fcntl ':flock'; - -use base 'Exporter'; -our @EXPORT_OK = ( 'info', 'error' ); - -sub checkSingleInstance() { - open my $self, '<', $0 or die "Couldn't open self: $!"; - flock $self, LOCK_EX | LOCK_NB or die "This script $0 is already running"; -} - -sub loadFile($) { - my $filename = shift; - - my $content = ''; - open my $file, '<', $filename || die("cannot load $filename"); - while (<$file>) { - $content .= $_; - } - close $file; - return $content; -} - -sub saveFile($$) { - my $filename = shift; - my $content = shift; - open my $file, ">:utf8", $filename || die("cannot write $filename"); - print $file $content; - close $file; - -} - -sub getModifiedAt { - my $file = shift; - my @stats = stat $file; - return 0 if scalar @stats == 0; - my $modifiedAt = $stats[9]; - return $modifiedAt; -} - -sub execute($) { - my $command = shift; - print "EXEC:\t$command\n"; - my $result = `$command`; - my $exitCode = ( $? >> 8 ); - print "ERROR! exitCode=$?\n" if $exitCode > 0; - return ( $exitCode, $result ); -} - -my $debug = 0; - -sub debug($$) { - my $level = shift; - my $message = shift; - print $message. "\n" if $debug > $level; -} - -sub error ($) { - print "\nERROR: $_[0]\nsee $0 --help for help"; - exit 1; -} - -sub info ($) { - my $message = shift; - if ( $message =~ /^\n/ ) { - $message =~ s/^\n//g; - print "\n"; - } - print "INFO:\t$message\n"; -} - -return 1; diff --git a/tools/sync_cms/lib/GoogleCalendar.pm b/tools/sync_cms/lib/GoogleCalendar.pm deleted file mode 100644 index 57df031..0000000 --- a/tools/sync_cms/lib/GoogleCalendar.pm +++ /dev/null @@ -1,197 +0,0 @@ -package GoogleCalendar; - -use strict; -use warnings; - -use Data::Dumper; - -use lib '../calcms/'; -use Common ( 'info', 'error' ); -use GoogleCalendarApi(); -use time(); - -my $settings = {}; -my $cal = undef; -my $debug = 1; - -sub set($$) { - my $key = shift; - my $value = shift; - $settings->{$key} = $value; -} - -sub get($) { - my $key = shift; - return $settings->{$key}; -} - -sub init($) { - $settings = shift || {}; - - my $access = get('access'); - - # 1. create service account at https://console.developers.google.com/ - # 2. enable Calendar API - # 3. share calendar with service account for update permissions - - # see http://search.cpan.org/~shigeta/Google-API-Client-0.13/lib/Google/API/Client.pm - - my $serviceAccount = $access->{serviceAccount}; - my $serviceAccountKeyFile = $access->{serviceAccountKeyFile}; - my $calendarId = $access->{calendarId}; - - my $serviceAccountKey = Common::loadFile($serviceAccountKeyFile); - my $calendar = GoogleCalendarApi->new( - { - 'serviceAccount' => $serviceAccount, - 'privateKey' => $serviceAccountKey, - 'calendarId' => $calendarId, - 'debug' => 0 - } - ); - - $cal = $calendar; -} - -#map event schema to target schema -sub mapToSchema { - my $event = shift; - - #clone event - my $targetEvent = {}; - for my $key ( keys %{$event} ) { - $targetEvent->{$key} = $event->{$key}; - } - - if ( defined $event->{recurrence} && ref( $event->{recurrence} ) eq 'HASH' ) { - $targetEvent->{reference} .= '[' . $event->{recurrence}->{number} . ']' if ( $event->{recurrence}->{number} > 0 ); - $targetEvent->{recurrence} = $event->{recurrence}->{number} + 0; - } - $targetEvent->{rating} = 0; - $targetEvent->{visibility} = 0; - - #set project by project's date range - my $projects = get('projects'); - if ( ref($projects) eq 'HASH' ) { - for my $projectName ( keys %$projects ) { - my $project = get('projects')->{$projectName}; - my $start = substr( $event->{start}, 0, 10 ); - if ( $start ge $project->{start_date} && $start le $project->{end_date} ) { - $targetEvent->{project} = $project->{name}; - } - } - } - - #override settings by target map filter - for my $key ( keys %{ get('mapping') } ) { - $targetEvent->{$key} = get('mapping')->{$key}; - } - - #resolve variables set in mapped values - for my $mkey ( keys %{ get('mapping') } ) { - for my $key ( sort keys %{$targetEvent} ) { - my $val = $targetEvent->{$key}; - $val = $event->{$key} if $mkey eq $key; - $targetEvent->{$mkey} =~ s//$val/g; - } - } - $targetEvent->{title} =~ s/\s+$//g; - $targetEvent->{title} =~ s/\s*\#$//g; - $targetEvent->{title} =~ s/\s*\-\s*$//g; - - my $schema = { event => $targetEvent }; - - return $schema; -} - -#this is done before sync and allows to delete old events before adding new -sub getEvents { - my $event = shift; - - return undef if get('date')->{'time_zone'} eq ''; - return undef if $event->{start} eq ''; - return undef if $event->{end} eq ''; - - #delete a span of dates - my $timeZone = get('date')->{'time_zone'}; - my $start = time::get_datetime( $event->{start}, $timeZone ); - my $end = time::get_datetime( $event->{end}, $timeZone ); - - info( "search target for events from " . $start . " to " . $end ); - - #search datetime with same timezone - my $events = $cal->getEvents( - { - timeMin => $cal->getDateTime( $start->datetime, $timeZone ), - timeMax => $cal->getDateTime( $end->datetime, $timeZone ), - maxResults => 50, - singleEvents => 'true', - orderBy => 'startTime' - } - ); - - return $events; -} - -# insert a new event -sub insertEvent { - my $event = shift; - my $entity = $event->{event}; - - $entity->{'html_content'} = markup::creole_to_html( $entity->{'content'} ); - - my $timeZone = get('date')->{'time_zone'}; - - my $start = $cal->getDateTime( $entity->{start}, $timeZone ); - my $end = $cal->getDateTime( $entity->{end}, $timeZone ); - - #info "insert event\t$start\t$entity->{title}"; - my $entry = { - start => $start, - end => $end, - summary => $entity->{title}, - description => $entity->{content}, - location => $entity->{location}, - transparency => 'transparent', - status => 'confirmed' - }; - - my $result = $cal->insertEvent($entry); - my $id = $result->{id}; -} - -sub deleteEvent { - my $event = shift; - - #info "delete event"; - $cal->deleteEvent( $event->{id} ); -} - -sub fixFields { - my $event = shift; - - #lower case for upper case titles longer than 4 characters - for my $attr ( 'series_name', 'title' ) { - my $val = $event->{$attr}; - my $c = 0; - while ( $val =~ /\b([A-Z]{5,99})\b/ && $c < 10 ) { - my $word = $1; - my $lower = lc $word; - $lower =~ s/^([a-z])/\u$1/gi; - $val =~ s/$word/$lower/g; - $c++; - } - $event->{$attr} = $val if $event->{$attr} ne $val; - } - - for my $attr ( 'series_name', 'title', 'excerpt', 'content' ) { - my $val = $event->{$attr}; - $val =~ s/^\s*(.*?)\s*$/$1/g; - $val =~ s/^[ \t]/ /g; - $event->{$attr} = $val if $event->{$attr} ne $val; - } - return $event; -} - -#do not delete last line -1; diff --git a/tools/sync_cms/lib/GoogleCalendarApi.pm b/tools/sync_cms/lib/GoogleCalendarApi.pm deleted file mode 100644 index 4d690c0..0000000 --- a/tools/sync_cms/lib/GoogleCalendarApi.pm +++ /dev/null @@ -1,250 +0,0 @@ -package GoogleCalendarApi; - -use strict; -use warnings; - -use JSON; -use JSON::WebToken; -use LWP::UserAgent; -use HTML::Entities; -use URI::Escape; -use Data::Dumper; -use DateTime; -use Time::HiRes qw(sleep); - -use Common ( 'info', 'error' ); - -sub new { - my $class = shift; - my $params = shift; - - #print Dumper($class); - my $self = {}; - for my $attr ( 'calendarId', 'debug' ) { - $self->{$attr} = $params->{$attr} if defined $params->{$attr}; - } - $self->{debug} = 1; - - my $instance = bless $self, $class; - if ( ( defined $params->{serviceAccount} ) && ( defined $params->{privateKey} ) ) { - $instance->login( $params->{serviceAccount}, $params->{privateKey} ); - } - - return $instance; -} - -sub setCalendar { - my $self = shift; - my $calendarId = shift; - $self->{calendarId} = $calendarId; -} - -sub getBasicUrl { - my $self = shift; - return 'https://www.googleapis.com/calendar/v3/calendars/' . encode_entities( $self->{calendarId} ); -} - -#https://developers.google.com/google-apps/calendar/v3/reference/events/list - -#returns { -# 'timeZone' => 'Europe/Berlin', -# 'description' => "Radioprogramm von Pi Radio f\x{fc}r 88vier.de", -# 'defaultReminders' => [], -# 'accessRole' => 'owner', -# 'etag' => '"1415821582086000"', -# 'kind' => 'calendar#events', -# 'summary' => '88vier.de Pi Radio (Programm)', -# 'updated' => '2014-11-12T19:46:22.086Z', -# 'items' => [...] -# } -sub getEvents { - my $self = shift; - my $params = shift; - - my $url = '/events?'; - for my $param ( - 'iCalUID', 'alwaysIncludeEmail', 'maxAttendees', 'maxResults', - 'orderBy', 'pageToken', 'privateExtendedProperty', 'q', - 'sharedExtendedProperty', 'showDeleted', 'showHiddenInvitations', 'singleEvents', - 'syncToken', 'timeZone' - ) - { - $url .= '&' . $param . '=' . uri_escape( $params->{$param} ) if defined $params->{$param}; - } - for my $param ( 'timeMin', 'timeMax', 'updatedMin' ) { - $url .= '&' . $param . '=' . uri_escape( $self->formatDateTime( $params->{$param} ) ) if defined $params->{$param}; - } - my $result = $self->httpRequest( 'GET', $url ); - return $result; -} - -# sleep 0.25 seconds to prevent hitting the 5.0 requests/second/user rate -#sub sleep{ -# my $this=shift; -# my $duration=shift; -# $duration=1 unless defined $duration; -# select(undef, undef, undef, $duration); -#} - -#https://developers.google.com/google-apps/calendar/v3/reference/events/delete -sub deleteEvent { - my $self = shift; - my $eventId = shift; - my $url = '/events/' . $eventId; - - #DELETE https://www.googleapis.com/calendar/v3/calendars/calendarId/events/eventId - my $result = $self->httpRequest( 'DELETE', $url ); - - #$self->sleep(); - return $result; -} - -#https://developers.google.com/google-apps/calendar/v3/reference/events/insert -sub insertEvent { - my $self = shift; - my $params = shift; - - my $event = { - start => { - dateTime => $self->formatDateTime( $params->{start} ) - }, - end => { - dateTime => $self->formatDateTime( $params->{end} ) - }, - summary => $params->{summary} || '', - description => $params->{description} || '', - location => $params->{location} || '', - status => $params->{confirmed} || 'confirmed' - }; - $event = encode_json $event; - - #POST https://www.googleapis.com/calendar/v3/calendars/calendarId/events - my $url = '/events'; - my $result = $self->httpRequest( 'POST', $url, $event ); - - #$self->sleep(); - return $result; -} - -# send a HTTP request -sub httpRequest { - my $self = shift; - my $method = shift; - my $url = shift; - my $content = shift || ''; - - sleep 0.3; - print STDERR "$method " . $url . "\n" if $self->{debug}; - - die("missing url") unless defined $url; - die("calendarId not set") unless defined $self->{calendarId}; - die("not logged in ") unless defined $self->{api}; - - #prepend basic url including calendar id - $url = $self->getBasicUrl() . $url; - print STDERR "$method " . $url . "\n" if $self->{debug}; - - my $response = undef; - if ( $method eq 'GET' ) { - $response = $self->{api}->get($url); - } elsif ( ( $method eq 'POST' ) || ( $method eq 'PUT' ) ) { - #return; - print STDERR $content . "\n" if $self->{debug}; - my $request = HTTP::Request->new( $method, $url ); - $request->header( 'Content-Type' => 'application/json' ); - $request->content($content); - $response = $self->{api}->request($request); - } elsif ( $method eq 'DELETE' ) { - #return; - $response = $self->{api}->delete($url); - } - - if ( $response->is_success ) { - my $content = $response->content; - return {} if $content eq ''; - return decode_json($content); - } else { - print "ERROR:\n"; - print "Code: " . $response->code . "\n"; - print "Message: " . $response->message . "\n"; - print $response->content . "\n"; - die; - } -} - -# write datetime object to string -sub formatDateTime { - my $self = shift; - my $dt = shift; - - my $datetime = $dt->format_cldr("yyyy-MM-ddTHH:mm:ssZZZZZ"); - print STDERR "$dt -> $datetime\n" if $self->{debug}; - return $datetime; -} - -# parse datetime from string to object -sub getDateTime { - my $self = shift; - my $datetime = shift; - my $timezone = shift; - - return if ( !defined $datetime ) or ( $datetime eq '' ); - my @l = split /[\-\;T\s\:\+\.]/, $datetime; - - $datetime = DateTime->new( - year => $l[0], - month => $l[1], - day => $l[2], - hour => $l[3], - minute => $l[4], - second => $l[5], - time_zone => $timezone - ); - return $datetime; -} - -# login with serviceAccount and webToken (from privateKey) -sub login { - my $self = shift; - my $serviceAccount = shift; - my $privateKey = shift; - - # https://developers.google.com/accounts/docs/OAuth2ServiceAccount - my $time = time; - - #create JSON Web Token - my $jwt = JSON::WebToken->encode( - { - iss => $serviceAccount, - scope => 'https://www.googleapis.com/auth/calendar', - aud => 'https://accounts.google.com/o/oauth2/token', - exp => $time + 3600, - iat => $time, - }, - $privateKey, - 'RS256', - { typ => 'JWT' } - ); - - #send JSON web token to authentication service - $self->{auth} = LWP::UserAgent->new(); - my $response = $self->{auth}->post( - 'https://accounts.google.com/o/oauth2/token', - { - grant_type => encode_entities('urn:ietf:params:oauth:grant-type:jwt-bearer'), - assertion => $jwt - } - ); - - die( $response->code, "\n", $response->content, "\n" ) unless $response->is_success(); - my $data = decode_json( $response->content ); - - #create a new user agent and set token to bearer - $self->{api} = LWP::UserAgent->new(); - $self->{api}->default_header( Authorization => 'Bearer ' . $data->{access_token} ); - - print STDERR "login successful\n" if $self->{debug}; - return $data; -} - -1; diff --git a/tools/sync_cms/run_jobs.pl b/tools/sync_cms/run_jobs.pl deleted file mode 100755 index b61df03..0000000 --- a/tools/sync_cms/run_jobs.pl +++ /dev/null @@ -1,81 +0,0 @@ -#! /usr/bin/perl - -use strict; -use warnings; - -use Data::Dumper; -use FindBin; -use lib "$FindBin::Bin/lib"; -use lib "$FindBin::Bin/../calcms"; - -use Common ( 'info', 'error' ); - -use config(); -use time(); -use log(); - -$| = 1; - -sub runJobs { - my $jobs = shift; - my $startDir = shift; - my $logDir = shift; - - for my $job (@$jobs) { - - my $startFile = $startDir . '/' . $job->{name} . '.start.txt'; - my $startAge = Common::getModifiedAt($startFile); - next if $startAge == 0; - - my $logFile = $logDir . '/' . $job->{name} . '.log'; - my $logAge = Common::getModifiedAt($logFile); - next if $startAge < $logAge; - - # read parameters form start file - my $content = log::load_file($startFile); - - #execute command - my $command = $job->{command} . ' 2>&1 > ' . $logFile; - my ( $exitCode, $result ) = Common::execute($command); - error "exitCode=$exitCode on $command" if $exitCode != 0; - } -} - -sub check() { - my $configFile = shift @ARGV; - error qq{cannot read $configFile "$configFile"} unless -e $configFile; - - my $config = config::get($configFile); - - my $startDir = $config->{start_dir} || ''; - error 'missing configuration of jobs/start_dir!' if $startDir eq ''; - error "job dir does not exist '$startDir'" unless -e $startDir; - error "cannot read from job dir '$startDir'. Please check permissions!" unless -w $startDir; - - my $logDir = $config->{log_dir} || ''; - error 'missing configuration of jobs/log_dir' if $logDir eq ''; - error "job log dir does not exist '$logDir'" unless -e $logDir; - error "cannot read from job log dir '$logDir'. Please check permissions!" unless -r $logDir; - error "cannot write to job log dir '$logDir'. Please check permissions!" unless -w $logDir; - - my $jobs = $config->{job}; - error "no jobs defined!" if scalar @$jobs == 0; - - return ( $jobs, $startDir, $logDir ); -} - -sub main() { - - info "INIT\t" . time::time_to_datetime(); - Common::checkSingleInstance(); - my ( $jobs, $startDir, $logDir ) = check(); - - #exit after a at most 10 minute timeout in case of hanging process - local $SIG{ALRM} = sub { die "ERROR: exit due to synchronization hangs\n" }; - alarm 10 * 60; - - runJobs( $jobs, $startDir, $logDir ); - info "DONE\t" . time::time_to_datetime(); -} - -main(); diff --git a/tools/sync_cms/sync_cms.pl b/tools/sync_cms/sync_cms.pl deleted file mode 100755 index a5fa3aa..0000000 --- a/tools/sync_cms/sync_cms.pl +++ /dev/null @@ -1,292 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -use Data::Dumper; -use Getopt::Long; -use Config::General; -use DateTime; -use DateTime::Duration; -use IO::Socket::INET; -use Fcntl ':flock'; - -use FindBin; -use lib "$FindBin::Bin/lib"; -use lib "$FindBin::Bin/../../calcms"; - -use Common ( 'info', 'error' ); -use GoogleCalendar; -use CalcmsEvents; - -Common::checkSingleInstance(); - -BEGIN { - $ENV{LANG} = "en_US.UTF-8"; -} - -$| = 1; - -my $sourceConfigFile = ''; -my $targetConfigFile = ''; -my $debug = 1; - -my $from = undef; -my $till = undef; -GetOptions( - "from=s" => \$from, - "till=s" => \$till, - "source=s" => \$sourceConfigFile, - "target=s" => \$targetConfigFile, -); - -#source and taget settings are loaded from config files -my $settings = {}; - -error "set one of folling parameters: --from, --till" unless $from || $till; - -init(); -sync(); -info "$0 done."; -exit 0; - -#sync all events, splitting multi-day-requests into multiple 1-day-requests to avoid large result sets -sub sync { - my $timeZone = CalcmsEvents::get('date')->{time_zone}; - my $from = CalcmsEvents::get('start_min'); - my $till = CalcmsEvents::get('start_max'); - - info "sync from $from till $till at $timeZone"; - - #prepare target - info "last update: " . ( CalcmsEvents::get('last_update') || '' ); - - if ( my $days = CalcmsEvents::splitRequest( $from, $till, $timeZone ) ) { - for my $date (@$days) { - syncTimespan( $date->{from}, $date->{till} ); - } - } else { - syncTimespan( $from, $till ); - } - - info "\nset last-update time: $settings->{event}->{update_start}"; - setLastUpdateTime( $sourceConfigFile, $targetConfigFile, $settings->{event}->{update_start} ); -} - -#sync all events of a given source timespan -sub syncTimespan { - my $from = shift; - my $till = shift; - - #get a list of all days and their events - my $sourceEvents = CalcmsEvents::getEvents( $from, $till ); - - my @dates = keys %$sourceEvents; - if ( scalar @dates == 0 ) { - info "\nno entries found."; - return; - } - - #sort lists of date and time (same time events should be preserved) - for my $date ( sort { $a cmp $b } @dates ) { - syncEvents( $sourceEvents->{$date} ); - } - -} - -#syncronize a list of source events to target events -sub syncEvents($) { - my $sourceEvents = shift; - - my @sourceEvents = sort { $a->{calcms_start} cmp $b->{calcms_start} } @$sourceEvents; - $sourceEvents = \@sourceEvents; - my $start = $sourceEvents->[0]->{start}; - my $end = $sourceEvents->[-1]->{end}; - - my $targetEvents = GoogleCalendar::getEvents( - { - start => $start, - end => $end - } - ); - $targetEvents = $targetEvents->{items}; - info "google:" . scalar(@$targetEvents) . " vs " . scalar(@$sourceEvents); - - # mark all known target events - my $targetEventsByKey = {}; - for my $event (@$targetEvents) { - #print Dumper($event); - next if $event->{status} eq 'canceled'; - my $key = getGoogleEventToString($event); - $targetEventsByKey->{$key} = $event; - } - - # mark all knwon source events - my $sourceEventsByKey = {}; - for my $event (@$sourceEvents) { - $event = CalcmsEvents::mapToSchema($event); - $event = GoogleCalendar::mapToSchema($event); - my $key = getCalcmsEventToString($event); - $sourceEventsByKey->{$key} = $event; - } - - # delete target entries without matching source entries - for my $key ( keys %$targetEventsByKey ) { - next if defined $sourceEventsByKey->{$key}; - my $event = $targetEventsByKey->{$key}; - info "delete $key "; - print Dumper($event); - GoogleCalendar::deleteEvent($event); - } - - # insert source entries without matching target entries - for my $key ( keys %$sourceEventsByKey ) { - if ( defined $targetEventsByKey->{$key} ) { - info "$key is up to date"; - next; - } - my $event = $sourceEventsByKey->{$key}; - info "insert $key"; - GoogleCalendar::insertEvent($event); - } - -} - -sub getGoogleEventToString { - my $event = shift; - my $result = "\n"; - $result .= "start: " . substr( $event->{start}->{dateTime}, 0, 19 ) . "\n"; - $result .= "end : " . substr( $event->{end}->{dateTime}, 0, 19 ) . "\n"; - $result .= "title: $event->{summary}\n"; - $result .= "desc : $event->{description}\n"; - return $result; -} - -sub getCalcmsEventToString { - my $event = shift; - my $result = "\n"; - $result .= "start: " . substr( $event->{event}->{start_datetime}, 0, 19 ) . "\n"; - $result .= "end : " . substr( $event->{event}->{end_datetime}, 0, 19 ) . "\n"; - $result .= "title: $event->{event}->{title}\n"; - $result .= "desc : $event->{event}->{content}\n"; - return $result; -} - -#import requested source and target libs -sub init { - binmode STDOUT, ":utf8"; - - { - #require target config file - error "missing target parameter!" unless $targetConfigFile =~ /\S/; - error "target file: '$targetConfigFile' does not exist" unless -e $targetConfigFile; - error "cannot read target file: '$targetConfigFile'" unless -r $targetConfigFile; - my $config = new Config::General($targetConfigFile); - $config = $config->{DefaultConfig}->{target}; - GoogleCalendar::init($config); - - } - - { - #require source config file - error "missing source parameter!" unless $sourceConfigFile =~ /\S/; - error "source file: '$sourceConfigFile' does not exist" unless -e $sourceConfigFile; - error "cannot read source file: '$sourceConfigFile'" unless -r $sourceConfigFile; - my $config = new Config::General($sourceConfigFile); - $config = $config->{DefaultConfig}->{source}; - $config->{last_update} = getLastUpdateTime( $sourceConfigFile, $targetConfigFile ); - CalcmsEvents::init($config); - } - - $from .= 'T00:00' if $from =~ /^\d\d\d\d\-\d\d\-\d\d$/; - $till .= 'T23:59' if $till =~ /^\d\d\d\d\-\d\d\-\d\d$/; - - if ( $from =~ /^([-+]?\d+$)/ ) { - my $days = $1; - my $duration = new DateTime::Duration( days => $days ); - $from = DateTime->today->add_duration($duration); - } - - if ( $till =~ /^([-+]?\d+$)/ ) { - my $days = $1 + 1; - my $duration = new DateTime::Duration( days => $days ); - $till = DateTime->today->add_duration($duration); - } - - CalcmsEvents::set( 'start_min', $from ) if defined $from; - CalcmsEvents::set( 'start_max', $till ) if defined $till; - - my $now = time(); - $now = time::time_to_datetime($now); - $settings->{event} = { - update_start => time::time_to_datetime( time() ), - modified_at => $now, - }; - -} - -#output usage on error or --help parameter -sub usage { - print qq{ -update all/modified events from source at target. - -USAGE: sync_cms.pl [--read,--update] [--modified,--all] --source s --target t - -on using --from and --till requests will be processed as multiple single-day-requests. - -parameters: - --read show all events without updating database - --update update target database with source events - - --source source configuration file - --target target configuration file - - --from start of date range: datetime (YYYY-MM-DDTHH:MM::SS) or days from today (e.g. -1 for yesterday, +1 for tomorrow) - --till end of date range: datetime (YYYY-MM-DDTHH:MM::SS) or days from today (e.g. -1 for yesterday, +1 for tomorrow) - -examples: - update modified - perl sync_cms.pl --update --source=config/source/program.cfg --target=config/target/calcms.cfg - update a given time range - perl sync_cms.pl --update --all --from=2009-09-01T00:00:00 --till=2009-11-22T23:59:59 --source=config/source/program.cfg --target=config/target/calcms.cfg - update from last 2 days until next 3 days - perl sync_cms.pl --update --from=-2 --till=+3 --source=config/source/program.cfg --target=config/target/calcms.cfg -}; - exit 1; -} - -#load last update time out of sync.data -sub getLastUpdateTime { - my $source = shift; - my $target = shift; - - my $date = undef; - return undef unless -r "sync.data"; - my $content = Common::loadFile("sync.data"); - if ( $content =~ /$source\s+\->\s+$target\s+:\s+(\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2})/ ) { - $date = $1; - } - return $date; -} - -#save last update time to sync.data -sub setLastUpdateTime { - my $source = shift; - my $target = shift; - my $date = shift; - - my $data = ''; - if ( -r "sync.data" ) { - $data = Common::loadFile("sync.data"); - } - - if ( $data =~ /$source\s+\->\s+$target\s+:\s+(\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2})/ ) { - $data =~ s/($source\s+\->\s+$target\s+:)\s+\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2}/$1\t$date/gi; - } else { - $data .= "$source\t\->\t$target\t:\t$date\n"; - } - - $data =~ s/[\r\n]+/\n/g; - Common::saveFile( "sync.data", $data ); -} - diff --git a/tools/sync_cms/sync_jobs/calcms_to_google.sh b/tools/sync_cms/sync_jobs/calcms_to_google.sh deleted file mode 100755 index 70c0d40..0000000 --- a/tools/sync_cms/sync_jobs/calcms_to_google.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -from=$1 -till=$2 -project=$3 - -export LC_ALL="de_DE.utf8" -export LANGUAGE="de_DE.utf8" - -set -x -cd /home/radio/calcms/sync_cms -nice -n 10 perl sync_cms.pl --from=$from --till=$till --source=config/source/calcms_$project.cfg --target=config/target/88vier_$project.cfg 2>&1 - diff --git a/tools/sync_cms/sync_jobs/sync.sh b/tools/sync_cms/sync_jobs/sync.sh deleted file mode 100755 index 43b3cf0..0000000 --- a/tools/sync_cms/sync_jobs/sync.sh +++ /dev/null @@ -1,7 +0,0 @@ -#/bin/sh - -./sync_project.sh "$1" "$2" piradio -./sync_project.sh "$1" "$2" potsdam -./sync_project.sh "$1" "$2" ansage -./sync_project.sh "$1" "$2" collabo -./sync_project.sh "$1" "$2" frb diff --git a/tools/sync_cms/sync_jobs/update_ansage.sh b/tools/sync_cms/sync_jobs/update_ansage.sh deleted file mode 100755 index fe37ceb..0000000 --- a/tools/sync_cms/sync_jobs/update_ansage.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -file=/home/radio/piradio.de/agenda/admin/jobs/start/ansage_to_88vier.de.start.txt -touch $file -chown radio:www-data $file - diff --git a/tools/sync_cms/sync_jobs/update_colabo.sh b/tools/sync_cms/sync_jobs/update_colabo.sh deleted file mode 100755 index 904b5e1..0000000 --- a/tools/sync_cms/sync_jobs/update_colabo.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -file=/home/radio/piradio.de/agenda/admin/jobs/start/colabo_to_88vier.de.start.txt -touch $file -chown radio:www-data $file - diff --git a/tools/sync_cms/sync_jobs/update_frb.sh b/tools/sync_cms/sync_jobs/update_frb.sh deleted file mode 100755 index 0139861..0000000 --- a/tools/sync_cms/sync_jobs/update_frb.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -file=/home/radio/piradio.de/agenda/admin/jobs/start/frb_to_88vier.de.start.txt -touch $file -chown radio:www-data $file - diff --git a/tools/sync_cms/sync_jobs/update_piradio.sh b/tools/sync_cms/sync_jobs/update_piradio.sh deleted file mode 100755 index ad7c170..0000000 --- a/tools/sync_cms/sync_jobs/update_piradio.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -file=/home/radio/piradio.de/agenda/admin/jobs/start/piradio_to_88vier.de.start.txt -touch $file -chown radio:www-data $file - diff --git a/tools/sync_cms/sync_jobs/update_potsdam.sh b/tools/sync_cms/sync_jobs/update_potsdam.sh deleted file mode 100755 index 86d30d8..0000000 --- a/tools/sync_cms/sync_jobs/update_potsdam.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -file=/home/radio/piradio.de/agenda/admin/jobs/start/potsdam_to_88vier.de.start.txt -touch $file -chown radio:www-data $file - diff --git a/tools/sync_jobs/calcms_to_google.sh b/tools/sync_jobs/calcms_to_google.sh deleted file mode 100755 index fcdac91..0000000 --- a/tools/sync_jobs/calcms_to_google.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -from=$1 -till=$2 -project=$3 - -#. /etc/profile -set LC_ALL="de_DE.utf8" -export LC_ALL="de_DE.utf8" -set LANGUAGE="de_DE.utf8" -export LANGUAGE="de_DE.utf8" - -cd /home/radio/calcms/sync_cms - -echo "nice -n 10 perl sync_cms.pl --update --all --from=$from --till=$till --source=config/source/calcms_$project.cfg --target=config/target/88vier_$project.cfg 2>&1" -nice -n 10 perl sync_cms.pl --update --all --from=$from --till=$till --source=config/source/calcms_$project.cfg --target=config/target/88vier_$project.cfg 2>&1 - - diff --git a/tools/sync_jobs/sync.sh b/tools/sync_jobs/sync.sh deleted file mode 100755 index 95c31a4..0000000 --- a/tools/sync_jobs/sync.sh +++ /dev/null @@ -1,6 +0,0 @@ -#/bin/sh - -./sync_project.sh "$1" "$2" piradio -./sync_project.sh "$1" "$2" potsdam -./sync_project.sh "$1" "$2" ansage -./sync_project.sh "$1" "$2" collabo diff --git a/tools/sync_jobs/update_ansage.sh b/tools/sync_jobs/update_ansage.sh deleted file mode 100755 index abc86c4..0000000 --- a/tools/sync_jobs/update_ansage.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -file=/home/radio/senderberlin.org/agenda/admin/jobs/start/ansage_sender_berlin_to_88vier.de.start.txt -touch $file -chown radio:www-data $file - diff --git a/tools/sync_jobs/update_colabo.sh b/tools/sync_jobs/update_colabo.sh deleted file mode 100755 index 20942b8..0000000 --- a/tools/sync_jobs/update_colabo.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -file=/home/radio/senderberlin.org/agenda/admin/jobs/start/colabo_sender_berlin_to_88vier.de.start.txt -touch $file -chown radio:www-data $file - diff --git a/tools/sync_jobs/update_piradio.sh b/tools/sync_jobs/update_piradio.sh deleted file mode 100755 index 8586e02..0000000 --- a/tools/sync_jobs/update_piradio.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -file=/home/radio/senderberlin.org/agenda/admin/jobs/start/piradio_sender_berlin_to_88vier.de.start.txt -touch $file -chown radio:www-data $file - diff --git a/tools/sync_jobs/update_potsdam.sh b/tools/sync_jobs/update_potsdam.sh deleted file mode 100755 index f7003cb..0000000 --- a/tools/sync_jobs/update_potsdam.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -file=/home/radio/senderberlin.org/agenda/admin/jobs/start/potsdam_sender_berlin_to_88vier.de.start.txt -touch $file -chown radio:www-data $file - diff --git a/website/agenda/aggregate.cgi b/website/agenda/aggregate.cgi index b78d49a..1a8bb63 100755 --- a/website/agenda/aggregate.cgi +++ b/website/agenda/aggregate.cgi @@ -31,8 +31,6 @@ if ( $0 =~ /aggregate.*?\.cgi$/ ) { } my $config = config::getFromScriptLocation(); - - my $debug = $config->{system}->{debug}; my $base_dir = $config->{locations}->{base_dir}; my $output_header = ''; diff --git a/website/agenda/cal.cgi b/website/agenda/cal.cgi index 37c83a4..4c28de8 100755 --- a/website/agenda/cal.cgi +++ b/website/agenda/cal.cgi @@ -19,8 +19,6 @@ if ( $0 =~ /cal.*?\.cgi$/ ) { ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::getFromScriptLocation(); - my $debug = $config->{system}->{debug}; - my $request = { url => $ENV{QUERY_STRING}, params => { diff --git a/website/agenda/comments.cgi b/website/agenda/comments.cgi index ff19394..0b02fc1 100755 --- a/website/agenda/comments.cgi +++ b/website/agenda/comments.cgi @@ -20,8 +20,6 @@ binmode STDOUT, ":encoding(UTF-8)"; if ( $0 =~ /comments.*?\.cgi$/ ) { my $config = config::get('config/config.cgi'); - my $debug = $config->{system}->{debug}; - my $request = { url => $ENV{QUERY_STRING}, params => { diff --git a/website/agenda/config/config.cgi.off b/website/agenda/config/config.cgi.off index 3058341..c8074ca 100755 --- a/website/agenda/config/config.cgi.off +++ b/website/agenda/config/config.cgi.off @@ -31,21 +31,6 @@ domain ${DOMAIN} rss rss - - config_file ${BASE_DIR}/agenda/config/config.cgi - - log_file /var/www/vhosts/${DOMAIN}/logs/error_log - log_debug_file ${LOG_DIR}/${DOMAIN}/calcms.log - log_debug_memory_file ${LOG_DIR}/${DOMAIN}/calcms-mem.log - - debug_memory 0 - debug 0 - - - - base_url /programm - - temp_dir ${BASE_DIR}/temp/ @@ -57,6 +42,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/js/calcms.js b/website/agenda/js/calcms.js index be71c1a..b31a02f 100644 --- a/website/agenda/js/calcms.js +++ b/website/agenda/js/calcms.js @@ -93,7 +93,6 @@ var calcms = (function($) { if (field != null && value != null && field != '') set(field, value); // read fields - var debug = my.get('debug'); var from_date = my.get('from_date'); var till_date = my.get('till_date'); var date = my.get('date'); @@ -203,10 +202,6 @@ var calcms = (function($) { url += "&print=1"; } - if (debug != '') { - url += '&debug=' + debug; - } - return url; } @@ -401,9 +396,7 @@ var calcms = (function($) { // load calendar content my.showCalendar = function showCalendar(target, field) { - var calendar_debug = my.get('calendar_debug'); var calendar_url = my.get('calendar_url'); - var debug = my.get('debug'); var date = my.get('month'); var url = calendar_url; @@ -411,9 +404,6 @@ var calcms = (function($) { if (field == 'month') { url += '/' + date + '/'; } - if (debug != '') { - url += '&debug=' + debug; - } if (target == 'window') { window.location.href = events_url + url; @@ -421,9 +411,6 @@ var calcms = (function($) { my.updateContainer('calcms_calendar', url); } - if (calendar_debug != null) { - calendar_debug.innerHTML = url; - } return false; } @@ -545,7 +532,6 @@ var calcms = (function($) { if (my.get('preloaded') == '') { var program_url = my.get('program_url'); var series_name_url = my.get('series_name_url'); - var debug = my.get('debug'); if (program_url != null && program_url != '') my.updateContainer('calcms_programs', program_url); diff --git a/website/agenda/planung/assign-series.cgi b/website/agenda/planung/assign-series.cgi index e2c0148..075a713 100755 --- a/website/agenda/planung/assign-series.cgi +++ b/website/agenda/planung/assign-series.cgi @@ -32,7 +32,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( !defined $user ) || ( $user eq '' ); diff --git a/website/agenda/planung/assignments.cgi b/website/agenda/planung/assignments.cgi index 87cc686..c8c4213 100755 --- a/website/agenda/planung/assignments.cgi +++ b/website/agenda/planung/assignments.cgi @@ -31,7 +31,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/audio-recordings.cgi b/website/agenda/planung/audio-recordings.cgi index 9523a38..c1710ca 100755 --- a/website/agenda/planung/audio-recordings.cgi +++ b/website/agenda/planung/audio-recordings.cgi @@ -29,7 +29,6 @@ use time(); binmode STDOUT, ":utf8"; our $config = config::get('../config/config.cgi'); -our $debug = $config->{system}->{debug}; my $base_dir = $config->{locations}->{base_dir}; my $tempDir = '/var/tmp'; diff --git a/website/agenda/planung/calendar.cgi b/website/agenda/planung/calendar.cgi index bcd29d5..092d11f 100755 --- a/website/agenda/planung/calendar.cgi +++ b/website/agenda/planung/calendar.cgi @@ -42,7 +42,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( !defined $user ) || ( $user eq '' ); $config->{user} = $user; diff --git a/website/agenda/planung/comment.cgi b/website/agenda/planung/comment.cgi index cfb680e..315b87c 100755 --- a/website/agenda/planung/comment.cgi +++ b/website/agenda/planung/comment.cgi @@ -32,7 +32,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( !defined $user ) || ( $user eq '' ); @@ -139,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) { @@ -148,7 +147,6 @@ sub showComments { $template_parameters->{search} = markup::fix_utf8( $request->{params}->{original}->{search} ); $template_parameters->{events} = $events; - $template_parameters->{debug} = $config->{system}->{debug}; $template_parameters->{event_count} = scalar(@$events); $template_parameters->{comment_count} = $comment_count; $template_parameters->{is_empty} = 1 if scalar @$events == 0; diff --git a/website/agenda/planung/create-events.cgi b/website/agenda/planung/create-events.cgi index a95c22d..fb33e39 100755 --- a/website/agenda/planung/create-events.cgi +++ b/website/agenda/planung/create-events.cgi @@ -26,7 +26,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/event-history.cgi b/website/agenda/planung/event-history.cgi index b8cb861..57d5c35 100755 --- a/website/agenda/planung/event-history.cgi +++ b/website/agenda/planung/event-history.cgi @@ -30,7 +30,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); my $user_presets = uac::get_user_presets( diff --git a/website/agenda/planung/event.cgi b/website/agenda/planung/event.cgi index 1822581..8770a96 100755 --- a/website/agenda/planung/event.cgi +++ b/website/agenda/planung/event.cgi @@ -40,7 +40,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/help.cgi b/website/agenda/planung/help.cgi index 0089709..ed2ce3b 100755 --- a/website/agenda/planung/help.cgi +++ b/website/agenda/planung/help.cgi @@ -25,7 +25,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/image-upload.cgi b/website/agenda/planung/image-upload.cgi index b1ed0c1..2d7c82a 100755 --- a/website/agenda/planung/image-upload.cgi +++ b/website/agenda/planung/image-upload.cgi @@ -33,7 +33,6 @@ my $r = shift; my $cgi = undef; my $config = config::get('../config/config.cgi'); -our $debug = $config->{system}->{debug}; my $base_dir = $config->{locations}->{base_dir}; my $tmp_dir = '/var/tmp'; my $upload_limit = 2048 * 1000; diff --git a/website/agenda/planung/image.cgi b/website/agenda/planung/image.cgi index 15a3a96..5957f11 100755 --- a/website/agenda/planung/image.cgi +++ b/website/agenda/planung/image.cgi @@ -33,7 +33,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/localization.cgi b/website/agenda/planung/localization.cgi index e79115d..4d0683f 100755 --- a/website/agenda/planung/localization.cgi +++ b/website/agenda/planung/localization.cgi @@ -20,7 +20,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( $user eq '' ); diff --git a/website/agenda/planung/notify-events.cgi b/website/agenda/planung/notify-events.cgi index b7a283d..5741281 100755 --- a/website/agenda/planung/notify-events.cgi +++ b/website/agenda/planung/notify-events.cgi @@ -28,7 +28,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); @@ -216,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; } @@ -243,12 +242,6 @@ sub check_params { my $template = ''; $checked->{template} = template::check( $config, $params->{template}, 'notify-events' ); - my $debug = $params->{debug} || ''; - if ( $debug =~ /([a-z\_\,]+)/ ) { - $debug = $1; - } - $checked->{debug} = $debug; - entry::set_numbers( $checked, $params, [ 'event_id', 'project_id', 'studio_id', 'default_studio_id', 'user_id', 'series_id', 'duration' ]); diff --git a/website/agenda/planung/playout.cgi b/website/agenda/planung/playout.cgi index 34aa720..ef07329 100755 --- a/website/agenda/planung/playout.cgi +++ b/website/agenda/planung/playout.cgi @@ -32,7 +32,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/projects.cgi b/website/agenda/planung/projects.cgi index 2d13e9a..f48ac9d 100755 --- a/website/agenda/planung/projects.cgi +++ b/website/agenda/planung/projects.cgi @@ -22,7 +22,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( $user eq '' ); diff --git a/website/agenda/planung/request-password.cgi b/website/agenda/planung/request-password.cgi index cc17b1b..7217add 100755 --- a/website/agenda/planung/request-password.cgi +++ b/website/agenda/planung/request-password.cgi @@ -19,7 +19,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; $params = check_params( $config, $params ); diff --git a/website/agenda/planung/roles.cgi b/website/agenda/planung/roles.cgi index e9a92f4..5cce20a 100755 --- a/website/agenda/planung/roles.cgi +++ b/website/agenda/planung/roles.cgi @@ -23,7 +23,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/select-series.cgi b/website/agenda/planung/select-series.cgi index 65f1ce1..56ef2a3 100755 --- a/website/agenda/planung/select-series.cgi +++ b/website/agenda/planung/select-series.cgi @@ -22,7 +22,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/series.cgi b/website/agenda/planung/series.cgi index 8d07c75..631aa54 100755 --- a/website/agenda/planung/series.cgi +++ b/website/agenda/planung/series.cgi @@ -34,7 +34,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( !defined $user ) || ( $user eq '' ); diff --git a/website/agenda/planung/set-user-day-start.cgi b/website/agenda/planung/set-user-day-start.cgi index 762dfa2..0d5bacb 100644 --- a/website/agenda/planung/set-user-day-start.cgi +++ b/website/agenda/planung/set-user-day-start.cgi @@ -24,7 +24,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/show-image.cgi b/website/agenda/planung/show-image.cgi index 9fef331..1870773 100755 --- a/website/agenda/planung/show-image.cgi +++ b/website/agenda/planung/show-image.cgi @@ -22,7 +22,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/show-playout.cgi b/website/agenda/planung/show-playout.cgi index 20c620e..4d617a6 100755 --- a/website/agenda/planung/show-playout.cgi +++ b/website/agenda/planung/show-playout.cgi @@ -25,7 +25,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( !defined $user ) || ( $user eq '' ); diff --git a/website/agenda/planung/studio-timeslots.cgi b/website/agenda/planung/studio-timeslots.cgi index 4398e1f..8903ee6 100755 --- a/website/agenda/planung/studio-timeslots.cgi +++ b/website/agenda/planung/studio-timeslots.cgi @@ -28,7 +28,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/studios.cgi b/website/agenda/planung/studios.cgi index f1ea19e..e016cb1 100755 --- a/website/agenda/planung/studios.cgi +++ b/website/agenda/planung/studios.cgi @@ -22,7 +22,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( $user eq '' ); 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/planung/upload-audio-recordings.cgi b/website/agenda/planung/upload-audio-recordings.cgi index 13991cd..ccc5027 100644 --- a/website/agenda/planung/upload-audio-recordings.cgi +++ b/website/agenda/planung/upload-audio-recordings.cgi @@ -32,7 +32,6 @@ binmode STDOUT, ":utf8"; my $useCgi = 0; our $config = config::get('../config/config.cgi'); -our $debug = $config->{system}->{debug}; my $base_dir = $config->{locations}->{base_dir}; my $tempDir = '/var/tmp'; diff --git a/website/agenda/planung/user-selected-event.cgi b/website/agenda/planung/user-selected-event.cgi index 20f4206..2a301cd 100644 --- a/website/agenda/planung/user-selected-event.cgi +++ b/website/agenda/planung/user-selected-event.cgi @@ -24,7 +24,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/user-settings.cgi b/website/agenda/planung/user-settings.cgi index 9224ea5..29245ca 100755 --- a/website/agenda/planung/user-settings.cgi +++ b/website/agenda/planung/user-settings.cgi @@ -24,7 +24,6 @@ use localization(); my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/user-stats.cgi b/website/agenda/planung/user-stats.cgi index a14c0f9..255faa8 100755 --- a/website/agenda/planung/user-stats.cgi +++ b/website/agenda/planung/user-stats.cgi @@ -24,7 +24,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/planung/users.cgi b/website/agenda/planung/users.cgi index 5517eb3..e5eff65 100755 --- a/website/agenda/planung/users.cgi +++ b/website/agenda/planung/users.cgi @@ -23,7 +23,6 @@ binmode STDOUT, ":utf8"; my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); my $user_presets = uac::get_user_presets( diff --git a/website/agenda/planung/work-time.cgi b/website/agenda/planung/work-time.cgi index f28eca8..c295cb0 100755 --- a/website/agenda/planung/work-time.cgi +++ b/website/agenda/planung/work-time.cgi @@ -25,7 +25,6 @@ my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::get('../config/config.cgi'); -my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); diff --git a/website/agenda/series_names.cgi b/website/agenda/series_names.cgi index 38b9d9d..1efebc9 100755 --- a/website/agenda/series_names.cgi +++ b/website/agenda/series_names.cgi @@ -19,7 +19,6 @@ binmode STDOUT, ":utf8"; my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); my $config = config::getFromScriptLocation(); -my $debug = $config->{system}->{debug}; #get request my $request = { @@ -38,8 +37,6 @@ my $dbh = db::connect($config); #fill template my $template_parameters = {}; $template_parameters->{projects} = getProjects( $dbh, $config, $params ); -$template_parameters->{debug} = $config->{system}->{debug}; -$template_parameters->{server_cache} = $config->{cache}->{server_cache} if $config->{cache}->{server_cache}; #output template my $template = $params->{template}; @@ -96,7 +93,6 @@ sub getSeriesNames { my $project = shift; my $params = shift; - my $debug = $config->{system}->{debug}; my $bind_values = []; my @conds = (); diff --git a/website/agenda/templates/coloradio/calendar.html b/website/agenda/templates/coloradio/calendar.html index 3b96a37..f8d34c9 100644 --- a/website/agenda/templates/coloradio/calendar.html +++ b/website/agenda/templates/coloradio/calendar.html @@ -3,7 +3,6 @@ Content-type:text/html; charset=UTF-8; - Calendar <TMPL_VAR project_title> @@ -22,16 +21,16 @@ Content-type:text/html; charset=UTF-8; - « - - » @@ -50,7 +49,7 @@ Content-type:text/html; charset=UTF-8; - diff --git a/website/agenda/templates/coloradio/calendar_js.html b/website/agenda/templates/coloradio/calendar_js.html index 8eebe79..dce5533 100644 --- a/website/agenda/templates/coloradio/calendar_js.html +++ b/website/agenda/templates/coloradio/calendar_js.html @@ -3,7 +3,6 @@ Content-type:text/html; charset=UTF-8; - @@ -19,19 +18,19 @@ Content-type:text/html; charset=UTF-8; @@ -65,7 +64,7 @@ Content-type:text/html; charset=UTF-8;
- < - - > - diff --git a/website/agenda/templates/coloradio/calendar_mobile.html b/website/agenda/templates/coloradio/calendar_mobile.html index 286970c..d1324b3 100644 --- a/website/agenda/templates/coloradio/calendar_mobile.html +++ b/website/agenda/templates/coloradio/calendar_mobile.html @@ -3,7 +3,6 @@ Content-type:text/html; charset=UTF-8; - @@ -19,15 +18,15 @@ Content-type:text/html; charset=UTF-8; @@ -56,7 +55,7 @@ Content-type:text/html; charset=UTF-8;
- « - - »
- diff --git a/website/agenda/templates/coloradio/comments.xml b/website/agenda/templates/coloradio/comments.xml index 0e52ff7..d827bfb 100644 --- a/website/agenda/templates/coloradio/comments.xml +++ b/website/agenda/templates/coloradio/comments.xml @@ -3,7 +3,7 @@ Access-Control-Allow-Origin: * -comments +comments <TMPL_VAR project_title> - Kommentare @@ -14,7 +14,7 @@ Access-Control-Allow-Origin: * info@radiopiloten.de - + calcms @@ -29,8 +29,8 @@ Access-Control-Allow-Origin: * ]]> - - + + diff --git a/website/agenda/templates/coloradio/comments_newest.html b/website/agenda/templates/coloradio/comments_newest.html index 9c2a759..1194598 100644 --- a/website/agenda/templates/coloradio/comments_newest.html +++ b/website/agenda/templates/coloradio/comments_newest.html @@ -12,7 +12,7 @@ Access-Control-Allow-Origin: *
- +
: diff --git a/website/agenda/templates/coloradio/event.atom.xml b/website/agenda/templates/coloradio/event.atom.xml index b9b1f7e..f8984cc 100644 --- a/website/agenda/templates/coloradio/event.atom.xml +++ b/website/agenda/templates/coloradio/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/coloradio/event.json-p b/website/agenda/templates/coloradio/event.json-p index 817034d..7991296 100644 --- a/website/agenda/templates/coloradio/event.json-p +++ b/website/agenda/templates/coloradio/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/coloradio/event.rss.xml b/website/agenda/templates/coloradio/event.rss.xml index a0321c7..f48b5ad 100644 --- a/website/agenda/templates/coloradio/event.rss.xml +++ b/website/agenda/templates/coloradio/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/coloradio/event_details.html b/website/agenda/templates/coloradio/event_details.html index 66bb40a..04e8679 100644 --- a/website/agenda/templates/coloradio/event_details.html +++ b/website/agenda/templates/coloradio/event_details.html @@ -18,7 +18,7 @@ Content-type:text/html; charset=utf-8; - +

@@ -133,7 +133,7 @@ Content-type:text/html; charset=utf-8; - +
diff --git a/website/agenda/templates/coloradio/event_file_export.txt b/website/agenda/templates/coloradio/event_file_export.txt index 5ce3ae1..367c635 100644 --- a/website/agenda/templates/coloradio/event_file_export.txt +++ b/website/agenda/templates/coloradio/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/coloradio/event_freefm.xml b/website/agenda/templates/coloradio/event_freefm.xml index 68edae7..738f200 100644 --- a/website/agenda/templates/coloradio/event_freefm.xml +++ b/website/agenda/templates/coloradio/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/coloradio/event_list.html b/website/agenda/templates/coloradio/event_list.html index 8aa188a..5064255 100644 --- a/website/agenda/templates/coloradio/event_list.html +++ b/website/agenda/templates/coloradio/event_list.html @@ -14,7 +14,7 @@ Content-type:text/html; charset=utf-8; > - | -
diff --git a/website/agenda/templates/coloradio/event_list_image.html b/website/agenda/templates/coloradio/event_list_image.html index 601f055..7795ec0 100644 --- a/website/agenda/templates/coloradio/event_list_image.html +++ b/website/agenda/templates/coloradio/event_list_image.html @@ -3,7 +3,6 @@ Content-type:text/html; charset=utf-8; - Agenda <TMPL_VAR project_title> @@ -19,7 +18,7 @@ Content-type:text/html; charset=utf-8;
- +

@@ -27,7 +26,7 @@ Content-type:text/html; charset=utf-8;

- Kommentare
diff --git a/website/agenda/templates/coloradio/event_menu.html b/website/agenda/templates/coloradio/event_menu.html index 21b538e..d4ddba1 100644 --- a/website/agenda/templates/coloradio/event_menu.html +++ b/website/agenda/templates/coloradio/event_menu.html @@ -4,7 +4,6 @@ Content-type:text/html; charset=UTF-8; - @@ -20,7 +19,7 @@ Content-type:text/html; charset=UTF-8;
, @@ -53,7 +52,7 @@ Content-type:text/html; charset=UTF-8;