fix array length determining and cleanup

This commit is contained in:
Milan
2018-08-31 23:15:57 +02:00
parent 05b1251c1a
commit 3e338758e9
42 changed files with 7588 additions and 7660 deletions

View File

@@ -2,7 +2,6 @@
use warnings "all";
use strict;
use Data::Dumper;
use URI::Escape();
use Encode();
@@ -32,30 +31,30 @@ my $r = shift;
my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug};
my ( $user, $expires ) = auth::get_user( $cgi, $config );
return if ( ( !defined $user ) || ( $user eq '' ) );
return if ( !defined $user ) || ( $user eq '' );
#print STDERR $params->{project_id}."\n";
my $user_presets = uac::get_user_presets(
$config,
{
project_id => $params->{project_id},
studio_id => $params->{studio_id},
user => $user
}
$config,
{
project_id => $params->{project_id},
studio_id => $params->{studio_id},
user => $user
}
);
$params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
#print STDERR $params->{project_id}."\n";
my $request = {
url => $ENV{QUERY_STRING} || '',
params => {
original => $params,
checked => check_params($params),
},
url => $ENV{QUERY_STRING} || '',
params => {
original => $params,
checked => check_params($params),
},
};
$request = uac::prepare_request( $request, $user_presets );
@@ -76,170 +75,170 @@ print q{
my $permissions = $request->{permissions};
unless ( $permissions->{scan_series_events} == 1 ) {
uac::permissions_denied('scan_series_events');
return;
uac::permissions_denied('scan_series_events');
return;
}
if ( defined $params->{action} ) {
assign_series( $config, $request ) if ( $params->{action} eq 'assign_series' );
assign_series( $config, $request ) if $params->{action} eq 'assign_series';
}
show_events( $config, $request );
sub show_events {
my $config = shift;
my $request = shift;
my $config = shift;
my $request = shift;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{assign_series_events} == 1 ) {
uac::permissions_denied('assign_series_events');
return;
}
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{assign_series_events} == 1 ) {
uac::permissions_denied('assign_series_events');
return;
}
my $projects = project::get( $config, { project_id => $params->{project_id} } );
my $project = $projects->[0];
return unless ( @$projects == 1 );
my $projects = project::get( $config, { project_id => $params->{project_id} } );
my $project = $projects->[0];
return unless scalar @$projects == 1 ;
my $studios = studios::get( $config, { project_id => $params->{project_id}, studio_id => $params->{studio_id} } );
my $studio = $studios->[0];
return unless ( @$studios == 1 );
my $studios = studios::get( $config, { project_id => $params->{project_id}, studio_id => $params->{studio_id} } );
my $studio = $studios->[0];
return unless scalar @$studios == 1 ;
my $project_name = $project->{name};
my $studio_name = $studio->{location};
my $project_name = $project->{name};
my $studio_name = $studio->{location};
#get series_names
my $dbh = db::connect($config);
my $query = q{
#get series_names
my $dbh = db::connect($config);
my $query = q{
select project_id, studio_id, series_id, series_name, title
from calcms_series s, calcms_project_series ps
where s.id=ps.series_id
order by series_name, title
};
my $results = db::get( $dbh, $query );
my $results = db::get( $dbh, $query );
# get projects by id
my $projects_by_id = {};
$projects = project::get($config);
for my $project (@$projects) {
$projects_by_id->{ $project->{project_id} } = $project;
}
# get projects by id
my $projects_by_id = {};
$projects = project::get($config);
for my $project (@$projects) {
$projects_by_id->{ $project->{project_id} } = $project;
}
# get studios by id
my $studios_by_id = {};
$studios = studios::get($config);
for my $studio (@$studios) {
$studios_by_id->{ $studio->{id} } = $studio;
}
# get studios by id
my $studios_by_id = {};
$studios = studios::get($config);
for my $studio (@$studios) {
$studios_by_id->{ $studio->{id} } = $studio;
}
#add project and studio name to series
for my $result (@$results) {
$result->{project_name} = $projects_by_id->{ $result->{project_id} }->{name};
$result->{studio_name} = $studios_by_id->{ $result->{studio_id} }->{location};
$result->{series_name} = 'Einzelsendung' if $result->{series_name} eq '_single_';
}
$params->{series} = $results;
#add project and studio name to series
for my $result (@$results) {
$result->{project_name} = $projects_by_id->{ $result->{project_id} }->{name};
$result->{studio_name} = $studios_by_id->{ $result->{studio_id} }->{location};
$result->{series_name} = 'Einzelsendung' if $result->{series_name} eq '_single_';
}
$params->{series} = $results;
#fill template
$params->{project_name} = $project_name;
$params->{studio_name} = $studio_name;
#fill template
$params->{project_name} = $project_name;
$params->{studio_name} = $studio_name;
template::process( 'print', $params->{template}, $params );
template::process( 'print', $params->{template}, $params );
}
sub assign_series {
my $config = shift;
my $request = shift;
my $config = shift;
my $request = shift;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{assign_series_events} == 1 ) {
uac::permissions_denied('assign_series_events');
return;
}
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{assign_series_events} == 1 ) {
uac::permissions_denied('assign_series_events');
return;
}
my $entry = {};
for my $attr ( 'project_id', 'studio_id', 'series_id' ) {
if ( defined $params->{$attr} ) {
$entry->{$attr} = $params->{$attr};
} else {
uac::print_error( $attr . ' not given!' );
return;
}
}
my $entry = {};
for my $attr ( 'project_id', 'studio_id', 'series_id' ) {
if ( defined $params->{$attr} ) {
$entry->{$attr} = $params->{$attr};
} else {
uac::print_error( $attr . ' not given!' );
return;
}
}
$config->{access}->{write} = 1;
$config->{access}->{write} = 1;
#check if series is assigned to project/studio
my $series = series::get(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
#check if series is assigned to project/studio
my $series = series::get(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
#print Dumper($series);
if ( @$series == 0 ) {
#print Dumper($series);
if ( @$series == 0 ) {
# assign series to project/studio
project::assign_series(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
# assign series to project/studio
project::assign_series(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
#print "assign\n";
} else {
print STDERR
#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";
}
#print "is schon\n";
}
$config->{access}->{write} = 0;
uac::print_info("event successfully assigned to series");
$config->{access}->{write} = 0;
uac::print_info("event successfully assigned to series");
}
sub check_params {
my $params = shift;
my $params = shift;
my $checked = {};
my $checked = {};
my $debug = $params->{debug} || '';
if ( $debug =~ /([a-z\_\,]+)/ ) {
$debug = $1;
}
$checked->{debug} = $debug;
my $debug = $params->{debug} || '';
if ( $debug =~ /([a-z\_\,]+)/ ) {
$debug = $1;
}
$checked->{debug} = $debug;
#actions and roles
$checked->{action} = '';
if ( defined $params->{action} ) {
if ( $params->{action} =~ /^(assign_series)$/ ) {
$checked->{action} = $params->{action};
}
}
#actions and roles
$checked->{action} = '';
if ( defined $params->{action} ) {
if ( $params->{action} =~ /^(assign_series)$/ ) {
$checked->{action} = $params->{action};
}
}
#numeric values
$checked->{exclude} = 0;
for my $param ( 'id', 'project_id', 'studio_id', 'series_id' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
$checked->{$param} = $params->{$param};
}
}
#numeric values
$checked->{exclude} = 0;
for my $param ( 'id', 'project_id', 'studio_id', 'series_id' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
$checked->{$param} = $params->{$param};
}
}
if ( defined $checked->{studio_id} ) {
$checked->{default_studio_id} = $checked->{studio_id};
} else {
$checked->{studio_id} = -1;
}
if ( defined $checked->{studio_id} ) {
$checked->{default_studio_id} = $checked->{studio_id};
} else {
$checked->{studio_id} = -1;
}
$checked->{template} = template::check( $params->{template}, 'assign_series' );
$checked->{template} = template::check( $params->{template}, 'assign_series' );
return $checked;
return $checked;
}
__DATA__

View File

@@ -36,26 +36,26 @@ return if ( ( !defined $user ) || ( $user eq '' ) );
#print STDERR $params->{project_id}."\n";
my $user_presets = uac::get_user_presets(
$config,
{
project_id => $params->{project_id},
studio_id => $params->{studio_id},
user => $user
}
$config,
{
project_id => $params->{project_id},
studio_id => $params->{studio_id},
user => $user
}
);
$params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
#print STDERR $params->{project_id}."\n";
my $request = {
url => $ENV{QUERY_STRING} || '',
params => {
original => $params,
checked => check_params($params),
},
url => $ENV{QUERY_STRING} || '',
params => {
original => $params,
checked => check_params($params),
},
};
$request = uac::prepare_request( $request, $user_presets );
@@ -76,86 +76,86 @@ print q{
my $permissions = $request->{permissions};
unless ( $permissions->{scan_series_events} == 1 ) {
uac::permissions_denied('scan_series_events');
return;
uac::permissions_denied('scan_series_events');
return;
}
if ( defined $params->{action} ) {
assign_events( $config, $request ) if ( $params->{action} eq 'assign_events' );
assign_events( $config, $request ) if ( $params->{action} eq 'assign_events' );
}
show_events( $config, $request );
sub show_events {
my $config = shift;
my $request = shift;
my $config = shift;
my $request = shift;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{assign_series_events} == 1 ) {
uac::permissions_denied('assign_series_events');
return;
}
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{assign_series_events} == 1 ) {
uac::permissions_denied('assign_series_events');
return;
}
my $projects = project::get( $config, { project_id => $params->{project_id} } );
my $project = $projects->[0];
my $projects = project::get( $config, { project_id => $params->{project_id} } );
my $project = $projects->[0];
#print STDERR Dumper($project);
return unless ( @$projects == 1 );
#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];
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 );
#print STDERR Dumper($studio);
return unless ( @$studios == 1 );
my $project_name = $project->{name};
my $studio_name = $studio->{location};
my $project_name = $project->{name};
my $studio_name = $studio->{location};
#get series_names
my $dbh = db::connect($config);
my $query = q{
#get series_names
my $dbh = db::connect($config);
my $query = q{
select project_id, studio_id, series_id, series_name, title
from calcms_series s, calcms_project_series ps
where s.id=ps.series_id
order by series_name, title
};
my $results = db::get( $dbh, $query );
my $results = db::get( $dbh, $query );
# get projects by id
my $projects_by_id = {};
$projects = project::get($config);
for my $project (@$projects) {
$projects_by_id->{ $project->{project_id} } = $project;
}
# get projects by id
my $projects_by_id = {};
$projects = project::get($config);
for my $project (@$projects) {
$projects_by_id->{ $project->{project_id} } = $project;
}
# get studios by id
my $studios_by_id = {};
$studios = studios::get($config);
for my $studio (@$studios) {
$studios_by_id->{ $studio->{id} } = $studio;
}
# get studios by id
my $studios_by_id = {};
$studios = studios::get($config);
for my $studio (@$studios) {
$studios_by_id->{ $studio->{id} } = $studio;
}
#add project and studio name to series
for my $result (@$results) {
$result->{project_name} = $projects_by_id->{ $result->{project_id} }->{name};
$result->{studio_name} = $studios_by_id->{ $result->{studio_id} }->{location};
$result->{series_name} = 'Einzelsendung' if $result->{series_name} eq '_single_';
}
$params->{series} = $results;
#add project and studio name to series
for my $result (@$results) {
$result->{project_name} = $projects_by_id->{ $result->{project_id} }->{name};
$result->{studio_name} = $studios_by_id->{ $result->{studio_id} }->{location};
$result->{series_name} = 'Einzelsendung' if $result->{series_name} eq '_single_';
}
$params->{series} = $results;
# get events not assigned to series
my $conditions = [];
my $bind_values = [];
if ( $project_name ne '' ) {
push @$conditions, 'e.project=?';
push @$bind_values, $project_name;
}
if ( $studio_name ne '' ) {
push @$conditions, 'e.location=?';
push @$bind_values, $studio_name;
}
$conditions = ' and ' . join( ' and ', @$conditions ) if ( @$conditions > 0 );
$query = qq{
# get events not assigned to series
my $conditions = [];
my $bind_values = [];
if ( $project_name ne '' ) {
push @$conditions, 'e.project=?';
push @$bind_values, $project_name;
}
if ( $studio_name ne '' ) {
push @$conditions, 'e.location=?';
push @$bind_values, $studio_name;
}
$conditions = ' and ' . join( ' and ', @$conditions ) if scalar(@$conditions) > 0;
$query = qq{
select e.id, program, project, location, start, series_name, title, episode, rerun
from calcms_events e left join calcms_series_events se on se.event_id =e.id
where se.event_id is null
@@ -163,252 +163,252 @@ sub show_events {
order by series_name,title,start
limit 1000
};
print '<pre>' . Dumper($query) . Dumper($bind_values) . '</pre>';
$results = db::get( $dbh, $query, $bind_values );
print '<pre>' . Dumper($query) . Dumper($bind_values) . '</pre>';
$results = db::get( $dbh, $query, $bind_values );
# detect title and episode
for my $result (@$results) {
$result->{rerun} .= '';
if ( $result->{title} =~ /\#(\d+)([a-z])?\s*$/ ) {
$result->{episode} = $1 unless defined $result->{episode};
$result->{rerun} = $2 || '' unless ( $result->{rerun} =~ /\d/ );
$result->{title} =~ s/\#\d+[a-z]?\s*$//;
$result->{title} =~ s/\s+$//;
}
my $a = time::datetime_to_array( $result->{start} );
# detect title and episode
for my $result (@$results) {
$result->{rerun} .= '';
if ( $result->{title} =~ /\#(\d+)([a-z])?\s*$/ ) {
$result->{episode} = $1 unless defined $result->{episode};
$result->{rerun} = $2 || '' unless ( $result->{rerun} =~ /\d/ );
$result->{title} =~ s/\#\d+[a-z]?\s*$//;
$result->{title} =~ s/\s+$//;
}
my $a = time::datetime_to_array( $result->{start} );
#print STDERR "($a->[0],$a->[1],$a->[2])\n";
$result->{weekday} = time::weekday( $a->[0], $a->[1], $a->[2] );
$result->{weekday} = $time::names->{de}->{weekdays_abbr}->[ $result->{weekday} - 1 ];
}
#print STDERR "($a->[0],$a->[1],$a->[2])\n";
$result->{weekday} = time::weekday( $a->[0], $a->[1], $a->[2] );
$result->{weekday} = $time::names->{de}->{weekdays_abbr}->[ $result->{weekday} - 1 ];
}
#fill template
$params->{unassigned_events} = $results;
$params->{sum_events} = @$results;
$params->{project_name} = $project_name;
$params->{studio_name} = $studio_name;
#fill template
$params->{unassigned_events} = $results;
$params->{sum_events} = @$results;
$params->{project_name} = $project_name;
$params->{studio_name} = $studio_name;
template::process( 'print', $params->{template}, $params );
template::process( 'print', $params->{template}, $params );
}
sub assign_events {
my $config = shift;
my $request = shift;
my $config = shift;
my $request = shift;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{assign_series_events} == 1 ) {
uac::permissions_denied('assign_series_events');
return;
}
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{assign_series_events} == 1 ) {
uac::permissions_denied('assign_series_events');
return;
}
my $entry = {};
for my $attr ( 'project_id', 'studio_id', 'series_id', 'event_ids' ) {
if ( defined $params->{$attr} ) {
$entry->{$attr} = $params->{$attr};
} else {
uac::print_error( $attr . ' not given!' );
return;
}
}
my $entry = {};
for my $attr ( 'project_id', 'studio_id', 'series_id', 'event_ids' ) {
if ( defined $params->{$attr} ) {
$entry->{$attr} = $params->{$attr};
} else {
uac::print_error( $attr . ' not given!' );
return;
}
}
$config->{access}->{write} = 1;
for my $event_id ( split( /[\,\s]+/, $params->{event_ids} ) ) {
next unless $event_id =~ /^\d+/;
$entry->{event_id} = $event_id;
$config->{access}->{write} = 1;
for my $event_id ( split( /[\,\s]+/, $params->{event_ids} ) ) {
next unless $event_id =~ /^\d+/;
$entry->{event_id} = $event_id;
#get and parse event
my $request2 = {
params => {
checked => events::check_params(
$config,
{
event_id => $entry->{event_id},
template => 'no',
limit => 1,
archive => 'all',
}
)
},
config => $request->{config},
permissions => $request->{permissions}
};
$request2->{params}->{checked}->{published} = 'all';
my $events = events::get( $config, $request2 );
my $event = $events->[0];
unless ( defined $event ) {
print STDERR
#get and parse event
my $request2 = {
params => {
checked => events::check_params(
$config,
{
event_id => $entry->{event_id},
template => 'no',
limit => 1,
archive => 'all',
}
)
},
config => $request->{config},
permissions => $request->{permissions}
};
$request2->{params}->{checked}->{published} = 'all';
my $events = events::get( $config, $request2 );
my $event = $events->[0];
unless ( defined $event ) {
print STDERR
"event not found for project $entry->{project_id}, studio $entry->{studio_id}, series $entry->{series_id}, event $entry->{event_id}\n";
next;
}
print STDERR "'" . $event->{event_id} . "' '" . $event->{series_name} . "' '" . $event->{title} . "' '" . $event->{episode} . "'\n";
next;
}
print STDERR "'" . $event->{event_id} . "' '" . $event->{series_name} . "' '" . $event->{title} . "' '" . $event->{episode} . "'\n";
#next;
#next;
#check if series is assigned to project/studio
my $series = series::get(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
if ( @$series == 0 ) {
#check if series is assigned to project/studio
my $series = series::get(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
if ( scalar(@$series) == 0 ) {
# assign series to project/studio
project::assign_series(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
} else {
print STDERR
# assign series to project/studio
project::assign_series(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
} else {
print STDERR
"event $entry->{event_id} already asigned to project $entry->{project_id}, studio $entry->{studio_id}, series $entry->{series_id}\n";
}
}
#get series
$series = series::get(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
if ( @$series == 1 ) {
my $serie = $series->[0];
#get series
$series = series::get(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
}
);
if ( scalar(@$series) == 1 ) {
my $serie = $series->[0];
#set event's series name to value from series
my $series_name = $serie->{series_name} || '';
if ( $series_name ne '' ) {
#set event's series name to value from series
my $series_name = $serie->{series_name} || '';
if ( $series_name ne '' ) {
# prepend series_name from event to title on adding to single_events series
my $title = $event->{title};
if ( $serie->{has_single_events} eq '1' ) {
$title = $event->{series_name} . ' - ' . $title if $event->{series_name} ne '';
}
# prepend series_name from event to title on adding to single_events series
my $title = $event->{title};
if ( $serie->{has_single_events} eq '1' ) {
$title = $event->{series_name} . ' - ' . $title if $event->{series_name} ne '';
}
# save event content
series_events::save_content(
$config,
{
studio_id => $entry->{studio_id},
id => $entry->{event_id}, #TODO: id=> event_id
series_name => $series_name,
title => $title,
episode => $event->{episode},
rerun => $event->{rerun},
modified_by => $params->{presets}->{user},
}
);
# save event content
series_events::save_content(
$config,
{
studio_id => $entry->{studio_id},
id => $entry->{event_id}, #TODO: id=> event_id
series_name => $series_name,
title => $title,
episode => $event->{episode},
rerun => $event->{rerun},
modified_by => $params->{presets}->{user},
}
);
# add to history
$event->{project_id} = $entry->{project_id};
$event->{studio_id} = $entry->{studio_id};
$event->{series_id} = $entry->{series_id};
$event->{event_id} = $entry->{event_id};
$event->{series_name} = $series_name;
$event->{title} = $title;
$event->{user} = $params->{presets}->{user};
event_history::insert( $config, $event );
# add to history
$event->{project_id} = $entry->{project_id};
$event->{studio_id} = $entry->{studio_id};
$event->{series_id} = $entry->{series_id};
$event->{event_id} = $entry->{event_id};
$event->{series_name} = $series_name;
$event->{title} = $title;
$event->{user} = $params->{presets}->{user};
event_history::insert( $config, $event );
# print STDERR "ok\n";
}
} else {
print STDERR "no series title found for studio $entry->{studio_id} series $entry->{series_id}, event $entry->{event_id}\n";
next;
}
# print STDERR "ok\n";
}
} else {
print STDERR "no series title found for studio $entry->{studio_id} series $entry->{series_id}, event $entry->{event_id}\n";
next;
}
#assign event
my $result = series::assign_event(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
event_id => $entry->{event_id},
manual => 1
}
);
unless ( defined $result ) {
uac::print_error("error on assigning event to series");
return undef;
}
}
#assign event
my $result = series::assign_event(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
event_id => $entry->{event_id},
manual => 1
}
);
unless ( defined $result ) {
uac::print_error("error on assigning event to series");
return undef;
}
}
$config->{access}->{write} = 0;
uac::print_info("event successfully assigned to series");
$config->{access}->{write} = 0;
uac::print_info("event successfully assigned to series");
#$params->{getBack}=1;
#$params->{getBack}=1;
}
sub check_params {
my $params = shift;
my $params = shift;
my $checked = {};
my $checked = {};
my $debug = $params->{debug} || '';
if ( $debug =~ /([a-z\_\,]+)/ ) {
$debug = $1;
}
$checked->{debug} = $debug;
my $debug = $params->{debug} || '';
if ( $debug =~ /([a-z\_\,]+)/ ) {
$debug = $1;
}
$checked->{debug} = $debug;
#actions and roles
$checked->{action} = '';
if ( defined $params->{action} ) {
if ( $params->{action} =~ /^(assign_events)$/ ) {
$checked->{action} = $params->{action};
}
}
#actions and roles
$checked->{action} = '';
if ( defined $params->{action} ) {
if ( $params->{action} =~ /^(assign_events)$/ ) {
$checked->{action} = $params->{action};
}
}
#numeric values
$checked->{exclude} = 0;
for my $param ( 'id', 'project_id', 'studio_id', 'series_id', 'event_id' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
$checked->{$param} = $params->{$param};
}
}
#numeric values
$checked->{exclude} = 0;
for my $param ( 'id', 'project_id', 'studio_id', 'series_id', 'event_id' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
$checked->{$param} = $params->{$param};
}
}
for my $param ('event_ids') {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^[\d,]+$/ ) ) {
$checked->{$param} = $params->{$param};
}
}
for my $param ('event_ids') {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^[\d,]+$/ ) ) {
$checked->{$param} = $params->{$param};
}
}
if ( defined $checked->{studio_id} ) {
$checked->{default_studio_id} = $checked->{studio_id};
} else {
$checked->{studio_id} = -1;
}
if ( defined $checked->{studio_id} ) {
$checked->{default_studio_id} = $checked->{studio_id};
} else {
$checked->{studio_id} = -1;
}
$checked->{template} = template::check( $params->{template}, 'assignments' );
$checked->{template} = template::check( $params->{template}, 'assignments' );
if ( ( defined $checked->{action} ) && ( $checked->{action} eq 'save_schedule' ) ) {
if ( ( defined $checked->{action} ) && ( $checked->{action} eq 'save_schedule' ) ) {
#set defaults
$checked->{create_events} = 0;
$checked->{publish_events} = 0;
}
for my $param ( 'frequency', 'duration', 'default_duration', 'create_events', 'publish_events', 'live', 'count_episodes' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d+)/ ) ) {
$checked->{$param} = $1;
}
}
#set defaults
$checked->{create_events} = 0;
$checked->{publish_events} = 0;
}
for my $param ( 'frequency', 'duration', 'default_duration', 'create_events', 'publish_events', 'live', 'count_episodes' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d+)/ ) ) {
$checked->{$param} = $1;
}
}
#scalars
for my $param ( 'search', 'from', 'till' ) {
if ( defined $params->{$param} ) {
$checked->{$param} = $params->{$param};
$checked->{$param} =~ s/^\s+//g;
$checked->{$param} =~ s/\s+$//g;
}
}
#scalars
for my $param ( 'search', 'from', 'till' ) {
if ( defined $params->{$param} ) {
$checked->{$param} = $params->{$param};
$checked->{$param} =~ s/^\s+//g;
$checked->{$param} =~ s/\s+$//g;
}
}
return $checked;
return $checked;
}
__DATA__

View File

@@ -6,7 +6,7 @@ use warnings;
use strict;
use Data::Dumper;
use CGI::Simple ();
use CGI::Simple ();
use ModPerl::Util ();
use Date::Calc();
use Time::Local();
@@ -141,8 +141,9 @@ sub uploadRecording {
#print STDERR Dumper($fh)."<br>";
my $fileInfo = uploadFile( $config, $fh, $params->{event_id}, $user, $params->{upload} );
$params->{error} .= $fileInfo->{error} if defined $fileInfo->{error};
$params->{path} = $fileInfo->{path};
$params->{size} = $fileInfo->{size};
$params->{path} = $fileInfo->{path};
$params->{size} = $fileInfo->{size};
#$params->{duration} = $fileInfo->{duration};
$params = updateDatabase( $config, $params, $user ) if $params->{error} eq '';
} else {
@@ -292,18 +293,19 @@ 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;
$recording->{processed} = $recording->{processed} ? 'yes' : 'no';
$recording->{mastered} = $recording->{mastered} ? 'yes' : 'no';
$recording->{mastered} = $recording->{mastered} ? 'yes' : 'no';
$recording->{eventDuration} = getDuration( $recording->{eventDuration} );
$recording->{audioDuration} = getDuration( $recording->{audioDuration} );
$recording->{rmsLeft} ||= '-';
$recording->{rmsLeft} ||= '-';
$recording->{rmsRight} ||= '-';
}
@@ -323,19 +325,19 @@ sub showAudioRecordings {
}
sub getDuration{
my $duration=shift;
my $hour = int($duration / 3600);
$duration -= $hour * 3600;
sub getDuration {
my $duration = shift;
my $hour = int( $duration / 3600 );
$duration -= $hour * 3600;
my $minutes = int($duration / 60);
$duration -= $minutes * 60;
my $minutes = int( $duration / 60 );
$duration -= $minutes * 60;
my $seconds = int($duration);
$duration -= $seconds;
my $seconds = int($duration);
$duration -= $seconds;
my $milli= int(100 * $duration);
return sprintf("%02d:%02d:%02d.%02d",$hour, $minutes, $seconds, $milli);
my $milli = int( 100 * $duration );
return sprintf( "%02d:%02d:%02d.%02d", $hour, $minutes, $seconds, $milli );
}
sub uploadFile {
@@ -391,7 +393,7 @@ sub updateDatabase {
my $params = shift;
my $user = shift;
my $eventDuration = getEventDuration($config, $params->{event_id});
my $eventDuration = getEventDuration( $config, $params->{event_id} );
my $entry = {
project_id => $params->{project_id},
@@ -402,6 +404,7 @@ sub updateDatabase {
created_by => $user,
eventDuration => $eventDuration
};
#print STDERR "updateDatabase:" . Dumper($entry);
#connect
@@ -425,14 +428,14 @@ sub updateDatabase {
$params->{id} = $entry->{id};
} else {
print STDERR "insert\n";
$entry->{created_by} = $user;
$entry->{processed} = 0;
$entry->{mastered} = 0;
$entry->{rmsLeft} = 0.0;
$entry->{rmsRight} = 0.0;
$entry->{audioDuration} = 0.0;
$entry->{modified_at} = time();
$params->{id} = audio_recordings::insert( $config, $dbh, $entry );
$entry->{created_by} = $user;
$entry->{processed} = 0;
$entry->{mastered} = 0;
$entry->{rmsLeft} = 0.0;
$entry->{rmsRight} = 0.0;
$entry->{audioDuration} = 0.0;
$entry->{modified_at} = time();
$params->{id} = audio_recordings::insert( $config, $dbh, $entry );
}
$config->{access}->{write} = 0;
$params->{action_result} = 'done!';
@@ -504,15 +507,15 @@ sub checkFilename {
}
# return event duration in seconds
sub getEventDuration{
my $config = shift;
my $eventId = shift;
sub getEventDuration {
my $config = shift;
my $eventId = shift;
if ( $eventId < 1 ) {
print STDERR "invalid eventId $eventId\n";
return 0;
}
if ($eventId<1){
print STDERR "invalid eventId $eventId\n";
return 0;
}
my $request = {
params => {
checked => events::check_params(
@@ -524,16 +527,16 @@ sub getEventDuration{
}
)
},
config => $config
config => $config
};
$request->{params}->{checked}->{published}='all';
my $events = events::get( $config, $request );
if (scalar @$events == 0){
print STDERR "getEventDuration: no event found with event_id=$eventId\n";
$request->{params}->{checked}->{published} = 'all';
my $events = events::get( $config, $request );
if ( scalar @$events == 0 ) {
print STDERR "getEventDuration: no event found with event_id=$eventId\n";
}
my $event = $events->[0];
my $duration = time::get_duration_seconds( $event->{start}, $event->{end}, $config->{date}->{time_zone} );
return $duration;
my $event = $events->[0];
my $duration = time::get_duration_seconds( $event->{start}, $event->{end}, $config->{date}->{time_zone} );
return $duration;
}
sub check_params {

File diff suppressed because it is too large Load Diff

View File

@@ -35,12 +35,12 @@ my ( $user, $expires ) = auth::get_user( $cgi, $config );
return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets(
$config,
{
user => $user,
project_id => $params->{project_id},
studio_id => $params->{studio_id}
}
$config,
{
user => $user,
project_id => $params->{project_id},
studio_id => $params->{studio_id}
}
);
$params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id}
@@ -49,11 +49,11 @@ $params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = {
url => $ENV{QUERY_STRING} || '',
params => {
original => $params,
checked => check_params($params),
},
url => $ENV{QUERY_STRING} || '',
params => {
original => $params,
checked => check_params($params),
},
};
#set user at params->presets->user
@@ -64,261 +64,261 @@ $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";
print "Content-Type:text/html; charset=utf-8;\n\n";
} else {
my $headerParams = uac::set_template_permissions( $request->{permissions}, $params );
$headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } );
template::process( 'print', template::check('default.html'), $headerParams );
print q{
my $headerParams = uac::set_template_permissions( $request->{permissions}, $params );
$headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } );
template::process( 'print', template::check('default.html'), $headerParams );
print q{
<script src="js/datetime.js" type="text/javascript"></script>
} unless (params::isJson);
}
return unless defined uac::check( $config, $params, $user_presets );
if ( defined $params->{action} ) {
if ( $params->{action} eq 'get_json' ) {
getJson( $config, $request );
return;
}
if ( $params->{action} eq 'setLock' ) {
setLock( $config, $request );
return;
}
if ( $params->{action} eq 'setRead' ) {
setRead( $config, $request );
return;
}
if ( $params->{action} eq 'get_json' ) {
getJson( $config, $request );
return;
}
if ( $params->{action} eq 'setLock' ) {
setLock( $config, $request );
return;
}
if ( $params->{action} eq 'setRead' ) {
setRead( $config, $request );
return;
}
}
$config->{access}->{write} = 0;
showComments( $config, $request );
sub showComments {
my $config = shift;
my $request = shift;
my $config = shift;
my $request = shift;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{read_comment} == 1 ) {
uac::permissions_denied('read_comment');
return;
}
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{read_comment} == 1 ) {
uac::permissions_denied('read_comment');
return;
}
for my $attr ( 'project_id', 'studio_id' ) {
unless ( defined $params->{$attr} ) {
uac::print_error( "missing " . $attr . " to show comment" );
return;
}
}
for my $attr ( 'project_id', 'studio_id' ) {
unless ( defined $params->{$attr} ) {
uac::print_error( "missing " . $attr . " to show comment" );
return;
}
}
$config->{access}->{write} = 0;
my $dbh = db::connect($config);
$config->{access}->{write} = 0;
my $dbh = db::connect($config);
my $comment = $params->{comment};
my $template_parameters = {};
my $comment = $params->{comment};
my $template_parameters = {};
#my $nodes={};
#my $sorted_nodes=[];
#my $nodes={};
#my $sorted_nodes=[];
my $results = [];
if ( $params->{search} ne '' ) {
$params->{comment}->{search} = $params->{search};
$results = comments::get_by_event( $dbh, $config, $request );
} elsif ( $comment->{event_id} ne '' ) {
$results = comments::get_by_event( $dbh, $config, $request );
} else {
$results = comments::get_by_time( $dbh, $config, $comment );
}
my $results = [];
if ( $params->{search} ne '' ) {
$params->{comment}->{search} = $params->{search};
$results = comments::get_by_event( $dbh, $config, $request );
} elsif ( $comment->{event_id} ne '' ) {
$results = comments::get_by_event( $dbh, $config, $request );
} else {
$results = comments::get_by_time( $dbh, $config, $comment );
}
my $events = [];
my $comment_count = 0;
if ( @$results > 0 ) {
my $comments = modify_comments( $request, $results );
my $events = [];
my $comment_count = 0;
if ( scalar(@$results) > 0 ) {
my $comments = modify_comments( $request, $results );
$comments = comments::sort( $config, $comments );
$comments = comments::sort( $config, $comments );
$events = comments::get_events( $dbh, $config, $request, $comments );
my $language = $config::config->{date}->{language} || 'en';
for my $event (@$events) {
$event->{start} = time::date_time_format( $event->{start}, $language );
$comment_count += $event->{comment_count} if ( defined $event->{comment_count} );
$event->{cache_base_url} = $config::config->{cache}->{base_url};
}
}
for my $param (%$comment) {
$template_parameters->{$param} = $comment->{$param};
}
$events = comments::get_events( $dbh, $config, $request, $comments );
my $language = $config::config->{date}->{language} || 'en';
for my $event (@$events) {
$event->{start} = time::date_time_format( $event->{start}, $language );
$comment_count += $event->{comment_count} if ( defined $event->{comment_count} );
$event->{cache_base_url} = $config::config->{cache}->{base_url};
}
}
for my $param (%$comment) {
$template_parameters->{$param} = $comment->{$param};
}
$template_parameters->{search} = markup::fix_utf8( $request->{params}->{original}->{search} );
$template_parameters->{events} = $events;
$template_parameters->{debug} = $config->{system}->{debug};
$template_parameters->{event_count} = @$events + 0;
$template_parameters->{comment_count} = $comment_count;
$template_parameters->{is_empty} = 1 if ( @$events == 0 );
$template_parameters->{projects} = project::get_with_dates($config);
$template_parameters->{controllers} = $config->{controllers};
$template_parameters->{allow} = $permissions;
$template_parameters->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'comment' } );
$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;
$template_parameters->{projects} = project::get_with_dates($config);
$template_parameters->{controllers} = $config->{controllers};
$template_parameters->{allow} = $permissions;
$template_parameters->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'comment' } );
#fill and output template
template::process( 'print', $params->{template}, $template_parameters );
#fill and output template
template::process( 'print', $params->{template}, $template_parameters );
}
sub modify_comments {
my $request = shift;
my $results = shift;
my $request = shift;
my $results = shift;
my $language = $config::config->{date}->{language} || 'en';
for my $result (@$results) {
$result->{start_date_name} = time::date_format( $result->{created_at}, $language );
$result->{start_time_name} = time::time_format( $result->{created_at} );
$result->{ $result->{lock_status} } = 1;
$result->{ $result->{news_status} } = 1;
}
return $results;
my $language = $config::config->{date}->{language} || 'en';
for my $result (@$results) {
$result->{start_date_name} = time::date_format( $result->{created_at}, $language );
$result->{start_time_name} = time::time_format( $result->{created_at} );
$result->{ $result->{lock_status} } = 1;
$result->{ $result->{news_status} } = 1;
}
return $results;
}
sub setLock {
my $config = shift;
my $request = shift;
my $config = shift;
my $request = shift;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{update_comment_status_lock} == 1 ) {
uac::permissions_denied('update_comment_status_lock');
return;
}
unless ( $permissions->{update_comment_status_lock} == 1 ) {
uac::permissions_denied('update_comment_status_lock');
return;
}
my $comment = $params->{comment};
$comment->{id} = $comment->{comment_id};
if ( $comment->{id} eq '' ) {
return;
}
my $comment = $params->{comment};
$comment->{id} = $comment->{comment_id};
if ( $comment->{id} eq '' ) {
return;
}
#todo change set_news_status to lock_status in comment module
$comment->{set_lock_status} = $comment->{lockStatus};
$comment->{set_lock_status} = 'blocked' unless $comment->{set_lock_status} eq 'show';
#todo change set_news_status to lock_status in comment module
$comment->{set_lock_status} = $comment->{lockStatus};
$comment->{set_lock_status} = 'blocked' unless $comment->{set_lock_status} eq 'show';
$config->{access}->{write} = 1;
my $dbh = db::connect($config);
print STDERR "setLock " . Dumper($comment);
comments::set_lock_status( $dbh, $config, $comment );
print "done\n";
$config->{access}->{write} = 1;
my $dbh = db::connect($config);
print STDERR "setLock " . Dumper($comment);
comments::set_lock_status( $dbh, $config, $comment );
print "done\n";
}
sub setRead {
my $config = shift;
my $request = shift;
my $config = shift;
my $request = shift;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{update_comment_status_read} == 1 ) {
uac::permissions_denied('update_comment_status_read');
return;
}
unless ( $permissions->{update_comment_status_read} == 1 ) {
uac::permissions_denied('update_comment_status_read');
return;
}
$config->{access}->{write} = 1;
my $dbh = db::connect($config);
$config->{access}->{write} = 1;
my $dbh = db::connect($config);
my $comment = $params->{comment};
$comment->{id} = $comment->{comment_id};
if ( $comment->{id} eq '' ) {
return;
}
my $comment = $params->{comment};
$comment->{id} = $comment->{comment_id};
if ( $comment->{id} eq '' ) {
return;
}
#todo change set_news_status to read_status in comment module
$comment->{set_news_status} = $comment->{readStatus};
$comment->{set_news_status} = 'received' unless $comment->{set_news_status} eq 'unread';
#todo change set_news_status to read_status in comment module
$comment->{set_news_status} = $comment->{readStatus};
$comment->{set_news_status} = 'received' unless $comment->{set_news_status} eq 'unread';
print STDERR "setRead " . Dumper($comment);
comments::set_news_status( $dbh, $config, $comment );
print "done\n";
print STDERR "setRead " . Dumper($comment);
comments::set_news_status( $dbh, $config, $comment );
print "done\n";
}
sub check_params {
my $params = shift;
my $params = shift;
my $checked = {};
my $checked = {};
#actions
#actions
if ( defined $params->{action} ) {
if ( $params->{action} =~ /^(setLock|setRead|showComment)$/ ) {
$checked->{action} = $params->{action};
}
}
if ( defined $params->{action} ) {
if ( $params->{action} =~ /^(setLock|setRead|showComment)$/ ) {
$checked->{action} = $params->{action};
}
}
#template
my $template = '';
if ( defined $checked->{action} ) {
$template = template::check( $params->{template}, 'edit_comment' ) if $checked->{action} eq 'showComment';
} else {
$template = template::check( $params->{template}, 'comments' );
}
$checked->{template} = $template;
#template
my $template = '';
if ( defined $checked->{action} ) {
$template = template::check( $params->{template}, 'edit_comment' ) if $checked->{action} eq 'showComment';
} else {
$template = template::check( $params->{template}, 'comments' );
}
$checked->{template} = $template;
#numeric values
for my $param ( 'project_id', 'studio_id', 'default_studio_id' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
$checked->{$param} = $params->{$param};
}
}
if ( defined $checked->{studio_id} ) {
$checked->{default_studio_id} = $checked->{studio_id};
} else {
$checked->{studio_id} = -1;
}
#numeric values
for my $param ( 'project_id', 'studio_id', 'default_studio_id' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
$checked->{$param} = $params->{$param};
}
}
if ( defined $checked->{studio_id} ) {
$checked->{default_studio_id} = $checked->{studio_id};
} else {
$checked->{studio_id} = -1;
}
my $comment = {};
my $comment = {};
for my $key ('readStatus') {
my $value = $params->{$key};
$comment->{$key} = $value if ( defined $value ) && ( $value =~ /^(received|unread)$/ );
}
for my $key ('readStatus') {
my $value = $params->{$key};
$comment->{$key} = $value if ( defined $value ) && ( $value =~ /^(received|unread)$/ );
}
for my $key ('lockStatus') {
my $value = $params->{$key};
$comment->{$key} = $value if ( defined $value ) && ( $value =~ /^(blocked|show)$/ );
}
for my $key ('lockStatus') {
my $value = $params->{$key};
$comment->{$key} = $value if ( defined $value ) && ( $value =~ /^(blocked|show)$/ );
}
$comment->{event_start} = time::check_date( $params->{event_start} ) || '';
$comment->{from} = time::check_date( $params->{from} ) || '';
$comment->{till} = time::check_date( $params->{till} ) || '';
$comment->{event_start} = time::check_date( $params->{event_start} ) || '';
$comment->{from} = time::check_date( $params->{from} ) || '';
$comment->{till} = time::check_date( $params->{till} ) || '';
my $event_id = $params->{event_id} || '';
if ( $event_id =~ /^(\d+)$/ ) {
$comment->{event_id} = $1;
} else {
my $event_id = $params->{event_id} || '';
if ( $event_id =~ /^(\d+)$/ ) {
$comment->{event_id} = $1;
} else {
# error('invalid event_id');
}
$comment->{event_id} = '' unless defined $comment->{event_id};
# error('invalid event_id');
}
$comment->{event_id} = '' unless defined $comment->{event_id};
my $id = $params->{comment_id} || '';
if ( $id =~ /^(\d+)$/ ) {
$comment->{comment_id} = $1;
}
$comment->{comment_id} = '' unless defined $comment->{comment_id};
my $id = $params->{comment_id} || '';
if ( $id =~ /^(\d+)$/ ) {
$comment->{comment_id} = $1;
}
$comment->{comment_id} = '' unless defined $comment->{comment_id};
my $age = $params->{age} || '';
if ( $age =~ /^(\d+)$/ ) {
$comment->{age} = $1;
}
$comment->{age} = '365' unless defined $comment->{age};
my $age = $params->{age} || '';
if ( $age =~ /^(\d+)$/ ) {
$comment->{age} = $1;
}
$comment->{age} = '365' unless defined $comment->{age};
my $search = $params->{search} || '';
if ( ( defined $search ) && ( $search ne '' ) ) {
$search = substr( $search, 0, 100 );
$search =~ s/^\s+//gi;
$search =~ s/\s+$//gi;
$search =~ s/\-\-//gi;
$search =~ s/\;//gi;
$checked->{search} = $search if $search ne '';
}
$checked->{search} = '' unless defined $checked->{search};
$checked->{comment} = $comment;
my $search = $params->{search} || '';
if ( ( defined $search ) && ( $search ne '' ) ) {
$search = substr( $search, 0, 100 );
$search =~ s/^\s+//gi;
$search =~ s/\s+$//gi;
$search =~ s/\-\-//gi;
$search =~ s/\;//gi;
$checked->{search} = $search if $search ne '';
}
$checked->{search} = '' unless defined $checked->{search};
$checked->{comment} = $comment;
return $checked;
return $checked;
}

View File

@@ -373,7 +373,7 @@ sub getJson {
}
);
if ( @$series == 1 ) {
if ( scalar @$series == 1 ) {
my $serie = $series->[0];
$event->{has_single_events} = $serie->{has_single_events};
if ( $event->{has_single_events} eq '1' ) {

View File

@@ -71,7 +71,7 @@ return unless defined uac::check( $config, $params, $user_presets );
my $local_media_dir = $config->{locations}->{local_media_dir};
my $local_media_url = $config->{locations}->{local_media_url};
log::error( $config, 'cannot locate media dir' . $local_media_dir ) unless -e $local_media_dir;
log::error( $config, 'cannot locate media dir ' . $local_media_dir ) unless -e $local_media_dir;
uac::permissions_denied('reading from local media dir') unless -r $local_media_dir;
uac::permissions_denied('writing to local media dir') unless -w $local_media_dir;
@@ -179,7 +179,7 @@ sub show_image {
);
#print STDERR Dumper($imagesByNames);
$selectedImage = $imagesByNames->[0] if scalar(@$imagesByNames) > 0;
$selectedImage = $imagesByNames->[0] if scalar @$imagesByNames > 0;
}
my $finalResults = [];

View File

@@ -350,6 +350,7 @@ sub process_image {
#$image->Normalize();
$image->Write( 'jpg:' . $image_path );
#write thumb
my $thumb = $image;
$thumb->Trim2Square;

View File

@@ -137,7 +137,7 @@ sub save_project {
return;
}
my $projects = project::get( $config, { name => $entry->{name} } );
if ( @$projects > 0 ) {
if ( scalar @$projects > 0 ) {
uac::print_error("project with name '$entry->{name}' already exists");
return;
}

View File

@@ -334,12 +334,6 @@ sub show_roles {
#add permission rows
$columns = sort_columns($columns);
# print '<pre>';
# for my $key (@$columns){
# printf (" %-40s => '',\n", "'".$key."'");
# }
# print '</pre>';
for my $key (@$columns) {
next
if ( $key eq 'level'

View File

@@ -361,9 +361,6 @@ sub save_series {
}
);
#print STDERR "done\n";
#my @series_ids=@$series_ids;
if ( $params->{action} eq 'create' ) {
unless ( $permissions->{create_series} == 1 ) {

View File

@@ -18,7 +18,6 @@ use studios;
use series;
use template;
use playout;
binmode STDOUT, ":utf8";
my $r = shift;

5
website/agenda/planung/showImage.cgi Normal file → Executable file
View File

@@ -72,6 +72,11 @@ sub showImage {
}
my $filename = images::getInternalPath( $config, $params );
unless ( defined $filename ) {
uac::permissions_denied("could not find path");
return;
}
unless ( -e $filename ) {
uac::permissions_denied("read $filename");
return;

View File

@@ -106,7 +106,7 @@ sub delete_studio {
}
);
unless ( @$studio_assignments == 0 ) {
unless ( scalar @$studio_assignments == 0 ) {
uac::print_info("Studio unassigned from project");
uac::print_warn("Studio is assigned to other projects, so it will not be deleted");
return undef;
@@ -141,7 +141,7 @@ sub save_studio {
studios::update( $config, $entry );
} else {
my $studios = studios::get( $config, { name => $entry->{name} } );
if ( @$studios > 0 ) {
if ( scalar @$studios > 0 ) {
uac::print_error("studio with name '$entry->{name}' already exists");
return;
}
@@ -166,7 +166,7 @@ sub save_studio {
has_single_events => 1
}
);
if ( @$single_series == 0 ) {
if ( scalar @$single_series == 0 ) {
series::insert(
$config,
{

View File

@@ -51,10 +51,6 @@
<div> <a href="user_settings.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><TMPL_VAR .loc.profile></a> </div>
<TMPL_IF .allow.is_admin>
<div> <a href="error_log.cgi"><TMPL_VAR .loc.errors></a> </div>
</TMPL_IF>
<div> <a href="help.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><TMPL_VAR .loc.help></a> </div>
<select id="studio_id" name="studio_id" onchange="set_studio($(this).val())">

View File

@@ -56,8 +56,8 @@ my $dbh = db::connect($config);
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} );
$template_parameters->{use_client_cache} = $config->{cache}->{use_client_cache} if ( $config->{cache}->{use_client_cache} );
$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} ;
#output template
my $template = $params->{template};
@@ -103,9 +103,9 @@ sub getProjects {
$project->{js_name} =~ s/\_+/\_/g;
#mark last series_name entry of all non empty projects
if ( ( defined $series_names ) && ( @$series_names > 0 ) ) {
if ( ( defined $series_names ) && ( scalar @$series_names > 0 ) ) {
$series_names->[-1]->{last} = 1;
$prev_series_names->[-1]->{last} = 0 if ( ( defined $prev_series_names ) && ( @$prev_series_names > 0 ) );
$prev_series_names->[-1]->{last} = 0 if ( defined $prev_series_names ) && ( sclar @$prev_series_names > 0 ) ;
$prev_series_names = $series_names;
}
push @$results, $project;