From 45841259235da84d210baf9300f462da77a41ddd Mon Sep 17 00:00:00 2001 From: Milan Date: Sat, 7 Mar 2020 23:11:44 +0100 Subject: [PATCH] remove comments and cleanup --- lib/calcms/comments.pm | 9 +++---- lib/calcms/creole_wiki.pm | 4 +-- lib/calcms/eventOps.pm | 11 -------- lib/calcms/markup.pm | 2 +- lib/calcms/password_requests.pm | 12 --------- lib/calcms/playout.pm | 8 ------ lib/calcms/series.pm | 6 ++--- lib/calcms/series_dates.pm | 1 - lib/calcms/series_events.pm | 11 ++++---- lib/calcms/series_schedule.pm | 1 - lib/calcms/studio_timeslot_dates.pm | 21 +++------------- lib/calcms/studio_timeslot_schedule.pm | 28 +++++++++------------ lib/calcms/time.pm | 2 +- lib/calcms/uac.pm | 6 ++--- lib/calcms/work_schedule.pm | 3 --- website/agenda/planung/assign-series.cgi | 4 --- website/agenda/planung/assignments.cgi | 3 --- website/agenda/planung/audio-recordings.cgi | 15 ----------- website/agenda/planung/comment.cgi | 1 - website/agenda/planung/create-events.cgi | 1 - website/agenda/planung/event-history.cgi | 7 ------ website/agenda/planung/image-upload.cgi | 2 -- website/agenda/planung/image.cgi | 8 ------ website/agenda/planung/notify-events.cgi | 2 -- website/agenda/planung/roles.cgi | 5 ---- website/agenda/planung/select-event.cgi | 3 --- website/agenda/planung/studio-timeslots.cgi | 7 ------ website/agenda/planung/user-settings.cgi | 1 - website/agenda/planung/users.cgi | 15 ----------- website/agenda/planung/work-time.cgi | 2 -- 30 files changed, 34 insertions(+), 167 deletions(-) diff --git a/lib/calcms/comments.pm b/lib/calcms/comments.pm index 3bcdeb0..23be77d 100644 --- a/lib/calcms/comments.pm +++ b/lib/calcms/comments.pm @@ -144,9 +144,6 @@ sub get_query($$$) { $limit }; - # where lock_status='show' - # use Data::Dumper;print STDERR Dumper($query); - return ( \$query, $bind_values ); } @@ -430,10 +427,10 @@ sub get_events($$$$) { for my $comment (@$comments) { my $event_id = $comment->{event_id}; my $event = $events_by_id->{$event_id}; - next unless ( defined $event ); + next unless defined $event; $event->{comment_count}++; push @{ $event->{comments} }, $comment; # if ($params->{event_id}ne''); - $event->{max_comment_id} = $comment->{id} if ( $comment->{id} > $event->{max_comment_id} ); + $event->{max_comment_id} = $comment->{id} if $comment->{id} > $event->{max_comment_id}; for my $name ( keys %{ $config->{controllers} } ) { $comment->{ "controller_" . $name } = $config->{controllers}->{$name} || ''; @@ -545,7 +542,7 @@ sub sort_childs { push @{$sorted_nodes}, $node; #return if node is leaf - return $sorted_nodes unless ( defined $node->{childs} ); + return $sorted_nodes unless defined $node->{childs}; #process child nodes for my $child ( @{ $node->{childs} } ) { diff --git a/lib/calcms/creole_wiki.pm b/lib/calcms/creole_wiki.pm index 1ab1406..1dfb2d7 100644 --- a/lib/calcms/creole_wiki.pm +++ b/lib/calcms/creole_wiki.pm @@ -15,7 +15,7 @@ our @EXPORT_OK = sub extractEventFromWikiText($;$) { my $params = shift; my $event = shift; - $event = {} unless ( defined $event ); + $event = {} unless defined $event; my $title = $params->{title} || ''; my $content = $params->{content} || ''; @@ -185,7 +185,7 @@ sub extractMeta ($$) { my $comments = shift; my $meta = shift; - $meta = [] unless ( defined $meta ); + $meta = [] unless defined $meta; #push meta tags into meta list if ( defined $comments ) { diff --git a/lib/calcms/eventOps.pm b/lib/calcms/eventOps.pm index 34700af..75c6fa6 100644 --- a/lib/calcms/eventOps.pm +++ b/lib/calcms/eventOps.pm @@ -61,7 +61,6 @@ sub setAttributesFromSchedule ($$$){ my $params = shift; my $event = shift; - #print 'setAttributesFromSchedule:'.Dumper($params); #set attributes from schedule my $schedules = series_dates::get( $config, @@ -167,7 +166,6 @@ sub getNewEvent($$$) { my $serie = eventOps::setAttributesFromSeriesTemplate( $config, $params, $event ); - #print Dumper($params); if ( $action eq 'show_new_event_from_schedule' ) { eventOps::setAttributesFromSchedule( $config, $params, $event ); } else { @@ -221,16 +219,8 @@ sub createEvent($$$) { push @$checklist, 'schedule' if $action eq 'create_event_from_schedule'; } - #use Data::Dumper; - #print Dumper($checklist); - #print Dumper($request); - #print Dumper($event); - my $start = $event->{start_date}, my $end = time::add_minutes_to_datetime( $event->{start_date}, $event->{duration} ); - #print Dumper($start); - #print Dumper($end); - my $result = series_events::check_permission( $request, { @@ -246,7 +236,6 @@ sub createEvent($$$) { } ); - #print Dumper(" start_date => $event->{start_date}"); unless ( $result eq '1' ) { uac::print_error($result); return undef; diff --git a/lib/calcms/markup.pm b/lib/calcms/markup.pm index b116fff..fbf3117 100644 --- a/lib/calcms/markup.pm +++ b/lib/calcms/markup.pm @@ -175,7 +175,7 @@ sub creole_to_plain($) { sub html_to_plain ($) { my $s = shift; - return '' unless ( defined $s ); + return '' unless defined $s; my $tree = HTML::Parse::parse_html( '' . $s . '' ); my $formatter = HTML::FormatText->new( leftmargin => 0, rightmargin => 2000 ); $s = $formatter->format($tree); diff --git a/lib/calcms/password_requests.pm b/lib/calcms/password_requests.pm index 376ec9d..7d1ba89 100644 --- a/lib/calcms/password_requests.pm +++ b/lib/calcms/password_requests.pm @@ -54,8 +54,6 @@ sub get ($$) { $conditions }; - #print $query."\n".Dumper(\@bind_values); - my $entries = db::get( $dbh, $query, \@bind_values ); return $entries->[0] || undef; } @@ -77,7 +75,6 @@ sub update($$) { set $values where token=? }; - print STDERR $query . Dumper( \@bind_values ); db::put( $dbh, $query, \@bind_values ); } @@ -88,7 +85,6 @@ sub insert ($$) { return undef unless defined $entry->{user}; my $dbh = db::connect($config); - print STDERR 'insert ' . Dumper($entry); return db::insert( $dbh, 'calcms_password_requests', $entry ); } @@ -120,7 +116,6 @@ sub delete ($$) { $conditions }; - print STDERR "$query " . Dumper( \@bind_values ); db::put( $dbh, $query, \@bind_values ); } @@ -137,8 +132,6 @@ sub sendToken ($$) { my $oldEntry = password_requests::get( $config, { user => $entry->{user} } ); if ( defined $oldEntry ) { my $createdAt = $oldEntry->{created_at}; - print STDERR Dumper($oldEntry); - print STDERR "createdAt=$createdAt\n"; my $age = time() - time::datetime_to_time($createdAt); if ( $age < 60 ) { print STDERR "too many requests"; @@ -196,18 +189,13 @@ sub changePassword ($$$) { return { error => 'entered passwords do not match' }; } - #print STDERR "error at changing password:" . Dumper($errors); - my $crypt = auth::crypt_password( $params->{user_password} ); $user = { id => $user->{id} }; $user->{salt} = $crypt->{salt}; $user->{pass} = $crypt->{crypt}; - #print '
'.Dumper($user).'
'; $config->{access}->{write} = 1; - print STDERR "update user" . Dumper($user); my $result = uac::update_user( $config, $user ); - print STDERR "result:" . Dumper($result); $config->{access}->{write} = 0; return { success => "password changed for $userName" }; } diff --git a/lib/calcms/playout.pm b/lib/calcms/playout.pm index beef723..3645bea 100644 --- a/lib/calcms/playout.pm +++ b/lib/calcms/playout.pm @@ -235,7 +235,6 @@ sub sync ($$) { my $config = shift; my $options = shift; - print STDERR "upload " . Dumper($options); return undef unless defined $options->{project_id}; return undef unless defined $options->{studio_id}; return undef unless defined $options->{from}; @@ -268,8 +267,6 @@ sub sync ($$) { my $dbh = db::connect($config); my $entries = db::get( $dbh, $query, $bind_values ); - #print STDERR "entries:".Dumper($entries); - # get database entries by date my $entries_by_date = {}; for my $entry (@$entries) { @@ -280,7 +277,6 @@ sub sync ($$) { # remove outdated entries unless ( defined $update_by_date->{$start} ) { - print STDERR "delete:" . Dumper($entry); playout::delete( $config, $dbh, $entry ); my $result = series_events::set_playout_status( $config, @@ -298,7 +294,6 @@ sub sync ($$) { # update existing entries if ( defined $update_by_date->{$start} ) { next if has_changed( $entry, $update_by_date->{$start} ) == 0; - print STDERR "update:" . Dumper($entry); playout::update( $config, $dbh, $entry, $update_by_date->{$start} ); my $result = series_events::set_playout_status( $config, @@ -320,7 +315,6 @@ sub sync ($$) { unless ( defined $entries_by_date->{$start} ) { $entry->{project_id} = $project_id; $entry->{studio_id} = $studio_id; - print STDERR "insert:" . Dumper($entry); playout::insert( $config, $dbh, $entry ); my $result = series_events::set_playout_status( $config, @@ -377,8 +371,6 @@ sub update ($$$$) { } my $entry = $oldEntry; - print STDERR "update:" . Dumper($entry); - my $day_start = $config->{date}->{day_starting_hour}; $entry->{end} = playout::getEnd( $entry->{start}, $entry->{duration} ); $entry->{start_date} = time::add_hours_to_datetime( $entry->{start}, -$day_start ); diff --git a/lib/calcms/series.pm b/lib/calcms/series.pm index 1d1d298..eb43883 100644 --- a/lib/calcms/series.pm +++ b/lib/calcms/series.pm @@ -365,9 +365,9 @@ sub remove_user ($$) { my $config = shift; my $condition = shift; - return unless ( defined $condition->{project_id} ); - return unless ( defined $condition->{studio_id} ); - return unless ( defined $condition->{series_id} ); + return unless defined $condition->{project_id}; + return unless defined $condition->{studio_id}; + return unless defined $condition->{series_id}; my @conditions = (); my @bind_values = (); diff --git a/lib/calcms/series_dates.pm b/lib/calcms/series_dates.pm index 0565c7f..47087d7 100644 --- a/lib/calcms/series_dates.pm +++ b/lib/calcms/series_dates.pm @@ -537,7 +537,6 @@ sub delete ($$) { }; my $bind_values = [ $entry->{project_id}, $entry->{studio_id}, $entry->{series_id} ]; - #print '
$query'.$query.Dumper($bind_values).'
'; db::put( $dbh, $query, $bind_values ); } diff --git a/lib/calcms/series_events.pm b/lib/calcms/series_events.pm index bd8888f..2b8d26b 100644 --- a/lib/calcms/series_events.pm +++ b/lib/calcms/series_events.pm @@ -106,8 +106,8 @@ sub set_episode{ my $config = shift; my $entry = shift; - return undef unless ( defined $entry->{id} ); - return undef unless ( defined $entry->{episode} ); + return undef unless defined $entry->{id}; + return undef unless defined $entry->{episode}; my $query = qq{ update calcms_events @@ -131,9 +131,9 @@ sub save_event_time($$) { my $config = shift; my $entry = shift; - return undef unless ( defined $entry->{id} ); - return undef unless ( defined $entry->{duration} ); - return undef unless ( defined $entry->{start_date} ); + return undef unless defined $entry->{id}; + return undef unless defined $entry->{duration}; + return undef unless defined $entry->{start_date}; my $dbh = db::connect($config); my $event = { @@ -173,7 +173,6 @@ sub save_event_time($$) { }; push @$bind_values, $event->{id}; - #print STDERR $update_sql."\n".Dumper($bind_values)."\n"; db::put( $dbh, $update_sql, $bind_values ); return $event; } diff --git a/lib/calcms/series_schedule.pm b/lib/calcms/series_schedule.pm index dbcbf8d..53539f8 100644 --- a/lib/calcms/series_schedule.pm +++ b/lib/calcms/series_schedule.pm @@ -167,7 +167,6 @@ sub delete($$) { }; my $bind_values = [ $entry->{project_id}, $entry->{studio_id}, $entry->{series_id}, $entry->{schedule_id} ]; - #print '
$query'.$query.Dumper($bind_values).'
'; db::put( $dbh, $query, $bind_values ); } diff --git a/lib/calcms/studio_timeslot_dates.pm b/lib/calcms/studio_timeslot_dates.pm index d407a02..e14ff0b 100644 --- a/lib/calcms/studio_timeslot_dates.pm +++ b/lib/calcms/studio_timeslot_dates.pm @@ -119,7 +119,7 @@ sub update { my $config = shift; my $entry = shift; - return undef unless ( defined $entry->{schedule_id} ); + return undef unless defined $entry->{schedule_id}; my $dbh = db::connect($config); @@ -270,10 +270,9 @@ sub delete { my $config = shift; my $entry = shift; - #print STDERR "delete:".Dumper($entry); - return unless ( defined $entry->{project_id} ); - return unless ( defined $entry->{studio_id} ); - return unless ( defined $entry->{schedule_id} ); + return unless defined $entry->{project_id}; + return unless defined $entry->{studio_id}; + return unless defined $entry->{schedule_id}; my $dbh = db::connect($config); @@ -284,7 +283,6 @@ sub delete { }; my $bind_values = [ $entry->{schedule_id} ]; - #print '
$query'.$query.Dumper($bind_values).'
'; db::put( $dbh, $query, $bind_values ); } @@ -297,8 +295,6 @@ sub can_studio_edit_events { my @conditions = (); my @bind_values = (); - #print Dumper($condition); - #return 0 unless defined $condition->{project_id}; return 0 unless defined $condition->{studio_id}; return 0 unless defined $condition->{start}; @@ -363,8 +359,6 @@ sub getMergedDays { my @conditions = (); my @bind_values = (); - #print Dumper($condition); - #return 0 unless defined $condition->{project_id}; return 0 unless defined $condition->{studio_id}; return 0 unless defined $condition->{start}; @@ -411,20 +405,13 @@ sub getMergedDays { order by start }; - # print STDERR Dumper($query).Dumper(\@bind_values); - my $entries = db::get( $dbh, $query, \@bind_values ); - - # print STDERR Dumper($entries); - if ( scalar(@$entries) == 2 ) { if ( $entries->[0]->{end} eq $entries->[1]->{start} ) { $entries = { start => $entries->[0]->{start}, end => $entries->[1]->{end} }; - - # print STDERR "found".Dumper($entries)."\n"; return $entries; } } diff --git a/lib/calcms/studio_timeslot_schedule.pm b/lib/calcms/studio_timeslot_schedule.pm index 3198132..47c1340 100644 --- a/lib/calcms/studio_timeslot_schedule.pm +++ b/lib/calcms/studio_timeslot_schedule.pm @@ -56,9 +56,6 @@ sub get($$) { order by start }; - #print $query."\n"; - #print Dumper(\@bind_values); - my $entries = db::get( $dbh, $query, \@bind_values ); for my $entry (@$entries) { $entry->{schedule_id} = $entry->{id}; @@ -71,11 +68,11 @@ sub insert($$) { my $config = shift; my $entry = shift; - return unless ( defined $entry->{project_id} ); - return unless ( defined $entry->{studio_id} ); - return unless ( defined $entry->{start} ); - return unless ( defined $entry->{end} ); - return unless ( defined $entry->{frequency} ); + return unless defined $entry->{project_id}; + return unless defined $entry->{studio_id}; + return unless defined $entry->{start}; + return unless defined $entry->{end}; + return unless defined $entry->{frequency}; my $dbh = db::connect($config); return db::insert( $dbh, 'calcms_studio_timeslot_schedule', $entry ); @@ -86,12 +83,12 @@ sub update($$) { my $config = shift; my $entry = shift; - return unless ( defined $entry->{project_id} ); - return unless ( defined $entry->{studio_id} ); - return unless ( defined $entry->{schedule_id} ); - return unless ( defined $entry->{start} ); - return unless ( defined $entry->{end} ); - return unless ( defined $entry->{frequency} ); + return unless defined $entry->{project_id}; + return unless defined $entry->{studio_id}; + return unless defined $entry->{schedule_id}; + return unless defined $entry->{start}; + return unless defined $entry->{end}; + return unless defined $entry->{frequency}; $entry->{id} = $entry->{schedule_id}; delete $entry->{schedule_id}; @@ -121,7 +118,7 @@ sub delete ($$){ my $config = shift; my $entry = shift; - return unless ( defined $entry->{schedule_id} ); + return unless defined $entry->{schedule_id}; my $dbh = db::connect($config); @@ -132,7 +129,6 @@ sub delete ($$){ }; my $bind_values = [ $entry->{schedule_id} ]; - #print '
$query'.$query.Dumper($bind_values).'
'; db::put( $dbh, $query, $bind_values ); } diff --git a/lib/calcms/time.pm b/lib/calcms/time.pm index af00ca1..328ad14 100644 --- a/lib/calcms/time.pm +++ b/lib/calcms/time.pm @@ -481,7 +481,7 @@ sub check_datetime($) { sub check_year_month($) { my $date = shift; - return -1 unless ( defined $date ); + return -1 unless defined $date; return $date if ( $date eq '' ); if ( $date =~ /(\d\d\d\d)\-(\d\d?)/ ) { return $1 . '-' . $2 . '-' . $3; diff --git a/lib/calcms/uac.pm b/lib/calcms/uac.pm index 1626ce7..df2b28d 100644 --- a/lib/calcms/uac.pm +++ b/lib/calcms/uac.pm @@ -89,7 +89,7 @@ sub get_users_by_studio ($$) { my $config = shift; my $condition = shift; - return unless ( defined $condition->{studio_id} ); + return unless defined $condition->{studio_id}; my @conditions = (); my @bind_values = (); @@ -517,7 +517,7 @@ sub get_user_id ($$) { my $config = shift; my $user = shift; - return undef unless ( defined $user ); + return undef unless defined $user; my $query = qq{ select id @@ -535,7 +535,7 @@ sub get_role_id ($$) { my $config = shift; my $role = shift; - return undef unless ( defined $role ); + return undef unless defined $role; my $query = qq{ select id diff --git a/lib/calcms/work_schedule.pm b/lib/calcms/work_schedule.pm index 51039b9..3aefb32 100644 --- a/lib/calcms/work_schedule.pm +++ b/lib/calcms/work_schedule.pm @@ -80,8 +80,6 @@ sub get($$) { order by exclude, start }; - #print STDERR $query."\n".Dumper(\@bind_values); - my $entries = db::get( $dbh, $query, \@bind_values ); return $entries; } @@ -143,7 +141,6 @@ sub delete($$) { }; my $bind_values = [ $entry->{project_id}, $entry->{studio_id}, $entry->{schedule_id} ]; - #print '
$query'.$query.Dumper($bind_values).'
'; return db::put( $dbh, $query, $bind_values ); } diff --git a/website/agenda/planung/assign-series.cgi b/website/agenda/planung/assign-series.cgi index 8de15c6..8432817 100755 --- a/website/agenda/planung/assign-series.cgi +++ b/website/agenda/planung/assign-series.cgi @@ -179,7 +179,6 @@ sub assign_series { } ); - #print Dumper($series); if ( @$series == 0 ) { # assign series to project/studio @@ -192,12 +191,9 @@ sub assign_series { } ); - #print "assign\n"; } else { print STDERR "event $entry->{event_id} already assigned to project $entry->{project_id}, studio $entry->{studio_id}, series $entry->{series_id}\n"; - - #print "is schon\n"; } $config->{access}->{write} = 0; diff --git a/website/agenda/planung/assignments.cgi b/website/agenda/planung/assignments.cgi index 1598fd0..d099e18 100755 --- a/website/agenda/planung/assignments.cgi +++ b/website/agenda/planung/assignments.cgi @@ -97,13 +97,11 @@ sub show_events { my $projects = project::get( $config, { project_id => $params->{project_id} } ); my $project = $projects->[0]; - #print STDERR Dumper($project); return unless ( @$projects == 1 ); my $studios = studios::get( $config, { project_id => $params->{project_id}, studio_id => $params->{studio_id} } ); my $studio = $studios->[0]; - #print STDERR Dumper($studio); return unless ( @$studios == 1 ); my $project_name = $project->{name}; @@ -161,7 +159,6 @@ sub show_events { order by series_name,title,start limit 1000 }; - print '
' . Dumper($query) . Dumper($bind_values) . '
'; $results = db::get( $dbh, $query, $bind_values ); # detect title and episode diff --git a/website/agenda/planung/audio-recordings.cgi b/website/agenda/planung/audio-recordings.cgi index b4c4433..cdcfbbb 100755 --- a/website/agenda/planung/audio-recordings.cgi +++ b/website/agenda/planung/audio-recordings.cgi @@ -98,8 +98,6 @@ my $permissions = $request->{permissions}; $params->{action} = '' unless defined $params->{action}; $params->{error} = $error || ''; -#print STDERR Dumper($params); - if ( $params->{action} eq 'upload' ) { uploadRecording( $config, $request ); } elsif ( $params->{action} eq 'delete' ) { @@ -137,7 +135,6 @@ sub uploadRecording { if ( defined $fh ) { print STDERR "upload\n"; - #print STDERR Dumper($fh)."
"; my $fileInfo = uploadFile( $config, $fh, $params->{event_id}, $user, $params->{upload} ); $params->{error} .= $fileInfo->{error} if defined $fileInfo->{error}; $params->{path} = $fileInfo->{path}; @@ -284,8 +281,6 @@ sub showAudioRecordings { return; } - #print '
'.Dumper($event).'
'; - my $audioRecordings = audio_recordings::get( $config, { @@ -294,8 +289,6 @@ sub showAudioRecordings { event_id => $params->{event_id}, } ); - - #print Dumper($audioRecordings); for my $recording (@$audioRecordings) { $recording->{size} =~ s/(\d)(\d\d\d)$/$1\.$2/g; $recording->{size} =~ s/(\d)(\d\d\d\.\d\d\d)$/$1\.$2/g; @@ -411,8 +404,6 @@ sub updateDatabase { eventDuration => $eventDuration }; - #print STDERR "updateDatabase:" . Dumper($entry); - #connect $config->{access}->{write} = 1; my $dbh = db::connect($config); @@ -466,17 +457,12 @@ sub getFilename { } - #print STDERR "cgi:".Dumper($cgi); - # fallback to CGI module my $file = $cgi->param("upload"); return { error => "is no file" } if ( defined $file ) && ( $file =~ /\|/ ); - #print STDERR "file:".Dumper($file); my $fileInfo = $cgi->uploadInfo($file); - #print STDERR "fileInfo:".Dumper($fileInfo); - if ( defined $fileInfo ) { my $filename = $fileInfo->{'Content-Disposition'} || ''; if ( $filename =~ /filename=\"(.*?)\"/ ) { @@ -559,7 +545,6 @@ sub check_params { $checked->{template} = template::check( $config, $params->{template}, 'upload-audio-recordings' ); - #print Dumper($params); #numeric values for my $param ( 'project_id', 'studio_id', 'default_studio_id', 'series_id', 'event_id', 'id' ) { diff --git a/website/agenda/planung/comment.cgi b/website/agenda/planung/comment.cgi index cbf3683..31afeb0 100755 --- a/website/agenda/planung/comment.cgi +++ b/website/agenda/planung/comment.cgi @@ -60,7 +60,6 @@ $request = uac::prepare_request( $request, $user_presets ); $params = $request->{params}->{checked}; -#print Dumper($params); #show header if ( ( params::isJson() ) || ( defined $params->{action} ) ) { print "Content-Type:text/html; charset=utf-8;\n\n"; diff --git a/website/agenda/planung/create-events.cgi b/website/agenda/planung/create-events.cgi index 296507d..5c7039e 100755 --- a/website/agenda/planung/create-events.cgi +++ b/website/agenda/planung/create-events.cgi @@ -192,7 +192,6 @@ sub createEvent { $event->{start_date} = $event->{start}; eventOps::createEvent( $request, $event, 'create_event_from_schedule' ); - print STDERR Dumper($date); return $event; } diff --git a/website/agenda/planung/event-history.cgi b/website/agenda/planung/event-history.cgi index 7ddf21f..1e6384f 100755 --- a/website/agenda/planung/event-history.cgi +++ b/website/agenda/planung/event-history.cgi @@ -48,8 +48,6 @@ my $request = { }, }; -#print STDERR Dumper($request)."\n"; - #set user at params->presets->user $request = uac::prepare_request( $request, $user_presets ); @@ -106,15 +104,12 @@ sub show_history { my $events = event_history::get( $config, $options ); - #print STDERR Dumper($events); return unless defined $events; $params->{events} = $events; for my $permission ( keys %{$permissions} ) { $params->{'allow'}->{$permission} = $request->{permissions}->{$permission}; } - - #print STDERR Dumper($params); $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'event-history' } ); template::process( $config, 'print', template::check( $config, 'event-history' ), $params ); @@ -280,8 +275,6 @@ sub check_params { $checked->{action} = $params->{action}; } } - - #print STDERR Dumper($checked); return $checked; } diff --git a/website/agenda/planung/image-upload.cgi b/website/agenda/planung/image-upload.cgi index 5938053..b5cefe6 100755 --- a/website/agenda/planung/image-upload.cgi +++ b/website/agenda/planung/image-upload.cgi @@ -84,7 +84,6 @@ if ( defined $r ) { print STDERR "fallback\n"; } -print STDERR Dumper($params); print "Content-type:text/html; charset=UTF-8;\n\n"; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); @@ -214,7 +213,6 @@ sub update_database { studio_id => $params->{studio_id}, licence => $params->{licence} }; - print STDERR Dumper($image); #connect $config->{access}->{write} = 1; diff --git a/website/agenda/planung/image.cgi b/website/agenda/planung/image.cgi index d6d8247..2069c7f 100755 --- a/website/agenda/planung/image.cgi +++ b/website/agenda/planung/image.cgi @@ -168,8 +168,6 @@ sub show_image { $selectedImage = $filenames->{$selectedFilename}; } else { - #print STDERR "getByName:".Dumper($params); - #put selected image to the top my $imagesByNames = images::get( $config, @@ -179,8 +177,6 @@ sub show_image { filename => $selectedFilename } ); - - #print STDERR Dumper($imagesByNames); $selectedImage = $imagesByNames->[0] if scalar @$imagesByNames > 0; } @@ -293,8 +289,6 @@ sub save_image { print STDERR "going to save\n"; - #print STDERR Dumper($image); - my $entries = images::get( $config, { @@ -480,8 +474,6 @@ sub check_params { $checked->{from} = time::check_date( $params->{from} ); $checked->{till} = time::check_date( $params->{till} ); - #print STDERR 'checked:'.Dumper ($checked); - return $checked; } diff --git a/website/agenda/planung/notify-events.cgi b/website/agenda/planung/notify-events.cgi index 82cb9d4..ba611dc 100755 --- a/website/agenda/planung/notify-events.cgi +++ b/website/agenda/planung/notify-events.cgi @@ -51,8 +51,6 @@ my $request = { }, }; -#print STDERR Dumper($request)."\n"; - #set user at params->presets->user $request = uac::prepare_request( $request, $user_presets ); diff --git a/website/agenda/planung/roles.cgi b/website/agenda/planung/roles.cgi index 431c65e..11a21e1 100755 --- a/website/agenda/planung/roles.cgi +++ b/website/agenda/planung/roles.cgi @@ -74,7 +74,6 @@ if ( defined $params->{action} ) { $config->{access}->{write} = 0; show_roles( $config, $request ); -#print '
'.Dumper($request);
 return;
 
 # update roles in database:
@@ -108,8 +107,6 @@ sub save_roles {
 
     my $columns = uac::get_role_columns($config);
 
-    #print '
'.Dumper($columns).'
';
-
     #initialize all value ids (given by params matching to database columns)
     my $values = {};
     for my $param ( keys %$params ) {
@@ -163,7 +160,6 @@ sub save_roles {
         }
     }
 
-    #print STDERR Dumper($values);
     #order roles to update by level
     for my $id ( sort { $values->{$a}->{level} <=> $values->{$b}->{level} } keys %$values ) {
         my $role = $values->{$id};
@@ -313,7 +309,6 @@ sub show_roles {
 
     for my $role (@$roles) {
 
-        #print Dumper($role);
         my $id    = $role->{id}   || '';
         my $value = $role->{role} || '';
         my $style = '';
diff --git a/website/agenda/planung/select-event.cgi b/website/agenda/planung/select-event.cgi
index 0116ff0..94d9d86 100755
--- a/website/agenda/planung/select-event.cgi
+++ b/website/agenda/planung/select-event.cgi
@@ -110,13 +110,10 @@ sub show_events {
         push @$years, $date;
     }
 
-    #print Dumper($params->{loc});
     $params->{studios} = $user_studios;
     $params->{series}  = $series;
     $params->{events}  = $events;
     $params->{years}   = $years;
-
-    #print STDERR Dumper($params);
     template::process( $config, 'print', $params->{template}, $params );
     return;
 }
diff --git a/website/agenda/planung/studio-timeslots.cgi b/website/agenda/planung/studio-timeslots.cgi
index dad699a..d171ad9 100755
--- a/website/agenda/planung/studio-timeslots.cgi
+++ b/website/agenda/planung/studio-timeslots.cgi
@@ -108,7 +108,6 @@ sub save_schedule {
         return;
     }
 
-    #print Dumper($params);
     my $params = $request->{params}->{checked};
 
     for my $attr ( 'project_id', 'studio_id', 'start', 'end', 'end_date', 'schedule_studio_id' ) {
@@ -131,22 +130,16 @@ sub save_schedule {
         return;
     }
 
-    #print Dumper($entry);
     $config->{access}->{write} = 1;
     if ( defined $params->{schedule_id} ) {
         $entry->{schedule_id} = $params->{schedule_id};
-
-        #print Dumper($entry);
         studio_timeslot_schedule::update( $config, $entry );
 
-        #my $updates=0;
-        #print Dumper($entry);
         my $updates = studio_timeslot_dates::update( $config, $entry );
         uac::print_info("timeslot schedule saved. $updates dates scheduled");
     } else {
         $entry->{schedule_id} = studio_timeslot_schedule::insert( $config, $entry );
 
-        #my $updates=0;
         my $updates = studio_timeslot_dates::update( $config, $entry );
         uac::print_info("timeslot schedule added. $updates dates added");
     }
diff --git a/website/agenda/planung/user-settings.cgi b/website/agenda/planung/user-settings.cgi
index 34445e3..511268a 100755
--- a/website/agenda/planung/user-settings.cgi
+++ b/website/agenda/planung/user-settings.cgi
@@ -34,7 +34,6 @@ my $user_presets = uac::get_user_presets(
         studio_id  => $params->{studio_id}
     }
 );
-#print STDERR Dumper($user_presets);
 $params->{default_studio_id} = $user_presets->{studio_id};
 $params = uac::setDefaultStudio( $params, $user_presets );
 $params = uac::setDefaultProject( $params, $user_presets );
diff --git a/website/agenda/planung/users.cgi b/website/agenda/planung/users.cgi
index dfe1bd4..0066cd3 100755
--- a/website/agenda/planung/users.cgi
+++ b/website/agenda/planung/users.cgi
@@ -100,7 +100,6 @@ sub show_users {
     for my $user (@$users) {
         $user->{disabled_checked} = 'selected="selected"' if ( $user->{disabled} eq '1' );
 
-        #print Dumper($user);
         my $user_roles = uac::get_user_roles(
             $config,
             {
@@ -111,8 +110,6 @@ sub show_users {
         );
         my @user_roles = ( map { { role => $_->{role} } } @$user_roles );
 
-        #print Dumper(\@user_roles);
-        #@user_roles[-1]->{__last__}=1 unless(@user_roles==0);
         $user->{user_roles} = \@user_roles;
 
         #mark all roles assigned to user
@@ -167,11 +164,8 @@ sub show_users {
     $params->{loc}         = localization::get( $config, { user => $params->{presets}->{user}, file => 'users' } );
     uac::set_template_permissions( $permissions, $params );
 
-    #print Dumper($permissions);
     template::process( $config, 'print', $params->{template}, $params );
 
-    #	template::process($config, 'print', template::check($config, 'users'), $params);
-
 }
 
 sub update_user {
@@ -198,11 +192,9 @@ sub update_user {
             return;
         }
 
-        #print Dumper($params);
         my $users = uac::get_users( $config, { email => $params->{user_email} } );
         if ( scalar(@$users) > 0 ) {
 
-            #print Dumper($users);
             error('There is already a user registered for the given email address');
             return;
         }
@@ -217,7 +209,6 @@ sub update_user {
         $user->{salt} = $crypt->{salt};
         $user->{pass} = $crypt->{crypt};
 
-        #print '
'.Dumper($user).'
';
         $user->{created_at}  = time::time_to_datetime( time() );
         $user->{modified_at} = time::time_to_datetime( time() );
         $user->{created_by}  = $params->{presets}->{user};
@@ -250,7 +241,6 @@ sub change_password {
     $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'users' } );
     uac::set_template_permissions( $permissions, $params );
 
-    #print Dumper($permissions);
     template::process( $config, 'print', template::check( $config, 'change-password' ), $params );
 }
 
@@ -275,9 +265,6 @@ sub update_user_roles {
     my $config  = shift;
     my $request = shift;
 
-    #	print Dumper($params).'
';
-    #	print Dumper($request->{params}->{checked});
-
     my $permissions = $request->{permissions};
     unless ( $permissions->{update_user_role} == 1 ) {
         uac::permissions_denied('update_user_role');
@@ -453,8 +440,6 @@ sub check_params {
         }
     }
 
-    #print Dumper($params);
-    #print '
'.Dumper($checked).'
';
     return $checked;
 }
 
diff --git a/website/agenda/planung/work-time.cgi b/website/agenda/planung/work-time.cgi
index b851520..b8119f8 100755
--- a/website/agenda/planung/work-time.cgi
+++ b/website/agenda/planung/work-time.cgi
@@ -80,7 +80,6 @@ sub save_schedule {
         return;
     }
 
-    #print Dumper($params);
     for my $attr ( 'project_id', 'studio_id', 'start' ) {
         unless ( defined $params->{$attr} ) {
             uac::print_error( $attr . ' not given!' );
@@ -255,7 +254,6 @@ sub show_work_schedule {
         $params->{$key} = $serie->{$key};
     }
 
-    #print STDERR '
'.Dumper($params).'
';
     $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'work-time' } );
     template::process( $config, 'print', $params->{template}, $params );
 }