diff --git a/website/agenda/planung/event.cgi b/website/agenda/planung/event.cgi index a394312..befc21c 100755 --- a/website/agenda/planung/event.cgi +++ b/website/agenda/planung/event.cgi @@ -4,7 +4,6 @@ use strict; use warnings; no warnings 'redefine'; -#use URI::Escape(); use Encode(); use Data::Dumper; use MIME::Base64(); @@ -41,7 +40,6 @@ 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( $config, { @@ -62,8 +60,6 @@ my $request = { }, }; -#print STDERR Dumper($request)."\n"; - #set user at params->presets->user $request = uac::prepare_request( $request, $user_presets ); @@ -73,7 +69,8 @@ $params = $request->{params}->{checked}; unless ( params::isJson() ) { my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); - template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); + template::process( $config, 'print', template::check( $config, 'default.html' ), + $headerParams ); } return unless uac::check( $config, $params, $user_presets ) == 1; @@ -167,11 +164,10 @@ sub show_event { uac::print_error("event not found"); } - #print STDERR "show:".Dumper($event->{draft}); - #print STDERR "show event".Dumper($event); - my $editLock = 1; - if ( ( defined $permissions->{update_event_after_week} ) && ( $permissions->{update_event_after_week} eq '1' ) ) { + if ( ( defined $permissions->{update_event_after_week} ) + && ( $permissions->{update_event_after_week} eq '1' ) ) + { $editLock = 0; } else { $editLock = 0 @@ -205,9 +201,12 @@ sub show_event { ); if ( defined $event2 ) { for my $attr ( - 'title', 'user_title', 'excerpt', 'user_excerpt', - 'content', 'topic', 'image', 'image_label', - 'series_image', 'series_image_label', 'live no_event_sync', 'podcast_url', + 'title', 'user_title', + 'excerpt', 'user_excerpt', + 'content', 'topic', + 'image', 'image_label', + 'series_image', 'series_image_label', + 'live no_event_sync', 'podcast_url', 'archive_url' ) { @@ -231,8 +230,8 @@ sub show_event { $event->{start} =~ s/(\d\d:\d\d)\:\d\d/$1/; $event->{end} =~ s/(\d\d:\d\d)\:\d\d/$1/; - if ( (defined $params->{setImage}) and ($params->{setImage} ne $event->{image}) ){ - $event->{image} = $params->{setImage}; + if ( ( defined $params->{setImage} ) and ( $params->{setImage} ne $event->{image} ) ) { + $event->{image} = $params->{setImage}; $params->{forced_change} = 1; } @@ -273,7 +272,7 @@ sub show_event { $event->{has_single_events} = $series->[0]->{has_single_events}; } - #$event->{rerun}=1 if ((defined $event->{rerun})&&($event->{rerun}ne'0')&&($event->{rerun}ne'')); + #$event->{rerun}=1 if ((defined $event->{rerun})&&($event->{rerun}ne'0')&&($event->{rerun}ne'')); my $users = series::get_users( $config, @@ -285,9 +284,9 @@ sub show_event { ); $params->{series_users} = $users; - #print STDERR Dumper($users); $params->{series_users_email_list} = join( ',', ( map { $_->{email} } (@$users) ) ); - $params->{series_user_names} = join( ' und ', ( map { ( split( /\s+/, $_->{full_name} ) )[0] } (@$users) ) ); + $params->{series_user_names} = + join( ' und ', ( map { ( split( /\s+/, $_->{full_name} ) )[0] } (@$users) ) ); for my $permission ( sort keys %{$permissions} ) { $params->{'allow'}->{$permission} = $permissions->{$permission}; @@ -296,11 +295,14 @@ sub show_event { for my $key ( keys %$event ) { $params->{$key} = $event->{$key}; } - $params->{event_edited} = 1 if ( ( $params->{action} eq 'save' ) && ( !( defined $params->{error} ) ) ); - $params->{event_edited} = 1 if ( $params->{action} eq 'delete' ); - $params->{event_edited} = 1 if ( ( $params->{action} eq 'create_event' ) && ( !( defined $params->{error} ) ) ); $params->{event_edited} = 1 - if ( ( $params->{action} eq 'create_event_from_schedule' ) && ( !( defined $params->{error} ) ) ); + if ( ( $params->{action} eq 'save' ) && ( !( defined $params->{error} ) ) ); + $params->{event_edited} = 1 if ( $params->{action} eq 'delete' ); + $params->{event_edited} = 1 + if ( ( $params->{action} eq 'create_event' ) && ( !( defined $params->{error} ) ) ); + $params->{event_edited} = 1 + if ( ( $params->{action} eq 'create_event_from_schedule' ) + && ( !( defined $params->{error} ) ) ); $params->{user} = $params->{presets}->{user}; # remove all edit permissions if event is over for more than 2 weeks @@ -313,8 +315,8 @@ sub show_event { $params->{edit_lock} = 1; } - #print STDERR Dumper($params); - $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'event' } ); + $params->{loc} = + localization::get( $config, { user => $params->{presets}->{user}, file => 'event' } ); template::process( $config, 'print', template::check( $config, 'edit-event' ), $params ); } @@ -458,10 +460,9 @@ sub show_new_event { $params->{'allow'}->{$permission} = $request->{permissions}->{$permission}; } - $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'event,comment' } ); + $params->{loc} = + localization::get( $config, { user => $params->{presets}->{user}, file => 'event,comment' } ); template::process( $config, 'print', template::check( $config, 'edit-event' ), $params ); - - #print '
'.Dumper($params).'
'; } sub delete_event { @@ -535,7 +536,6 @@ sub save_event { } } - #print Dumper($params); my $start = $params->{start_date}; my $end = time::add_minutes_to_datetime( $params->{start_date}, $params->{duration} ); @@ -565,8 +565,9 @@ sub save_event { #content fields for my $key ( - 'content', 'topic', 'title', 'excerpt', 'episode', 'image', - 'series_image', 'image_label', 'series_image_label', 'podcast_url', 'archive_url' + 'content', 'topic', 'title', 'excerpt', + 'episode', 'image', 'series_image', 'image_label', + 'series_image_label', 'podcast_url', 'archive_url' ) { next unless defined $permissions->{ 'update_event_field_' . $key }; @@ -577,8 +578,6 @@ sub save_event { } } - #print STDERR "event to update1: ".Dumper($entry); - #user extension fields for my $key ( 'title', 'excerpt' ) { next unless defined $permissions->{ 'update_event_field_' . $key . '_extension' }; @@ -590,7 +589,9 @@ sub save_event { } #status field - for my $key ( 'live', 'published', 'playout', 'archived', 'rerun', 'disable_event_sync', 'draft' ) { + for + my $key ( 'live', 'published', 'playout', 'archived', 'rerun', 'disable_event_sync', 'draft' ) + { next unless defined $permissions->{ 'update_event_status_' . $key }; if ( $permissions->{ 'update_event_status_' . $key } eq '1' ) { $entry->{$key} = $params->{$key} || 0; @@ -615,7 +616,8 @@ sub save_event { return; } - my $series = series::get($config, + my $series = series::get( + $config, { project_id => $params->{project_id}, studio_id => $params->{studio_id}, @@ -630,8 +632,6 @@ sub save_event { $entry->{image} = images::normalizeName( $serie->{image} ); $entry->{series_image} = images::normalizeName( $serie->{series_image} ); - #print STDERR "event to update2: ".Dumper($entry); - $config->{access}->{write} = 1; #update content @@ -643,7 +643,9 @@ sub save_event { } #update time - if ( ( defined $permissions->{update_event_time} ) && ( $permissions->{update_event_time} eq '1' ) ) { + if ( ( defined $permissions->{update_event_time} ) + && ( $permissions->{update_event_time} eq '1' ) ) + { my $entry = { id => $params->{event_id}, start_date => $params->{start_date}, @@ -755,7 +757,6 @@ sub download { print STDERR "event.cgi::download look for : $archive_dir/$datetime*.mp3\n"; my @files = glob( $archive_dir . '/' . $datetime . '*.mp3' ); - #print STDERR Dumper(\@files); if ( @files > 0 ) { my $file = $files[0]; my $key = int( rand(99999999999999999) ); @@ -799,8 +800,9 @@ sub check_params { #numeric values for my $param ( - 'id', 'project_id', 'studio_id', 'default_studio_id', 'user_id', 'series_id', - 'event_id', 'source_event_id', 'episode' + 'id', 'project_id', 'studio_id', 'default_studio_id', + 'user_id', 'series_id', 'event_id', 'source_event_id', + 'episode' ) { if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) { @@ -831,7 +833,11 @@ sub check_params { } #checkboxes - for my $param ( 'live', 'published', 'playout', 'archived', 'rerun', 'draft', 'disable_event_sync', 'get_rerun' ) { + for my $param ( + 'live', 'published', 'playout', 'archived', + 'rerun', 'draft', 'disable_event_sync', 'get_rerun' + ) + { if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /([01])/ ) ) { $checked->{$param} = $1; } @@ -839,9 +845,10 @@ sub check_params { #strings for my $param ( - 'series_name', 'title', 'excerpt', 'content', 'topic', 'program', - 'category', 'image', 'series_image', 'user_content', 'user_title', 'user_excerpt', - 'podcast_url', 'archive_url', 'setImage' + 'series_name', 'title', 'excerpt', 'content', + 'topic', 'program', 'category', 'image', + 'series_image', 'user_content', 'user_title', 'user_excerpt', + 'podcast_url', 'archive_url', 'setImage' ) { if ( defined $params->{$param} ) { @@ -855,43 +862,21 @@ sub check_params { #dates for my $param ( 'start_date', 'end_date' ) { - if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d\d\d\d\-\d\d\-\d\d \d\d\:\d\d)/ ) ) { + if ( ( defined $params->{$param} ) + && ( $params->{$param} =~ /(\d\d\d\d\-\d\d\-\d\d \d\d\:\d\d)/ ) ) + { $checked->{$param} = $1 . ':00'; } } - #actions and roles + #actions $checked->{action} = ''; if ( defined $params->{action} ) { - if ( $params->{action} =~ -/^(save|delete|download|show_new_event|show_new_event_from_schedule|create_event|create_event_from_schedule|get_json)$/ - ) - { - $checked->{action} = $params->{action}; - } + $checked->{action} = $params->{action} if List::Util::any { $_ eq $params->{action} } qw{ + save delete download show_new_event show_new_event_from_schedule + create_event create_event_from_schedule get_json + }; } - - #print STDERR "event params:".Dumper($checked); + print STDERR Dumper($checked); return $checked; } - -__DATA__ - -#requires studio_id,series_id,location -sub get_series_events{ - my $config=shift; - my $options=shift; - - return undef unless defined $options->{project_id}; - return undef unless defined $options->{studio_id}; - return undef unless defined $options->{series_id}; - - $options->{template}= 'no'; # deprecated - $options->{limit} = 200; # deprecated - $options->{get} = 'no_content'; # deprecated - $options->{archive} = 'all'; # deprecated - - my $events=series::get_events($config, $options); - return $events; -} - diff --git a/website/agenda/planung/series.cgi b/website/agenda/planung/series.cgi index 8e472bd..5d33a1b 100755 --- a/website/agenda/planung/series.cgi +++ b/website/agenda/planung/series.cgi @@ -35,7 +35,6 @@ my $r = shift; my $config = config::get('../config/config.cgi'); my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); -print STDERR Dumper($user); return if ( !defined $user ) || ( $user eq '' ); my $user_presets = uac::get_user_presets( @@ -65,7 +64,8 @@ $params = $request->{params}->{checked}; unless ( params::isJson() ) { my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); - template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); + template::process( $config, 'print', template::check( $config, 'default.html' ), + $headerParams ); } return unless uac::check( $config, $params, $user_presets ) == 1; @@ -93,14 +93,14 @@ if ( defined $params->{action} ) { my $result = reassign_event( $config, $request ); return if defined $result; } - if ($params->{action} eq 'rebuild_episodes'){ - rebuild_episodes($config, $request); + if ( $params->{action} eq 'rebuild_episodes' ) { + rebuild_episodes( $config, $request ); return; - }; - if ($params->{action} eq 'set_rebuilt_episodes'){ - set_rebuilt_episodes($config, $request); + } + if ( $params->{action} eq 'set_rebuilt_episodes' ) { + set_rebuilt_episodes( $config, $request ); return; - }; + } # save_scan ($config, $request) if ($params->{action} eq 'save_scan'); } @@ -108,7 +108,8 @@ if ( defined $params->{action} ) { $config->{access}->{write} = 0; if ( defined $params->{series_id} ) { - print q{} unless params::isJson(); + print q{} + unless params::isJson(); show_series( $config, $request ); } else { print q{ @@ -133,7 +134,6 @@ sub save_schedule { return; } - #print Dumper($params); for my $attr ( 'project_id', 'studio_id', 'series_id', 'start' ) { unless ( defined $params->{$attr} ) { uac::print_error( $attr . ' not given!' ); @@ -151,7 +151,6 @@ sub save_schedule { $entry->{$attr} = $params->{$attr} if ( defined $params->{$attr} ); } - #print STDERR Dumper($entry); unless ( project::is_series_assigned( $config, $entry ) == 1 ) { uac::print_error('series is not assigned to project!'); return undef; @@ -290,7 +289,6 @@ sub delete_series { my $studio_id = $params->{studio_id}; my $series_id = $entry->{series_id}; - #print Dumper($entry); $config->{access}->{write} = 1; if ( $entry->{series_id} ne '' ) { my $result = series::delete( $config, $entry ); @@ -342,8 +340,8 @@ sub save_series { $entry->{project_id} = $params->{project_id}; $entry->{studio_id} = $params->{studio_id}; $entry->{series_id} = $params->{series_id} || ''; - $entry->{live} = $params->{live} || 0; - $entry->{count_episodes} = $params->{count_episodes} || 0; + $entry->{live} = $params->{live} // 0; + $entry->{count_episodes} = $params->{count_episodes} // 0; $entry->{predecessor_id} = $params->{predecessor_id} // 0; #$entry->{html_content} = Encode::decode( 'utf-8', $entry->{content} ); @@ -399,7 +397,6 @@ sub save_series { $config->{access}->{write} = 0; - #print STDERR Dumper($entry); unless ( defined $series_id ) { uac::print_error('could not insert series'); return; @@ -423,12 +420,13 @@ sub save_series { uac::permissions_denied('update due to entry already exists'); return; } - if ( ( scalar(@$series_ids) == 1 ) && ( $series_ids->[0]->{series_id} ne $params->{series_id} ) ) { + if ( ( scalar(@$series_ids) == 1 ) + && ( $series_ids->[0]->{series_id} ne $params->{series_id} ) ) + { uac::permissions_denied('update due to series id does not match to existing entry'); return; } - #print STDERR Dumper($entry); $config->{access}->{write} = 1; my $result = series::update( $config, $entry ); @@ -499,7 +497,6 @@ sub save_scan { assign_event_title => $params->{assign_event_title}, }; - #print STDERR '
'.Dumper($entry)."\n"; $config->{access}->{write} = 1; series::update( $config, $entry ); $config->{access}->{write} = 0; @@ -527,8 +524,6 @@ sub scan_events { } ); - #print STDERR Dumper($series); - $params->{scan_results} = q{ @@ -580,11 +575,8 @@ sub scan_events { . $title . '' . '' . '' . "\n"; - #if($serie->{series_id}==66){ - #print STDERR $serie->{series_name}.' - '.$serie->{title}.' '.Dumper($event_ids); - series::set_event_ids( $config, $params->{project_id}, $params->{studio_id}, $serie, $event_ids ); - - #} + series::set_event_ids( $config, $params->{project_id}, $params->{studio_id}, $serie, + $event_ids ); } $params->{scan_results} .= "
' . scalar(@$event_ids) . '

\n"; $config->{access}->{write} = 0; @@ -614,8 +606,6 @@ sub assign_event { } } - #print STDERR "found all parameters:\n".Dumper($entry); - # check if event exists, # this has to use events::get, since it cannot check for series_id # TODO: check location of studio_id @@ -640,7 +630,6 @@ sub assign_event { my $events = events::get( $config, $request2 ); - #print STDERR "found events:".Dumper($events); if ( scalar(@$events) != 1 ) { uac::print_error("no event found for event_id=$entry->{event_id}, archive=all"); return undef; @@ -731,7 +720,7 @@ sub assign_event { } } else { print STDERR - "no series title found for studio $entry->{studio_id} series $entry->{series_id}, event $entry->{event_id}\n"; +"no series title found for studio $entry->{studio_id} series $entry->{series_id}, event $entry->{event_id}\n"; } $config->{access}->{write} = 0; @@ -778,8 +767,6 @@ sub unassign_event { return undef; } - #print Dumper($event); - #is series assigned to studio my $result = series_events::check_permission( $request, @@ -996,14 +983,14 @@ sub list_series { $params->{newSeries} = $newSeries; $params->{oldSeries} = $oldSeries; - $params->{image} = studios::getImageById( $config, { project_id => $project_id, studio_id => $studio_id } ) + $params->{image} = + studios::getImageById( $config, { project_id => $project_id, studio_id => $studio_id } ) if ( ( !defined $params->{image} ) || ( $params->{image} eq '' ) ); $params->{image} = project::getImageById( $config, { project_id => $project_id } ) if ( ( !defined $params->{image} ) || ( $params->{image} eq '' ) ); - #print STDERR Dumper $params->{image}; - - $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'all,series' } ); + $params->{loc} = + localization::get( $config, { user => $params->{presets}->{user}, file => 'all,series' } ); template::process( $config, 'print', $params->{template}, $params ); } @@ -1062,12 +1049,15 @@ sub show_series { my $series = series::get( $config, $series_conditions ); if ( @$series > 1 ) { - uac::print_error( "too much series found for studio '" . $studio_by_id->{$studio_id}->{name} . "'" ); + uac::print_error( + "too much series found for studio '" . $studio_by_id->{$studio_id}->{name} . "'" ); return; } if ( @$series == 0 ) { - uac::print_error( "selected series not assigned to studio '" . $studio_by_id->{$studio_id}->{name} . "'" ); + uac::print_error( "selected series not assigned to studio '" + . $studio_by_id->{$studio_id}->{name} + . "'" ); return; } my $serie = $series->[0]; @@ -1078,9 +1068,11 @@ sub show_series { #} #get all users currently assigned to the user - my $user_studios = uac::get_studios_by_user( $config, { project_id => $project_id, user => $request->{user} } ); + my $user_studios = + uac::get_studios_by_user( $config, { project_id => $project_id, user => $request->{user} } ); - my $studio_users = uac::get_users_by_studio( $config, { project_id => $project_id, studio_id => $studio_id } ); + my $studio_users = + uac::get_users_by_studio( $config, { project_id => $project_id, studio_id => $studio_id } ); for my $studio_user (@$studio_users) { $studio_user->{user_id} = $studio_user->{id}; } @@ -1089,8 +1081,10 @@ sub show_series { $studio_users = \@users; #show events from last month until next 3 months - my $from = DateTime->now( time_zone => $config->{date}->{time_zone} )->subtract( months => 1 )->datetime(); - my $till = DateTime->now( time_zone => $config->{date}->{time_zone} )->add( months => 3 )->datetime(); + my $from = DateTime->now( time_zone => $config->{date}->{time_zone} )->subtract( months => 1 ) + ->datetime(); + my $till = + DateTime->now( time_zone => $config->{date}->{time_zone} )->add( months => 3 )->datetime(); #add name of current studio my $studio = $studio_by_id->{ $serie->{studio_id} }; @@ -1099,13 +1093,12 @@ sub show_series { my $location = $studio->{location}; # set default image from studio - $serie->{image} = studios::getImageById( $config, { project_id => $project_id, studio_id => $studio_id } ) + $serie->{image} = + studios::getImageById( $config, { project_id => $project_id, studio_id => $studio_id } ) if ( ( !defined $serie->{image} ) || ( $serie->{image} eq '' ) ); $serie->{image} = project::getImageById( $config, { project_id => $project_id } ) if ( ( !defined $serie->{image} ) || ( $serie->{image} eq '' ) ); - #print STDERR Dumper $serie->{image}; - #add users $serie->{series_users} = series::get_users( $config, @@ -1115,7 +1108,8 @@ sub show_series { series_id => $serie->{series_id} } ); - uac::print_warn("There is no user assigned, yet. Please assign a user!") if scalar @{ $serie->{series_users} } == 0; + uac::print_warn("There is no user assigned, yet. Please assign a user!") + if scalar @{ $serie->{series_users} } == 0; #add events $serie->{events} = series::get_events( @@ -1214,8 +1208,8 @@ sub show_series { $serie->{show_hint_to_add_schedule} = $params->{show_hint_to_add_schedule}; - if ( (defined $params->{setImage}) and ($params->{setImage} ne $serie->{image}) ){ - $serie->{image} = $params->{setImage} ; + if ( ( defined $params->{setImage} ) and ( $params->{setImage} ne $serie->{image} ) ) { + $serie->{image} = $params->{setImage}; $params->{forced_change} = 1; } @@ -1225,12 +1219,12 @@ sub show_series { $params->{$key} = $serie->{$key}; } - #print STDERR '
'.Dumper($params).'
'; - $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'all,series' } ); + $params->{loc} = + localization::get( $config, { user => $params->{presets}->{user}, file => 'all,series' } ); template::process( $config, 'print', $params->{template}, $params ); } -sub set_rebuilt_episodes{ +sub set_rebuilt_episodes { my $config = shift; my $request = shift; @@ -1263,27 +1257,33 @@ sub set_rebuilt_episodes{ my $project_id = $params->{project_id}; my $studio_id = $params->{studio_id}; my $series_id = $params->{series_id}; - my $events = series::get_rebuilt_episodes( $config, { - project_id => $project_id, - studio_id => $studio_id, - series_id => $series_id - }); + my $events = series::get_rebuilt_episodes( + $config, + { + project_id => $project_id, + studio_id => $studio_id, + series_id => $series_id + } + ); my $updates = 0; - for my $event (@$events){ + for my $event (@$events) { next if $event->{project_id} ne $project_id; next if $event->{studio_id} ne $studio_id; next if $event->{old_episode} eq $event->{episode}; - series_events::set_episode( $config, { - id => $event->{id}, - episode => $event->{episode} - }); + series_events::set_episode( + $config, + { + id => $event->{id}, + episode => $event->{episode} + } + ); $updates++; } print "$updates changes done.\n"; } -sub rebuild_episodes{ +sub rebuild_episodes { my $config = shift; my $request = shift; @@ -1316,15 +1316,18 @@ sub rebuild_episodes{ my $project_id = $params->{project_id}; my $studio_id = $params->{studio_id}; my $series_id = $params->{series_id}; - my $events = series::get_rebuilt_episodes( $config, { - project_id => $project_id, - studio_id => $studio_id, - series_id => $series_id - }); + my $events = series::get_rebuilt_episodes( + $config, + { + project_id => $project_id, + studio_id => $studio_id, + series_id => $series_id + } + ); - my $events_by_id={}; - for my $event (@$events){ - $events_by_id->{$event->{id}} = $event; + my $events_by_id = {}; + for my $event (@$events) { + $events_by_id->{ $event->{id} } = $event; } print " "; - my $prev=undef; - my $max_episode=0; - my $changes=0; - my $errors=0; - for my $event (@$events){ + my $prev = undef; + my $max_episode = 0; + my $changes = 0; + my $errors = 0; + for my $event (@$events) { $max_episode = $event->{episode} if $event->{episode} > $max_episode; - my $e1 = $event->{old_episode} //''; - my $e2 = $event->{episode} //''; - my $o1 = $prev->{old_episode} //''; - my $o2 = $prev->{episode} //''; - if ($e1 eq $e2){ + my $e1 = $event->{old_episode} // ''; + my $e2 = $event->{episode} // ''; + my $o1 = $prev->{old_episode} // ''; + my $o2 = $prev->{episode} // ''; + if ( $e1 eq $e2 ) { $event->{class} = 'ok'; - }else{ + } else { $changes++; $event->{class} = 'warn'; } - if ($e1 and $e2 and $o1 and $o2 and ( ($e2-$o2) != ($e1-$o1) ) ){ + if ( $e1 and $e2 and $o1 and $o2 and ( ( $e2 - $o2 ) != ( $e1 - $o1 ) ) ) { $event->{class} = "error" if $e1 ne $e2; $prev->{class} = "error" if defined $prev and $o1 ne $o2; $errors++; } - if ($event->{episode} < $max_episode and !$event->{recurrence}){ + if ( $event->{episode} < $max_episode and !$event->{recurrence} ) { $event->{class} = "error"; $errors++; } - $event->{recurrence_start} = $events_by_id->{$event->{recurrence}}->{start}; - $event->{recurrence} = '-' unless $event->{recurrence}; - $prev = $event; + $event->{recurrence_start} = $events_by_id->{ $event->{recurrence} }->{start}; + $event->{recurrence} = '-' unless $event->{recurrence}; + $prev = $event; } print "$errors errors, $changes changes\n"; - if ( ($changes>0) and ($errors==0) ){ - my $url = "series.cgi?action=set_rebuilt_episodes&project_id=$project_id&studio_id=$studio_id&series_id=$series_id"; + if ( ( $changes > 0 ) and ( $errors == 0 ) ) { + my $url = +"series.cgi?action=set_rebuilt_episodes&project_id=$project_id&studio_id=$studio_id&series_id=$series_id"; print qq{}; } - my @cols=qw(id start series_name title episode old_episode recurrence recurrence_start project_name studio_name); + my @cols = + qw(id start series_name title episode old_episode recurrence recurrence_start project_name studio_name); print "\n"; - print "" . join ("", map { "" } @cols) . "\n" ; - - for my $event (@$events){ + print "" . join( "", map { "" } @cols ) . "\n"; + + for my $event (@$events) { print qq{} - . join ("", map { "" } @cols) - . "\n"; + . qq{ href="event.cgi?action=edit&project_id=$event->{project_id}&studio_id=$event->{studio_id}&series_id=$series_id&event_id=$event->{id}"\n} + . qq{>} + . join( "", map { "" } @cols ) + . "\n"; } print "
".($_ // '-')."
" . ( $_ // '-' ) . "
".($event->{$_}//'-')."
" . ( $event->{$_} // '-' ) . "
\n"; } @@ -1396,23 +1401,33 @@ sub check_params { } $checked->{debug} = $debug; - #actions and roles + #actions $checked->{action} = ''; if ( defined $params->{action} ) { - $checked->{action} = $params->{action} if $params->{action} =~ -/^(add_user|remove_user|create|delete|save|details|show|save_schedule|delete_schedule|save_scan|scan_events|assign_event|unassign_event|reassign_event|rebuild_episodes|set_rebuilt_episodes)$/ - ; + $checked->{action} = $params->{action} if List::Util::any { $_ eq $params->{action} } qw{ + add_user remove_user + create delete save details show + save_schedule delete_schedule + save_scan scan_events + assign_event unassign_event reassign_event + rebuild_episodes set_rebuilt_episodes + }; } #numeric values $checked->{exclude} = 0; - $checked->{action} = $params->{action}; + $checked->{action} = $params->{action}; for my $param ( - 'id', 'project_id', 'studio_id', 'default_studio_id', - 'user_id', 'new_series_id', 'series_id', 'schedule_id', - 'exclude', 'show_hint_to_add_schedule', 'event_id', 'weekday', - 'week_of_month', 'month', 'nextDay', 'predecessor_id' - ){ + 'id', 'project_id', + 'studio_id', 'default_studio_id', + 'user_id', 'new_series_id', + 'series_id', 'schedule_id', + 'exclude', 'show_hint_to_add_schedule', + 'event_id', 'weekday', + 'week_of_month', 'month', + 'nextDay', 'predecessor_id' + ) + { if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) { $checked->{$param} = $params->{$param}; } @@ -1435,8 +1450,10 @@ sub check_params { $checked->{create_events} = 0; $checked->{publish_events} = 0; } - for my $param ( 'frequency', 'duration', 'default_duration', 'create_events', 'publish_events', 'live', - 'count_episodes' ) + for my $param ( + 'frequency', 'duration', 'default_duration', 'create_events', + 'publish_events', 'live', 'count_episodes' + ) { if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d+)/ ) ) { $checked->{$param} = $1; @@ -1452,8 +1469,15 @@ sub check_params { } } - for my $param ( 'series_name', 'title', 'excerpt', 'content', 'topic', 'image', 'image_label', - 'assign_event_series_name', 'assign_event_title', 'comment', 'podcast_url', 'archive_url', 'setImage' ) + for my $param ( + 'series_name', 'title', + 'excerpt', 'content', + 'topic', 'image', + 'image_label', 'assign_event_series_name', + 'assign_event_title', 'comment', + 'podcast_url', 'archive_url', + 'setImage' + ) { if ( defined $params->{$param} ) { @@ -1465,7 +1489,9 @@ sub check_params { } for my $attr ('start') { - if ( ( defined $params->{$attr} ) && ( $params->{$attr} =~ /(\d\d\d\d\-\d\d\-\d\d[ T]\d\d\:\d\d)/ ) ) { + if ( ( defined $params->{$attr} ) + && ( $params->{$attr} =~ /(\d\d\d\d\-\d\d\-\d\d[ T]\d\d\:\d\d)/ ) ) + { $checked->{$attr} = $1 . ':00'; } }