kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source 
optimize imports
reformat source code
remove unused cpu and memory log functionality
This commit is contained in:
Milan
2018-08-29 00:10:15 +02:00
parent c37c71f29e
commit 05b1251c1a
81 changed files with 9242 additions and 9962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/agenda/add_comment.cgi
View File

@@ -37,7 +37,6 @@ my $request={
config => $config,
};
$params=$request->{params}->{checked};
log::init($request);
print $cgi->header('text/plain')."\n";

6
website/agenda/aggregate.cgi
View File

@@ -55,10 +55,8 @@ if ( $0 =~ /aggregate.*?\.cgi$/ ) {
},
};
$params = $request->{params}->{checked};
#print STDERR Dumper($params);
my $mem = 0;
log::init($request);
#get result from cache
my $cache = aggregator::get_cache( $config, $request );
@@ -159,18 +157,14 @@ if ( $0 =~ /aggregate.*?\.cgi$/ ) {
print $output_header;
print $content;
# $r->print("done");
if ( $config->{cache}->{use_cache} eq '1' ) {
$cache->{content} = $content;
log::write( $config, 'cache_file', $cache->{filename} ) if ($debug);
cache::save($cache);
}
# $config=undef;
$content = undef;
$cache = undef;
log::mem( $config, 'aggregate done', $mem ) if ( $mem_debug > 0 );
}
sub load_file {

2
website/agenda/cal.cgi
View File

@@ -34,8 +34,6 @@ if ( $0 =~ /cal.*?\.cgi$/ ) {
};
$params = $request->{params}->{checked};
log::init($request);
my $out = '';
calendar::get_cached_or_render( $out, $config, $request );
print $out. "\n";

4
website/agenda/category.cgi
View File

@@ -2,7 +2,6 @@
use strict;
use warnings;
use Data::Dumper;
use CGI qw(header param Vars);
$CGI::POST_MAX = 1000;
@@ -33,9 +32,6 @@ my $request = {
checked => check_params( $config, $params ),
},
};
log::init($request);
$params = $request->{params}->{checked};
my $cache = {};

3
website/agenda/comments.cgi
View File

@@ -2,7 +2,6 @@
use warnings "all";
use strict;
use CGI qw(header param Vars);
$CGI::POST_MAX = 1000;
$CGI::DISABLE_UPLOADS = 1;
@@ -17,7 +16,6 @@ use markup();
use time();
use cache();
use log();
my $r = shift;
( my $cgi, my $params, my $error ) = params::get($r);
@@ -34,7 +32,6 @@ if ( $0 =~ /comments.*?\.cgi$/ ) {
checked => comments::check_params( $config, $params ),
},
};
log::init($request);
my $output = '';
comments::get_cached_or_render( $output, $config, $request, 'filter_locked' );

3
website/agenda/events.cgi
View File

@@ -45,9 +45,6 @@ if ( $0 =~ /events.*?\.cgi$/ ) {
},
};
#events::init($request);
log::init($request);
my $output = '';
events::get_cached_or_render( $output, $config, $request );
print $output. "\n";

1
website/agenda/planung/assign_series.cgi
View File

@@ -58,7 +58,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};

9
website/agenda/planung/assignments.cgi
View File

@@ -58,7 +58,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
@@ -224,10 +223,10 @@ sub assign_events {
checked => events::check_params(
$config,
{
event_id => $entry->{event_id},
template => 'no',
limit => 1,
archive => 'all',
event_id => $entry->{event_id},
template => 'no',
limit => 1,
archive => 'all',
}
)
},

7
website/agenda/planung/audio_recordings.cgi
View File

@@ -81,11 +81,7 @@ my $request = {
},
};
#delete $params->{presets};
#print Dumper($request->{params}->{checked});
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
@@ -534,13 +530,12 @@ sub getEventDuration{
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;
}
sub check_params {
my $params = shift;

92
website/agenda/planung/calendar.cgi
View File

@@ -6,7 +6,6 @@ use Data::Dumper;
use URI::Escape();
use Encode();
use utf8();
use params();
use config();
use log();
@@ -81,7 +80,6 @@ my $request = {
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
@@ -245,8 +243,8 @@ sub showCalendar {
delete $options->{till_date} if ( $params->{list} == 1 );
delete $options->{date_range_include} if ( $params->{list} == 1 );
}
$options->{draft}=0 unless $params->{list}==1;
$options->{draft} = 0 unless $params->{list} == 1;
#get events sorted by date
$events = getSeriesEvents( $config, $request, $options, $params );
@@ -397,11 +395,12 @@ sub showCalendar {
$date->{title} .= ( $date->{channels} || '' ) . ' channels<br>' if defined $date->{channels};
$date->{title} .= int( ( $date->{'stream_size'} || '0' ) / ( 1024 * 1024 ) ) . 'MB<br>' if defined $date->{'stream_size'};
$date->{title} .= $format if defined $format;
$date->{title} .= '<b>library</b>: ' . ( $date->{writing_library} || '' ) . '<br>' if defined $date->{'writing_library'};
$date->{title} .= '<b>path</b>: ' . ( $date->{file} || '' ) . '<br>' if defined $date->{file};
$date->{title} .= '<b>updated_at</b>: ' . ( $date->{updated_at} || '' ) . '<br>' if defined $date->{updated_at};
$date->{title} .= '<b>modified_at</b>: ' . ( $date->{modified_at} || '' ) . '<br>' if defined $date->{modified_at};
#print STDERR Dumper($date) if $date->{file}=~/180503/;
$date->{title} .= '<b>library</b>: ' . ( $date->{writing_library} || '' ) . '<br>' if defined $date->{'writing_library'};
$date->{title} .= '<b>path</b>: ' . ( $date->{file} || '' ) . '<br>' if defined $date->{file};
$date->{title} .= '<b>updated_at</b>: ' . ( $date->{updated_at} || '' ) . '<br>' if defined $date->{updated_at};
$date->{title} .= '<b>modified_at</b>: ' . ( $date->{modified_at} || '' ) . '<br>' if defined $date->{modified_at};
#print STDERR Dumper($date) if $date->{file}=~/180503/;
#$date->{title}.= '<b>rms_image</b>: ' .($date->{rms_image}||'').'<br>' if defined $date->{rms_image};
$date->{rms_image} = URI::Escape::uri_unescape( $date->{rms_image} ) if defined $date->{rms_image};
@@ -426,8 +425,8 @@ sub showCalendar {
$events_by_start->{ $date->{start} }->{duration} = $date->{duration} || 0;
$events_by_start->{ $date->{start} }->{rms_left} = $date->{rms_left} || 0;
$events_by_start->{ $date->{start} }->{rms_right} = $date->{rms_right} || 0;
$events_by_start->{ $date->{start} }->{playout_modified_at} = $date->{modified_at};
$events_by_start->{ $date->{start} }->{playout_updated_at} = $date->{updated_at} ;
$events_by_start->{ $date->{start} }->{playout_modified_at} = $date->{modified_at};
$events_by_start->{ $date->{start} }->{playout_updated_at} = $date->{updated_at};
}
push @$events, $date;
}
@@ -490,19 +489,21 @@ sub showCalendar {
# calculate positions and find schedule errors (depending on position)
for my $date ( sort ( keys %$events_by_day ) ) {
my $events = $events_by_day->{$date} ;
my $events = $events_by_day->{$date};
calc_positions( $events, $cal_options );
find_errors($events);
}
for my $event (@$events){
next unless defined $event->{uploaded_at};
#print STDERR "uploadAt=$event->{uploaded_at}, playoutModified:$event->{playout_modified_at}, playoutUpdatedAt:$event->{playout_updated_at}\n";
next if (defined $event->{playout_updated_at}) && ( $event->{uploaded_at} lt $event->{playout_updated_at} );
#print STDERR Dumper($event);
#$event->{upload} ='pending' ;
#$event->{title}.='<br>pending';
}
for my $event (@$events) {
next unless defined $event->{uploaded_at};
#print STDERR "uploadAt=$event->{uploaded_at}, playoutModified:$event->{playout_modified_at}, playoutUpdatedAt:$event->{playout_updated_at}\n";
next if ( defined $event->{playout_updated_at} ) && ( $event->{uploaded_at} lt $event->{playout_updated_at} );
#print STDERR Dumper($event);
#$event->{upload} ='pending' ;
#$event->{title}.='<br>pending';
}
if ( $params->{list} == 1 ) {
showEventList( $config, $permissions, $params, $events_by_day );
@@ -557,7 +558,7 @@ sub formatDuration {
my $duration = shift;
return '' unless defined $duration;
return '' if $duration eq '';
my $result = int( ( $duration + 3600 ) * 10 + 0.5) % 600;
my $result = int( ( $duration + 3600 ) * 10 + 0.5 ) % 600;
my $class = "ok";
$class = "warn" if $result > 1;
$class = "error" if $result > 10;
@@ -788,8 +789,8 @@ sub showEventList {
$event->{user_title} ||= '';
$event->{episode} ||= '';
$event->{rerun} ||= '';
$event->{draft} ||= '';
$id ||= '';
$event->{draft} ||= '';
$id ||= '';
$class ||= '';
my $archived = $event->{archived} || '-';
@@ -807,10 +808,9 @@ sub showEventList {
$rerun = " [" . markup::base26( $event->{recurrence_count} + 1 ) . "]"
if ( defined $event->{recurrence_count} ) && ( $event->{recurrence_count} ne '' ) && ( $event->{recurrence_count} > 0 );
my $draft = $event->{draft} || '0';
$draft='-' if $draft eq '0';
$draft='x' if $draft eq '1';
my $draft = $event->{draft} || '0';
$draft = '-' if $draft eq '0';
$draft = 'x' if $draft eq '1';
my $title = $event->{title};
$title .= ': ' . $event->{user_title} if $event->{user_title} ne '';
@@ -1320,8 +1320,7 @@ sub addEventsToSeries {
<tr><td></td>
<td>
<button type="submit" name="action" value="assign_event">}
. $params->{loc}->{button_assign_event_series}
. q{</button>
. $params->{loc}->{button_assign_event_series} . q{</button>
</td>
</tr>
</table>
@@ -1403,7 +1402,7 @@ sub print_event {
$height = '';
}
# my $date = $event->{origStart} || $event->{start} || '';
# my $date = $event->{origStart} || $event->{start} || '';
my $content = $event->{content} || '';
if ( $class =~ /schedule/ ) {
@@ -1417,26 +1416,26 @@ sub print_event {
$attr .= ' start="' . $event->{start} . '"' if defined $event->{start};
}
if (defined $event->{upload}){
$content.='<br>uploading <progress max="10" ></progress> ';
}
if ( defined $event->{upload} ) {
$content .= '<br>uploading <progress max="10" ></progress> ';
}
if ($showIcons) {
$content = '<div class="text">' . $content . '</div><div class="icons"></div>';
}
my $time='';
$time= qq{ time="$event->{time}"} if $class=~m/time/;
my $time = '';
$time = qq{ time="$event->{time}"} if $class =~ m/time/;
my $date='';
$date= qq{ date="$event->{date}"} if $class=~m/date/;
my $date = '';
$date = qq{ date="$event->{date}"} if $class =~ m/date/;
my $line= q{<div } . qq{class="$class" id="$id"};
$line.= qq{ style="}. $height . q{top:}. $ystart . q{px;"};
$line.= $time . $date . qq{ $attr} ;
$line.= qq{>$content</div>} ;
$line.= "\n";
return $line;
my $line = q{<div } . qq{class="$class" id="$id"};
$line .= qq{ style="} . $height . q{top:} . $ystart . q{px;"};
$line .= $time . $date . qq{ $attr};
$line .= qq{>$content</div>};
$line .= "\n";
return $line;
}
sub getFrequency {
@@ -1484,7 +1483,7 @@ sub find_errors {
next if defined $event->{grid};
next if defined $event->{work};
next if defined $event->{play};
next if (defined $event->{draft}) && ($event->{draft} == 1);
next if ( defined $event->{draft} ) && ( $event->{draft} == 1 );
next unless defined $event->{ystart};
next unless defined $event->{yend};
$event->{check_errors} = 1;
@@ -1754,7 +1753,7 @@ sub getSeriesEvents {
#get events (directly from database to get the ones, not assigned, yet)
delete $options->{studio_id};
delete $options->{project_id};
$options->{recordings}=1;
$options->{recordings} = 1;
my $request2 = {
params => {
@@ -1764,7 +1763,7 @@ sub getSeriesEvents {
permissions => $request->{permissions}
};
$request2->{params}->{checked}->{published} = 'all';
$request2->{params}->{checked}->{draft} = '1' if $params->{list}==1;
$request2->{params}->{checked}->{draft} = '1' if $params->{list} == 1;
#delete $request2->{params}->{checked}->{locations_to_exclude}
# if ( ( $params->{studio_id} == -1 ) && ( defined $request2->{params}->{checked}->{locations_to_exclude} ) );
@@ -1883,4 +1882,3 @@ sub check_params {
return $checked;
}

1
website/agenda/planung/comment.cgi
View File

@@ -58,7 +58,6 @@ my $request = {
#set user at params->presets->user
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};

120
website/agenda/planung/create_events.cgi
View File

@@ -52,7 +52,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
@@ -75,13 +74,13 @@ unless ( $permissions->{create_event_from_schedule} == 1 ) {
return;
}
if ( $params->{action} eq 'create_events') {
create_events( $config, $request );
}else{
show_events( $config, $request );
if ( $params->{action} eq 'create_events' ) {
create_events( $config, $request );
} else {
show_events( $config, $request );
}
sub show_events{
sub show_events {
my $config = shift;
my $request = shift;
@@ -91,11 +90,11 @@ sub show_events{
uac::permissions_denied('assign_series_events');
return;
}
template::process( 'print', $params->{template}, $params );
template::process( 'print', $params->{template}, $params );
}
sub create_events{
sub create_events {
my $config = shift;
my $request = shift;
@@ -106,56 +105,58 @@ sub create_events{
return;
}
print STDERR "create events\n";
print STDERR "create events\n";
my $project_id = $params->{project_id};
my $studio_id = $params->{studio_id};
my $from_date = $params->{from_date};
my $till_date = $params->{till_date};
my $duration = $params->{duration};
my $project_id = $params->{project_id};
my $studio_id = $params->{studio_id};
my $from_date = $params->{from_date};
my $till_date = $params->{till_date};
my $duration = $params->{duration};
$from_date = time::time_to_datetime();
if ($from_date=~/(\d\d\d\d\-\d\d\-\d\d \d\d)/){
$from_date = $1.':00';
}
$till_date = time::add_days_to_datetime($from_date, $duration);
if ($from_date=~/(\d\d\d\d\-\d\d\-\d\d)/){
$from_date = $1;
}
if ($till_date=~/(\d\d\d\d\-\d\d\-\d\d)/){
$till_date = $1;
}
$params->{from_date}=$from_date;
$params->{till_date}=$till_date;
$from_date = time::time_to_datetime();
if ( $from_date =~ /(\d\d\d\d\-\d\d\-\d\d \d\d)/ ) {
$from_date = $1 . ':00';
}
$till_date = time::add_days_to_datetime( $from_date, $duration );
if ( $from_date =~ /(\d\d\d\d\-\d\d\-\d\d)/ ) {
$from_date = $1;
}
if ( $till_date =~ /(\d\d\d\d\-\d\d\-\d\d)/ ) {
$till_date = $1;
}
$params->{from_date} = $from_date;
$params->{till_date} = $till_date;
print STDERR "create events from $from_date to $till_date\n";
print STDERR "create events from $from_date to $till_date\n";
my $dates = series_dates::getDatesWithoutEvent(
$config, {
project_id => $project_id,
studio_id => $studio_id,
from => $from_date,
till => $till_date
}
);
print STDERR "<pre>found ".(scalar @$dates)." dates\n";
my $events=[];
for my $date (@$dates){
#print STDERR $date->{start}."\n";
push @$events, createEvent($config, $request, $date);
}
$params->{created_events} = $events;
$params->{created_total} = scalar(@$events);
template::process( 'print', $params->{template}, $params );
my $dates = series_dates::getDatesWithoutEvent(
$config,
{
project_id => $project_id,
studio_id => $studio_id,
from => $from_date,
till => $till_date
}
);
print STDERR "<pre>found " . ( scalar @$dates ) . " dates\n";
my $events = [];
for my $date (@$dates) {
#print STDERR $date->{start}."\n";
push @$events, createEvent( $config, $request, $date );
}
$params->{created_events} = $events;
$params->{created_total} = scalar(@$events);
template::process( 'print', $params->{template}, $params );
}
sub createEvent{
my $config = shift;
my $request = shift;
my $date = shift;
sub createEvent {
my $config = shift;
my $request = shift;
my $date = shift;
my $permissions = $request->{permissions};
my $user = $request->{user};
my $user = $request->{user};
$date->{show_new_event_from_schedule} = 1;
unless ( $permissions->{create_event_from_schedule} == 1 ) {
@@ -163,15 +164,15 @@ sub createEvent{
return;
}
$date->{start_date} = $date->{start};
my $event = eventOps::getNewEvent($config, $date, 'show_new_event_from_schedule');
$date->{start_date} = $date->{start};
my $event = eventOps::getNewEvent( $config, $date, 'show_new_event_from_schedule' );
return undef unless defined $event;
return undef unless defined $event;
$event->{start_date} = $event->{start};
eventOps::createEvent($request, $event, 'create_event_from_schedule');
print STDERR Dumper($date);
return $event;
$event->{start_date} = $event->{start};
eventOps::createEvent( $request, $event, 'create_event_from_schedule' );
print STDERR Dumper($date);
return $event;
}
@@ -195,7 +196,7 @@ sub check_params {
}
#numeric values
$checked->{exclude} = 0;
$checked->{exclude} = 0;
$checked->{duration} = 28;
for my $param ( 'id', 'project_id', 'studio_id', 'duration' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
@@ -214,4 +215,3 @@ sub check_params {
return $checked;
}

1
website/agenda/planung/error_log.cgi
View File

@@ -34,7 +34,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
#process header
my $headerParams = uac::set_template_permissions( $request->{permissions}, $params );

62
website/agenda/planung/event.cgi
View File

@@ -4,7 +4,7 @@ use strict;
use warnings;
no warnings 'redefine';
use URI::Escape();
#use URI::Escape();
use Encode();
use Data::Dumper;
use MIME::Base64();
@@ -68,7 +68,6 @@ my $request = {
#set user at params->presets->user
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
@@ -169,6 +168,7 @@ sub show_event {
unless ( defined $event ) {
uac::print_error("event not found");
}
#print STDERR "show:".Dumper($event->{draft});
#print STDERR "show event".Dumper($event);
@@ -201,15 +201,16 @@ sub show_event {
#project_id => $params->{project_id},
#studio_id => $params->{studio_id},
#series_id => $params->{series_id},
event_id => $params->{source_event_id},
draft => 0,
event_id => $params->{source_event_id},
draft => 0,
}
);
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', 'archive_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'
)
{
$event->{$attr} = $event2->{$attr};
@@ -222,7 +223,7 @@ sub show_event {
$event->{rerun} = 1 if ( $event->{rerun} =~ /a-z/ );
$event->{series_id} = $params->{series_id};
$event->{duration} = events::get_duration( $config, $event );
$event->{duration} = events::get_duration( $config, $event );
$event->{durations} = \@durations;
if ( defined $event->{duration} ) {
for my $duration ( @{ $event->{durations} } ) {
@@ -231,7 +232,7 @@ sub show_event {
}
$event->{start} =~ s/(\d\d:\d\d)\:\d\d/$1/;
$event->{end} =~ s/(\d\d:\d\d)\:\d\d/$1/;
# overwrite event with old one
#my $series_events=get_series_events($config,{
# project_id => $params->{project_id},
@@ -421,7 +422,7 @@ sub show_new_event {
return 1;
}
my $event = eventOps::getNewEvent($config, $params, $params->{action});
my $event = eventOps::getNewEvent( $config, $params, $params->{action} );
#copy event to template params
for my $key ( keys %$event ) {
@@ -559,24 +560,26 @@ sub save_event {
my $found = 0;
#content fields
for my $key ( 'content', 'topic', 'title', 'excerpt', 'episode',
'image', 'series_image', 'image_label', 'series_image_label',
'podcast_url', 'archive_url' ) {
for my $key (
'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 };
if ( $permissions->{ 'update_event_field_' . $key } eq '1' ) {
next unless defined $params->{$key};
next unless defined $params->{$key};
$entry->{$key} = $params->{$key};
$found++;
}
}
#print STDERR "event to update1: ".Dumper($entry);
#print STDERR "event to update1: ".Dumper($entry);
#user extension fields
for my $key ( 'title', 'excerpt' ) {
next unless defined $permissions->{ 'update_event_field_' . $key . '_extension' };
if ( $permissions->{ 'update_event_field_' . $key . '_extension' } eq '1' ) {
next unless defined $params->{ 'user_' . $key };
next unless defined $params->{ 'user_' . $key };
$entry->{ 'user_' . $key } = $params->{ 'user_' . $key };
$found++;
}
@@ -607,10 +610,11 @@ sub save_event {
uac::print_error("event not found");
return;
}
$entry->{image} = images::normalizeName($entry->{image});
$entry->{series_image} = images::normalizeName($entry->{series_image});
#print STDERR "event to update2: ".Dumper($entry);
$entry->{image} = images::normalizeName( $entry->{image} );
$entry->{series_image} = images::normalizeName( $entry->{series_image} );
#print STDERR "event to update2: ".Dumper($entry);
$config->{access}->{write} = 1;
@@ -669,10 +673,10 @@ sub create_event {
my $config = shift;
my $request = shift;
my $params = $request->{params}->{checked};
my $event = $request->{params}->{checked};
my $action = $params->{action};
return eventOps::createEvent($request, $event, $action);
my $params = $request->{params}->{checked};
my $event = $request->{params}->{checked};
my $action = $params->{action};
return eventOps::createEvent( $request, $event, $action );
}
@@ -709,7 +713,8 @@ sub download {
event_id => $params->{event_id},
template => 'no',
limit => 1,
#no_exclude => 1
#no_exclude => 1
}
)
},
@@ -738,7 +743,7 @@ sub download {
if ( @files > 0 ) {
my $file = $files[0];
my $key = int( rand(99999999999999999) );
$key = encode_base64($key);
$key = MIME::Base64::encode_base64($key);
$key =~ s/[^a-zA-Z0-9]//g;
#decode filename
@@ -810,14 +815,15 @@ sub check_params {
for my $param ( 'live', 'published', 'playout', 'archived', 'rerun', 'draft', 'disable_event_sync', 'get_rerun' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /([01])/ ) ) {
$checked->{$param} = $1;
# print STDERR "check $param = $1\n";
}
}
#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'
'series_name', 'title', 'excerpt', 'content', 'topic', 'program', 'category', 'image',
'series_image', 'user_content', 'user_title', 'user_excerpt', 'podcast_url', 'archive_url'
)
{
if ( defined $params->{$param} ) {

1
website/agenda/planung/event_history.cgi
View File

@@ -51,7 +51,6 @@ my $request = {
#set user at params->presets->user
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};

1
website/agenda/planung/help.cgi
View File

@@ -50,7 +50,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};

94
website/agenda/planung/image.cgi
View File

@@ -8,7 +8,7 @@ use Data::Dumper;
use File::stat();
use Time::localtime();
use CGI::Simple;# qw(header param Vars escapeHTML uploadInfo cgi_error);
use CGI::Simple();
use URI::Escape();
use time();
@@ -60,7 +60,6 @@ my $request = {
}
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#show header
@@ -72,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;
@@ -111,20 +110,23 @@ sub show_image {
$config->{access}->{write} = 0;
my $dbh = db::connect( $config, undef );
my $projectId = $params->{project_id};
my $studioId = $params->{studio_id};
my $projectId = $params->{project_id};
my $studioId = $params->{studio_id};
my $selectedFilename = $params->{filename} || '';
my $filenames = {};
my $results = [];
my $filenames = {};
my $results = [];
# add images from series
if ( defined $params->{series_id} ) {
my $seriesImages = series::get_images( $config, {
project_id => $projectId,
studio_id => $studioId,
series_id => $params->{series_id}
} );
my $seriesImages = series::get_images(
$config,
{
project_id => $projectId,
studio_id => $studioId,
series_id => $params->{series_id}
}
);
for my $image (@$seriesImages) {
my $filename = $image->{filename};
@@ -135,16 +137,19 @@ sub show_image {
}
#load images matching by search
if ( $params->{search}=~/\S/ ) {
if ( $params->{search} =~ /\S/ ) {
#remove filename from search
#delete $params->{filename};
#delete $params->{series_id};
my $searchImages = images::get( $config, {
project_id => $projectId,
studio_id => $studioId,
search => $params->{search}
} );
my $searchImages = images::get(
$config,
{
project_id => $projectId,
studio_id => $studioId,
search => $params->{search}
}
);
for my $image (@$searchImages) {
my $filename = $image->{filename};
@@ -155,22 +160,27 @@ sub show_image {
}
#load selected image, if not already loaded
my $selectedImage=undef;
my $selectedImage = undef;
if ( $selectedFilename ne '' ) {
if ( defined $filenames->{$selectedFilename} ) {
$selectedImage = $filenames->{$selectedFilename};
} else {
#print STDERR "getByName:".Dumper($params);
#put selected image to the top
my $imagesByNames = images::get( $config, {
project_id => $projectId,
studio_id => $studioId,
filename => $selectedFilename
} );
my $imagesByNames = images::get(
$config,
{
project_id => $projectId,
studio_id => $studioId,
filename => $selectedFilename
}
);
#print STDERR Dumper($imagesByNames);
$selectedImage = $imagesByNames->[0] if scalar(@$imagesByNames) > 0;
}
$selectedImage = $imagesByNames->[0] if scalar(@$imagesByNames) > 0;
}
my $finalResults = [];
@@ -188,12 +198,12 @@ sub show_image {
$results = $finalResults;
}
if ( scalar @$results !=0 ) {
if ( $params->{template} =~ /edit/ ) {
my $result = $results->[0];
$result->{missing_licence}=1 if (! defined $result->{licence} ) || ( $result->{licence}!~/\S/);
$results = [ $result ] ;
}
if ( scalar @$results != 0 ) {
if ( $params->{template} =~ /edit/ ) {
my $result = $results->[0];
$result->{missing_licence} = 1 if ( !defined $result->{licence} ) || ( $result->{licence} !~ /\S/ );
$results = [$result];
}
$results = modify_results( $results, $permissions, $user, $local_media_url );
}
@@ -213,8 +223,9 @@ sub show_image {
# print STDERR
$template_params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'image' } );
$template_params= uac::set_template_permissions( $permissions, $template_params );
$template_params->{no_results}=1 if scalar @$results==0;
$template_params = uac::set_template_permissions( $permissions, $template_params );
$template_params->{no_results} = 1 if scalar @$results == 0;
#set global values for update and delete, per image values are evaluated later
$template_params->{allow}->{update_image} =
$template_params->{allow}->{update_image_own} || $template_params->{allow}->{seriesupdate_image_others};
@@ -252,8 +263,8 @@ sub save_image {
my $image = {};
$image->{filename} = $params->{save_image};
$image->{name} = $params->{update_name} if $params->{update_name} ne '' ;
$image->{description} = $params->{update_description} if $params->{update_description} ne '' ;
$image->{name} = $params->{update_name} if $params->{update_name} ne '';
$image->{description} = $params->{update_description} if $params->{update_description} ne '';
$image->{project_id} = $params->{project_id};
$image->{studio_id} = $params->{studio_id};
$image->{licence} = $params->{licence};
@@ -262,12 +273,13 @@ sub save_image {
$image->{name} = 'new' if $image->{name} eq '';
images::checkLicence($config, $image);
images::checkLicence( $config, $image );
$config->{access}->{write} = 1;
my $dbh = db::connect($config);
print STDERR "going to save\n";
#print STDERR Dumper($image);
my $entries = images::get(
@@ -290,8 +302,8 @@ sub save_image {
my $entry = $entries->[0];
if ( defined $entry ) {
images::update( $dbh, $image );
images::publish( $config, $image->{filename}) if (($image->{public}==1) && ($entry->{public}==0));
images::depublish($config, $image->{filename}) if (($image->{public}==0) && ($entry->{public}==1));
images::publish( $config, $image->{filename} ) if ( ( $image->{public} == 1 ) && ( $entry->{public} == 0 ) );
images::depublish( $config, $image->{filename} ) if ( ( $image->{public} == 0 ) && ( $entry->{public} == 1 ) );
} else {
$image->{created_by} = $user;
images::insert( $dbh, $image );
@@ -323,6 +335,7 @@ sub delete_image {
filename => $params->{delete_image},
};
my $result = images::delete( $dbh, $image );
#print STDERR "delete result=" . Dumper($result);
return;
@@ -437,7 +450,7 @@ sub check_params {
}
#checkboxes
for my $param ( 'public' ) {
for my $param ('public') {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /([01])/ ) ) {
$checked->{$param} = $1;
}
@@ -454,6 +467,7 @@ sub check_params {
$checked->{from} = time::check_date( $params->{from} );
$checked->{till} = time::check_date( $params->{till} );
#print STDERR 'checked:'.Dumper ($checked);
return $checked;

11
website/agenda/planung/imageUpload.cgi
View File

@@ -320,13 +320,13 @@ sub process_image {
my $md5_filename = shift;
my $content = shift;
my $upload_path = images::getInternalPath($config, {type=>'upload', filename=> $md5_filename . '.' . $extension});
my $thumb_path = images::getInternalPath($config, {type=>'thumbs', filename=> $md5_filename . '.jpg'});
my $icon_path = images::getInternalPath($config, {type=>'icons', filename=> $md5_filename . '.jpg'});
my $image_path = images::getInternalPath($config, {type=>'images', filename=> $md5_filename . '.jpg'});
my $upload_path = images::getInternalPath( $config, { type => 'upload', filename => $md5_filename . '.' . $extension } );
my $thumb_path = images::getInternalPath( $config, { type => 'thumbs', filename => $md5_filename . '.jpg' } );
my $icon_path = images::getInternalPath( $config, { type => 'icons', filename => $md5_filename . '.jpg' } );
my $image_path = images::getInternalPath( $config, { type => 'images', filename => $md5_filename . '.jpg' } );
#copy file to upload space
my $result=images::writeFile($upload_path, $content);
my $result = images::writeFile( $upload_path, $content );
return $result if defined $result->{error};
#write image
@@ -350,7 +350,6 @@ sub process_image {
#$image->Normalize();
$image->Write( 'jpg:' . $image_path );
#write thumb
my $thumb = $image;
$thumb->Trim2Square;

2
website/agenda/planung/localization.cgi
View File

@@ -34,7 +34,7 @@ $params = $request->{params}->{checked};
my $loc = localization::get( $config, { user => $user, file => $params->{usecase} } );
my $header = "Content-type:application/json; charset=UTF-8;\n\n";
$loc->{usecase} = $params->{usecase};
my $json = to_json( $loc, { pretty => 1 } );
my $json = JSON::to_json( $loc, { pretty => 1 } );
my @json_lines = ();
for my $line ( split /\n/, $json ) {

5
website/agenda/planung/notify_events.cgi
View File

@@ -56,12 +56,11 @@ my $request = {
#set user at params->presets->user
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#show header
unless ( params::isJson() || ( $params->{template}=~/\.txt/ ) ) {
unless ( params::isJson() || ( $params->{template} =~ /\.txt/ ) ) {
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 );
@@ -124,7 +123,7 @@ sub show_events {
$params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'notify_events' } );
template::process( 'print', $params->{template}, $params );
}
sub sendMail {

1
website/agenda/planung/playout.cgi
View File

@@ -63,7 +63,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};

1
website/agenda/planung/projects.cgi
View File

@@ -47,7 +47,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};

154
website/agenda/planung/requestPassword.cgi
View File

@@ -1,4 +1,4 @@
#! /usr/bin/perl -w
#! /usr/bin/perl -w
use warnings "all";
use strict;
@@ -30,99 +30,101 @@ print qq{<!DOCTYPE html>
<body>
};
if ( defined $params->{user}){
sendToken($config, $params);
return;
}else{
my $result=checkToken($config, $params);
return;
if ( defined $params->{user} ) {
sendToken( $config, $params );
return;
} else {
my $result = checkToken( $config, $params );
return;
}
sub sendToken{
my $config=shift;
my $params=shift;
my $entry = password_requests::sendToken($config, { user => $params->{user} });
if (defined $entry){
print "Please check you mails\n"
}else{
print "Sorry\n";
}
sub sendToken {
my $config = shift;
my $params = shift;
my $entry = password_requests::sendToken( $config, { user => $params->{user} } );
if ( defined $entry ) {
print "Please check you mails\n";
} else {
print "Sorry\n";
}
}
sub checkToken{
my $config=shift;
my $params=shift;
sub checkToken {
my $config = shift;
my $params = shift;
my $token = $params->{token};
my $token = $params->{token};
my $entry = password_requests::get($config, { token => $token });
unless (defined $entry){
print "invalid token\n";
return undef;
}
my $entry = password_requests::get( $config, { token => $token } );
unless ( defined $entry ) {
print "invalid token\n";
return undef;
}
print STDERR Dumper($entry);
my $created_at = $entry->{created_at};
unless (defined $created_at){
print "invalid token age\n";
return undef;
}
print STDERR Dumper($entry);
my $created_at = $entry->{created_at};
unless ( defined $created_at ) {
print "invalid token age\n";
return undef;
}
my $age = time() - time::datetime_to_time($created_at);
if ($age > 600) {
print "token is too old\n";
password_requests::delete($config, { token => $token });
return undef;
}
my $age = time() - time::datetime_to_time($created_at);
if ( $age > 600 ) {
print "token is too old\n";
password_requests::delete( $config, { token => $token } );
return undef;
}
$config->{access}->{write} = 1;
$entry->{max_attempts}++;
password_requests::update($config, $entry);
$config->{access}->{write} = 0;
$config->{access}->{write} = 1;
$entry->{max_attempts}++;
password_requests::update( $config, $entry );
$config->{access}->{write} = 0;
if ($entry->{max_attempts}>10){
print "too many failed attempts, please request a new token by mail\n";
password_requests::delete($config, { token => $token });
return undef;
}
if ( $entry->{max_attempts} > 10 ) {
print "too many failed attempts, please request a new token by mail\n";
password_requests::delete( $config, { token => $token } );
return undef;
}
unless ((defined $params->{user_password}) && (defined $params->{user_password2})){
printForm($token);
return undef;
}
if ($params->{action} eq 'change'){
my $user = $entry->{user};
my $request = {
config => $config,
params => { checked => $params }
};
my $result = password_requests::changePassword($config, $request, $user);
unless ( ( defined $params->{user_password} ) && ( defined $params->{user_password2} ) ) {
printForm($token);
return undef;
}
if (defined $result->{error}){
#print "sorry\n";
print $result->{error}."\n";
printForm($token);
}
if ( $params->{action} eq 'change' ) {
my $user = $entry->{user};
my $request = {
config => $config,
params => { checked => $params }
};
my $result = password_requests::changePassword( $config, $request, $user );
if (defined $result->{success}){
#print "success\n";
print $result->{success}."\n";
password_requests::delete($config, { user => $user });
my $url=$config->{locations}->{editor_base_url};
print qq{
if ( defined $result->{error} ) {
#print "sorry\n";
print $result->{error} . "\n";
printForm($token);
}
if ( defined $result->{success} ) {
#print "success\n";
print $result->{success} . "\n";
password_requests::delete( $config, { user => $user } );
my $url = $config->{locations}->{editor_base_url};
print qq{
<script type="text/javascript">
window.location = "$url";
</script>
};
}
}
}
}
}
sub printForm{
my $token=shift;
print qq{
sub printForm {
my $token = shift;
print qq{
<form method="post">
<input type="hidden" name="token" value="$token">
<input type="password" name="user_password" placeholder="enter new password">
@@ -136,7 +138,7 @@ sub printForm{
sub check_params {
my $params = shift;
my $checked = {};
my $checked = {};
#my $template = '';
#$checked->{template} = template::check( $params->{template}, 'requestPassword' );
@@ -147,7 +149,7 @@ sub check_params {
}
$checked->{debug} = $debug;
for my $param ( 'user','token', 'user_password', 'user_password2' ) {
for my $param ( 'user', 'token', 'user_password', 'user_password2' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /\S/ ) ) {
$checked->{$param} = $params->{$param};
}

2
website/agenda/planung/roles.cgi
View File

@@ -57,8 +57,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#process header

1
website/agenda/planung/selectEvent.cgi
View File

@@ -46,7 +46,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
$params = uac::set_template_permissions( $request->{permissions}, $params );

1
website/agenda/planung/selectSeries.cgi
View File

@@ -45,7 +45,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
$params = uac::set_template_permissions( $request->{permissions}, $params );

90
website/agenda/planung/series.cgi
View File

@@ -60,8 +60,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#process header
@@ -429,13 +427,16 @@ sub save_series {
#print STDERR Dumper($entry);
$config->{access}->{write} = 1;
my $result = series::update( $config, $entry );
series_events::update_series_images($config,{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
series_events::update_series_images(
$config,
{
project_id => $entry->{project_id},
studio_id => $entry->{studio_id},
series_id => $entry->{series_id},
series_image => $params->{image}
});
}
);
user_stats::increase(
$config,
@@ -590,7 +591,7 @@ sub assign_event {
my $config = shift;
my $request = shift;
print STDERR "assign event\n";
print STDERR "assign event\n";
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -608,7 +609,8 @@ sub assign_event {
return undef;
}
}
#print STDERR "found all parameters:\n".Dumper($entry);
#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
@@ -618,11 +620,12 @@ sub assign_event {
checked => events::check_params(
$config,
{
event_id => $entry->{event_id},
template => 'no',
limit => 1,
archive => 'all',
# no_exclude => 1
event_id => $entry->{event_id},
template => 'no',
limit => 1,
archive => 'all',
# no_exclude => 1
}
)
},
@@ -632,11 +635,12 @@ sub assign_event {
$request2->{params}->{checked}->{published} = 'all';
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;
}
if ( scalar(@$events) != 1 ) {
uac::print_error("no event found for event_id=$entry->{event_id}, archive=all");
return undef;
}
my $event = $events->[0];
@@ -837,19 +841,19 @@ sub reassign_event {
$request->{params}->{checked}->{series_id} = $new_series_id;
my $result = assign_event( $config, $request );
unless (defined $result){
uac::print_error("could not assign event");
return undef;
}
unless ( defined $result ) {
uac::print_error("could not assign event");
return undef;
}
$request->{params}->{checked}->{series_id} = $series_id;
$result = unassign_event( $config, $request );
unless (defined $result){
uac::print_error("could not unassign event");
return undef;
}
unless ( defined $result ) {
uac::print_error("could not unassign event");
return undef;
}
#print STDERR " event\n";
#print STDERR " event\n";
my $url =
'event.cgi?project_id=' . $project_id . '&studio_id=' . $studio_id . '&series_id=' . $new_series_id . '&event_id=' . $event_id;
print qq{<meta http-equiv="refresh" content="0; url=$url" />} . "\n";
@@ -944,8 +948,8 @@ sub list_series {
return;
}
my $project_id = $params->{project_id};
my $studio_id = $params->{studio_id};
my $project_id = $params->{project_id};
my $studio_id = $params->{studio_id};
my $studios = studios::get(
$config,
@@ -959,13 +963,13 @@ sub list_series {
for my $studio (@$studios) {
$studio_by_id->{ $studio->{id} } = $studio;
}
my $studio = $studio_by_id->{ $studio_id };
my $studio = $studio_by_id->{$studio_id};
my $series_conditions = {
project_id => $project_id,
studio_id => $studio_id
};
my $series = series::get_event_age( $config, $series_conditions );
my $series = series::get_event_age( $config, $series_conditions );
my $newSeries = [];
my $oldSeries = [];
@@ -980,9 +984,12 @@ sub list_series {
$params->{newSeries} = $newSeries;
$params->{oldSeries} = $oldSeries;
$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->{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' } );
template::process( 'print', $params->{template}, $params );
@@ -1079,10 +1086,13 @@ 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} ) 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};
# set default image from studio
$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(
@@ -1093,7 +1103,7 @@ 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(

2
website/agenda/planung/show-playout.cgi
View File

@@ -53,8 +53,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#process header

40
website/agenda/planung/showImage.cgi
View File

@@ -47,8 +47,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#process header
@@ -68,26 +66,26 @@ sub showImage {
return;
}
unless (defined $params->{filename}){
unless ( defined $params->{filename} ) {
uac::permissions_denied('missing filename');
return;
}
return;
}
my $filename = images::getInternalPath($config, $params);
unless (-e $filename){
my $filename = images::getInternalPath( $config, $params );
unless ( -e $filename ) {
uac::permissions_denied("read $filename");
return;
}
return;
}
my $image=images::readFile($filename);
if (defined $image->{error}){
my $image = images::readFile($filename);
if ( defined $image->{error} ) {
uac::permissions_denied("read $filename, $image->{error}");
return;
}
return;
}
binmode STDOUT;
print "Content-type:image/jpeg; charset=UTF-8;\n\n";
print $image->{content};
binmode STDOUT;
print "Content-type:image/jpeg; charset=UTF-8;\n\n";
print $image->{content};
return;
}
@@ -103,22 +101,22 @@ sub check_params {
$checked->{debug} = $debug;
#numeric values
for my $param ( 'filename') {
for my $param ('filename') {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^[A-Za-z\_\-\.\d\/]+$/ ) ) {
$checked->{$param} = $params->{$param};
$checked->{$param} =~s/^.*\///g;
$checked->{$param} =~ s/^.*\///g;
}
}
$checked->{type}='thumbs';
for my $param ( 'type') {
$checked->{type} = 'thumbs';
for my $param ('type') {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^(thumbs|images|icons)$/ ) ) {
$checked->{$param} = $params->{$param};
}
}
#numeric values
for my $param ( 'project_id', 'studio_id', 'series_id', 'event_id') {
for my $param ( 'project_id', 'studio_id', 'series_id', 'event_id' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^[\-\d]+$/ ) ) {
$checked->{$param} = $params->{$param};
}

2
website/agenda/planung/studio_timeslots.cgi
View File

@@ -53,8 +53,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#process header

2
website/agenda/planung/studios.cgi
View File

@@ -47,8 +47,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#process header

1
website/agenda/planung/templates/.old/.htaccess
View File

@@ -1 +0,0 @@
Deny from all

378
website/agenda/planung/templates/.old/event_edit_user_content.ok.html
View File

@@ -1,378 +0,0 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>edit event</title>
<link href="css/event.css" type="text/css" rel="stylesheet"/>
<link href="css/jquery-ui-timepicker.css" type="text/css" rel="stylesheet" />
<!-- for edit series-->
<script src="js/series.js" type="text/javascript"></script>
<script src="js/edit_event.js" type="text/javascript"></script>
<script src="js/image.js" type="text/javascript"></script>
<script src="js/jquery-ui-timepicker.js" type="text/javascript"></script>
<script>
var event_id='<TMPL_VAR event_id>';
var selectImageId='';
/*
$(document).ready(function(){
$('textarea').each(function() {
$(this).height($(this).prop('scrollHeight'));
});
$('textarea').on('change', function() {
$(this).height($(this).prop('scrollHeight'));
});
});
*/
</script>
</head>
<body>
<TMPL_UNLESS new_event>
<TMPL_IF .allow_create_download>
<form>
<TMPL_IF download>
<textarea type="hidden" name="event_id" style="width:100%;height:10em;"><TMPL_VAR download></textarea>
</TMPL_IF>
<input type="hidden" name="event_id" value="<TMPL_VAR event_id>">
<input type="hidden" name="series_id" value="<TMPL_VAR series_id>">
<input type="submit" name="action" value="download">
</form>
</TMPL_IF>
</TMPL_UNLESS>
<!-- edit -->
<TMPL_IF .allow_update_event>
<div class="editor">
<div class="buttons" id="back_to_calendar">
<button onclick="cancel_edit_event();return false;">back to calendar</button>
</div>
<!-- series -->
<TMPL_UNLESS .hide_series>
<TMPL_IF series_id>
<table class="series">
<tr><td>
<!-- header -->
<div class="header">
<TMPL_VAR series_name> <TMPL_IF title>- <TMPL_VAR title></TMPL_IF>
<!--<aTMPL_UNLESS new_event>-->
<TMPL_IF .allow_read_series>
<button onclick="view_series_details('<TMPL_VAR series_id>','<TMPL_VAR .studio_id>')" style="float:right">
edit series
</button>
</TMPL_IF>
<!--</aTMPL_UNLESS>-->
</div>
</td></tr>
<tr class="series_details_<TMPL_VAR series_id>" style="display:none">
<td>
<div id="series_details_<TMPL_VAR series_id>">
</div>
</td>
</tr>
</table>
</TMPL_IF>
</TMPL_UNLESS>
<div>
<div class="header">Event</div>
<!-- edit event -->
<form method="post" action="event.cgi" id="event_<TMPL_VAR event_id>">
<input type="hidden" name="studio_id" value="<TMPL_VAR .studio_id>">
<input type="hidden" name="series_id" value="<TMPL_VAR series_id>">
<TMPL_UNLESS new_event>
<input type="hidden" name="event_id" value="<TMPL_VAR event_id>">
</TMPL_UNLESS>
<input type="hidden" name="debug" value="sql">
<!-- buttons -->
<!--
<TMPL_IF .allow_update_event>
<button class="edit_time_<TMPL_VAR event_id>" onclick="editEventTime('<TMPL_VAR event_id>');return false;">edit</button>
</TMPL_IF>
-->
<!-- show event event summary -->
<!-- <TMPL_IF new_event>style="display:none"</TMPL_IF> -->
<!--
<TMPL_IF .allow_read_event>
<table id="event_summary_<TMPL_VAR event_id>" >
<TMPL_UNLESS new_event>
<tr>
<td class="label">when</td>
<td><TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name>, <TMPL_VAR start_time_name> - <TMPL_VAR end_time>
</td>
</tr>
</TMPL_UNLESS>
<tr>
<td class="label">title</td>
<td><TMPL_VAR series_name> <TMPL_IF title>- <TMPL_VAR title></TMPL_IF> <TMPL_VAR user_title></td>
</tr>
<tr>
<td class="label">status</td>
<td>
<TMPL_IF live>live</TMPL_IF>
<TMPL_IF published>published</TMPL_IF>
<TMPL_IF preproduced>preproduced</TMPL_IF>
<TMPL_IF archived>archived</TMPL_IF>
<TMPL_IF rerun>rerun</TMPL_IF>
<TMPL_IF disable_event_sync>no sync</TMPL_IF>
</td>
</tr>
<tr>
<td class="label">episode</td>
<td><TMPL_VAR episode></td>
</tr>
</table>
</TMPL_IF>
-->
<!-- edit event time -->
<!-- <TMPL_UNLESS new_event>style="display:none"</TMPL_UNLESS> -->
<table id="edit_time_<TMPL_VAR event_id>" class="edit_event" >
<TMPL_IF .allow_update_event_time>
<tr>
<td class="label">when</td>
<td>
<TMPL_UNLESS new_event>
<TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name>, <TMPL_VAR start_time_name> - <TMPL_VAR end_time><br>
</TMPL_UNLESS>
start
<span id="start_date_weekday"></span>
<input id="start_date" class="date" name="start_date" value="<TMPL_VAR start>" onchange="onDateModified()">
duration <select id="duration" name="duration" onchange="onDateModified()"> minutes
<TMPL_LOOP durations>
<option value="<TMPL_VAR value>" <TMPL_IF selected>selected="selected"</TMPL_IF>><TMPL_VAR name></option>
</TMPL_LOOP>
</select>
end
<input id="end_date" class="date" name="end_date" value="<TMPL_VAR end>" disabled><br>
</td>
</tr>
</TMPL_IF>
<tr>
<td class="label">status</td>
<td>
<TMPL_IF .allow_update_event_live>
<input type="checkbox" name="live" <TMPL_IF live>checked="checked"</TMPL_IF> value="1"> live
</TMPL_IF>
<TMPL_IF .allow_update_event_published>
<input type="checkbox" name="published" <TMPL_IF published>checked="checked"</TMPL_IF> value="1"> published
</TMPL_IF>
<TMPL_IF .allow_update_event_preproduced>
<input type="checkbox" name="preproduced" <TMPL_IF preproduced>checked="checked"</TMPL_IF> value="1"> preproduced
</TMPL_IF>
<TMPL_IF .allow_update_event_archived>
<input type="checkbox" name="archived" <TMPL_IF archived>checked="checked"</TMPL_IF> value="1"> archived
</TMPL_IF>
<TMPL_IF .allow_update_event_rerun>
<input type="checkbox" name="rerun" <TMPL_IF rerun>checked="checked"</TMPL_IF> value="1"> rerun
</TMPL_IF>
<TMPL_IF .allow_disable_event_sync>
<input type="checkbox" name="disable_event_sync" <TMPL_IF rerun>checked="checked"</TMPL_IF> value="1"> no sync
</TMPL_IF>
</td>
</tr>
<TMPL_IF .allow_update_event_episode>
<tr>
<td class="label">episode</td>
<td><input name="episode" value="<TMPL_VAR episode>" class="episode"></td>
</tr>
</TMPL_IF>
</table>
<div class="header">content</div>
<!--
<TMPL_IF .allow_update_event>
<button class="edit_content_<TMPL_VAR event_id>" onclick="editEventContent('<TMPL_VAR event_id>');return false;">edit</button>
</TMPL_IF>
-->
<!-- show event content -->
<TMPL_IF read_event>
<table id="show_content_<TMPL_VAR event_id>" <TMPL_IF new_event>style="display:none"</TMPL_IF> >
<tr>
<td class="label">excerpt</td>
<td><TMPL_VAR excerpt><TMPL_VAR user_excerpt></td>
</tr>
<tr>
<td class="label">description</td>
<td>
<img src="<TMPL_VAR image>" style="float:right;padding-left:1em">
<div><TMPL_VAR user_content_prefix></div>
<div><TMPL_VAR html_content escape=0></div>
<div><TMPL_VAR user_content_suffix></div>
</td>
</tr>
</table>
</TMPL_IF>
<!-- <TMPL_UNLESS new_event>style="display:none"</TMPL_UNLESS> -->
<!-- edit event content -->
<table id="edit_content_<TMPL_VAR event_id>" class="edit_event" >
<!--
<TMPL_IF .allow_update_event_user_content>
<tr>
<td colspan="2">
<button class="edit_content_<TMPL_VAR event_id>" onclick="editUserContent('<TMPL_VAR event_id>');return false;">extra content</button>
</td>
</tr>
</TMPL_IF>
-->
<tr>
<td class="label">title</td>
<td>
<TMPL_VAR series_name> -
<TMPL_IF .allow_update_event_content>
<input name="title" value="<TMPL_VAR title>">
<TMPL_ELSE>
<TMPL_VAR title>
</TMPL_IF>
<TMPL_IF .allow_update_event_title_extension>
<input name="user_title" value="<TMPL_VAR user_title>" id="user_title_<TMPL_VAR event_id>">
<TMPL_ELSE>
<TMPL_VAR user_title>
</TMPL_IF>
</td>
</tr>
<tr>
<td class="label">excerpt</td>
<td>
<TMPL_IF .allow_update_event_content>
<textarea name="excerpt" class="excerpt"><TMPL_VAR excerpt></textarea>
<TMPL_ELSE>
<TMPL_VAR excerpt>
</TMPL_IF>
</td>
</tr>
<tr id="user_excerpt_<TMPL_VAR event_id>">
<td class="label">user excerpt</td>
<td>
<TMPL_IF .allow_update_event_user_excerpt_extension>
<textarea class="excerpt" name="user_excerpt" ><TMPL_VAR user_excerpt></textarea>
<TMPL_ELSE>
<TMPL_VAR user_excerpt>
</TMPL_IF>
</td>
</tr>
<tr id="user_content_prefix_<TMPL_VAR event_id>">
<td class="label">current topics</td>
<td class="edit_user_content_prefix">
<TMPL_IF .allow_update_event_user_content>
<textarea name="user_content_prefix"><TMPL_VAR user_content_prefix></textarea>
<TMPL_ELSE>
<TMPL_VAR html_user_content_prefix escape=0>
</TMPL_IF>
</td>
</tr>
<tr>
<td class="label">content</td>
<td class="edit_content">
<TMPL_IF .allow_update_event_topic>
<textarea name="content"><TMPL_VAR content></textarea>
<TMPL_ELSE>
<TMPL_VAR html_content escape=0>
</TMPL_IF>
</td>
</tr>
<!--
<tr id="user_content_suffix_<TMPL_VAR event_id>">
<td class="label">user content</td>
<td class="edit_user_content_suffix">
<TMPL_IF .allow_update_event_user_content>
<textarea name="user_content_suffix"><TMPL_VAR user_content_suffix></textarea>
<TMPL_ELSE>
<TMPL_VAR html_user_content_prefix escape=0>
</TMPL_IF>
</td>
</tr>
-->
<tr>
<td class="label">
image
</td>
<td>
<TMPL_IF .allow_update_event_content>
<button onclick="selectImage(<TMPL_VAR .studio_id>,'image_<TMPL_VAR event_id>','<TMPL_VAR series_name escape=HTML>');return false;"
style="padding:0;"
>
<img id="imagePreview" src="<TMPL_VAR image>">
</button>
<input id="image_<TMPL_VAR event_id>" name="image" value="<TMPL_VAR image>" class="image" style="float:right">
<TMPL_ELSE>
<img src="<TMPL_VAR image>">
</TMPL_IF>
</td>
</tr>
</table>
<table>
<tr>
<td colspan="2">
<div class="buttons" style="text-align:center">
<TMPL_IF show_new_event_from_schedule>
<TMPL_IF .allow_create_event_from_schedule>
<button type="submit" name="action" value="create_event_from_schedule">create</button>
</TMPL_IF>
<TMPL_ELSIF show_new_event>
<TMPL_IF .allow_create_event>
<button type="submit" name="action" value="create_event">create</button>
</TMPL_IF>
<TMPL_ELSE>
<TMPL_IF .allow_update_event>
<input type="submit" name="action" value="save">
</TMPL_IF>
</TMPL_IF>
<TMPL_IF .allow_delete_event>
<TMPL_UNLESS new_event>
<input type="submit" name="action" value="delete"
onclick="commitForm('event_<TMPL_VAR event_id>','delete','delete event');return false;"
>
</TMPL_UNLESS>
</TMPL_IF>
</div>
</td>
</tr>
</table>
</form>
</div>
<TMPL_IF modified_at>
<div class="label right">last modified at <TMPL_VAR modified_at> by <TMPL_VAR modified_by>.</div>
</TMPL_IF>
<div id="selectImage"></div>
</div>
</TMPL_IF>
</body>
</html>

152
website/agenda/planung/templates/.old/event_manager.html
View File

@@ -1,152 +0,0 @@
<TMPL_INCLUDE header.html>
<h1><a href="event_manager.cgi">Sendungen verwalten</a></h1>
<TMPL_INCLUDE menu.html>
<style>
td,th,input {
font-size:10px;
line-height:100%
}
table{
wwidth:1000px;
}
</style>
projects:
<TMPL_LOOP projects>
<TMPL_LOOP months>
<a href="event_manager.cgi?from_date=<TMPL_VAR start>&till_date=<TMPL_VAR end>"><TMPL_VAR title> <TMPL_VAR month_name></a> |
</TMPL_LOOP>
</TMPL_LOOP>
<div id="print_header">
<TMPL_IF event_count><TMPL_VAR event_count> Treffer:</TMPL_IF>
</div>
<TMPL_VAR is_empty>
<div style="text-align:right">
<form action="event_manager.cgi">
<input name="search">
<input type="submit" value="suchen">
</form>
</div>
<table border="1">
<tr>
<th>Progamm</th>
<th>Wochentag</th>
<th>Datum</th>
<th>Start</th>
<th>Ende</th>
<th>Bild</th>
<th>Sendereihe</th>
<th>Titel</th>
<th>Auszug</th>
</tr>
<TMPL_LOOP events>
<tr>
<td>
<TMPL_VAR program>
</td>
<td>
<TMPL_VAR weekday_name>
</td>
<td>
<TMPL_VAR start_date>
</td>
<td style="background-color:<TMPL_IF same_time_alert_old>ffa</TMPL_IF><TMPL_IF same_time_alert_new>faa</TMPL_IF>">
<TMPL_VAR start_time_name>
</td>
<td>
<TMPL_VAR end_time_name>
</td>
<td>
<a href="<TMPL_VAR image>"><img src="<TMPL_VAR image>" width="75" height="75"></a>
</td>
<td>
<TMPL_VAR series_name>
</td>
<td>
<TMPL_VAR title>
</td>
<td>
<TMPL_VAR excerpt >
<a href="#event_<TMPL_VAR event_id>" onclick="showEventComments('<TMPL_VAR event_id>','event_<TMPL_VAR event_id>_comments_container');return false;" >
<p><TMPL_VAR comment_count> Kommentare ,
<a href="#" onclick="toggle('event_<TMPL_VAR event_id>_options');return false;">mehr...</a>
</a>
</td>
</tr>
<tr id="event_<TMPL_VAR event_id>_comments_container" style="display:none">
<td colspan="20">
<div id="event_<TMPL_VAR event_id>_comments">
</div>
</td>
</tr>
<tr id="event_<TMPL_VAR event_id>_options" style="display:none">
<td colspan="20">
<div >
<table>
<tr>
<th colspan=7> </th>
<th>erstellt</th>
<th>ge&auml;ndert</th>
<th>Referenz</th>
<th>ID</th>
<TMPL_IF delete_events>
<th>L&ouml;schen</th>
</TMPL_IF>
</tr>
<tr>
<td colspan=7> </td>
<td>
<TMPL_VAR created_at >
</td>
<td>
<TMPL_VAR modified_at >
</td>
<td>
<TMPL_VAR reference >
</td>
<td>
<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR controller_event>/<TMPL_VAR event_id>.html"><TMPL_VAR event_id></a>
</td>
<TMPL_IF delete_event>
<td>
<form action="event_manager.cgi" method="post">
<input type="hidden" name="delete_event" value="<TMPL_VAR event_id>">
<input type="hidden" name="from_date" value="<TMPL_VAR from_date>">
<input type="hidden" name="till_date" value="<TMPL_VAR till_date>">
<input type="submit" value="loeschen">
</form>
</td>
</TMPL_IF>
</td></tr></table>
</div>
</td>
</tr>
</TMPL_LOOP>
</table>

283
website/agenda/planung/templates/.old/menu.html
View File

@@ -1,283 +0,0 @@
<script type="text/javascript">
function run(menu_id){
var url=$("#"+menu_id).val();
//alert(url);
if (url!='' && url!='undefined'){
load(url);
}
}
function getParentDiv(elem,type,level){
if (level==null || level=='') level=0;
//alert(level)
if (level>5) return null;
elem=elem.parent();
if (elem=='') return null;
if (elem.is(type)){
//if (elem.parent().parent().attr('id')=='#calcms_admin_menu')
return elem;
//return null;
}
return getParentDiv(elem,type,level+1);
}
$(document).ready(
function() {
if ($('#calcms_admin_menu').length == 0) return;
var menus=new Array("event_submenu","comment_submenu", "pic_submenu", "update_agenda_submenu","system_submenu");
//$("#calcms_admin_menu").height($(document).height());
for (var index in menus){
var menu_id="#"+menus[index];
$(menu_id).hide();
}
/*
$('#calcms_admin_menu li li').hover(
function() {
jQuery(this).stop(true, true).animate({
fontSize: '+=3'
});
}, function() {
jQuery(this).stop(true, true).animate({
fontSize: '-=3'
});
}
);
*/
var url=getController();
url=url.replace("&amp;","&");
//hide menus on index or /admin/
if (url==null || url=='')return;
$("select[id$='_select'] option").each(
function(){
if ($(this).val()==url){
//get option
$(this).attr('selected','true');
// select
var elem=$(this).parent();
if (elem==null)return;
elem.css("opacity","1.0");
//menu
var menu=getParentDiv(elem,'div');
menu.show();
//menu point
elem=getParentDiv(elem,'li');
if (elem!=null)elem.css("opacity","1.0");
}
}
)
$("a[id$='_menupoint']").each(
function(){
if ($(this).attr('href')==url){
//a
$(this).css("opacity","1.0");
//menu
var elem=getParentDiv($(this),'div');
elem.show();
//menu point
elem=getParentDiv($(this),'li');
if (elem!=null)elem.css("opacity","1.0");
}
}
)
}
);
</script>
<!--
<table style="border:0;margin:0;position:absolute;left:-5px;top:118px;;height:100%">
<tr><td>
-->
<center>
<div id="calcms_admin_menu">
<ul>
<li>
<a href="/"><img width="20px" height="20px" src="<TMPL_VAR static_files_url>/style/logo.jpg" alt="Hauptseite"/> </a>
</li>
<li>
<a href="/agenda/programm.html">Programmplan</a>
</li>
<TMPL_IF access_events>
<li>
<a href="#" onclick="toggle('event_submenu');return false;">Sendungen</a>
<div id="event_submenu">
<ul>
<li>
<select id="event_manager_select" onchange="run('event_manager_select')">
<option value="">w&auml;hlen</option>
<TMPL_UNLESS read_event_all>
<TMPL_LOOP projects>
<TMPL_LOOP months>
<option value="event_manager.cgi?from_date=<TMPL_VAR start>&amp;till_date=<TMPL_VAR end>&amp;location=<TMPL_VAR user escape=url>"><TMPL_VAR year>-<TMPL_VAR month> <TMPL_VAR title></option>
</TMPL_LOOP>
</TMPL_LOOP>
<TMPL_ELSE>
<TMPL_LOOP projects>
<TMPL_LOOP months>
<option value="event_manager.cgi?from_date=<TMPL_VAR start>&amp;till_date=<TMPL_VAR end>"><TMPL_VAR year>-<TMPL_VAR month> <TMPL_VAR title></option>
</TMPL_LOOP>
</TMPL_LOOP>
</TMPL_UNLESS>
</select>
</li>
<TMPL_IF create_event>
<li>
<a id="wiki_editor_menupoint" href="wiki_editor.cgi">Editor</a>
</li>
</TMPL_IF>
</ul>
</div>
</li>
</TMPL_IF>
<!-- pic manager -->
<TMPL_IF access_images>
<li>
<a href="#" onclick="toggle('pic_submenu');return false;">Bilder</a><br/>
<div id="pic_submenu">
<ul>
<li>
<select id="pic_manager_select" onchange="run('pic_manager_select')">
<option value="">w&auml;hlen</option>
<TMPL_LOOP projects>
<TMPL_LOOP months>
<option value="image_manager.cgi?from=<TMPL_VAR start>&amp;till=<TMPL_VAR end>"><TMPL_VAR year>-<TMPL_VAR month> <TMPL_VAR title></option>
</TMPL_LOOP>
</TMPL_LOOP>
<option value="image_manager.cgi?search=neu">nicht zugeordnet</option>
<option value="image_manager.cgi">alle</option>
</select>
</li>
<!-- pic upload -->
<TMPL_IF create_image>
<li>
<a id="pic_upload_menupoint" href="image_upload.cgi">neues Bild</a>
</li>
</TMPL_IF>
</ul>
</div>
</li>
</TMPL_IF>
<!-- comment manager -->
<TMPL_IF access_comments>
<li>
<a href="#" onclick="toggle('comment_submenu');return false;">Kommentare</a>
<div id="comment_submenu">
<ul>
<li>Aktualit&auml;t<br/>
<select id="comment_by_age_select" onchange="run('comment_by_age_select')">
<option value="">w&auml;hlen</option>
<option value="comment_manager.cgi?age=1">Stunde </option>
<option value="comment_manager.cgi?age=6">6 Stunden</option>
<option value="comment_manager.cgi?age=24">24 Stunden</option>
<option value="comment_manager.cgi?age=168">Woche</option>
<option value="comment_manager.cgi?age=720">Monat</option>
<option value="comment_manager.cgi?age=2160">3 Monate</option>
<option value="comment_manager.cgi?age=4360">6 Monate</option>
<option value="comment_manager.cgi">alle</option>
</select>
</li>
<li>Sendungen<br/>
<select id="comment_by_date_select" onchange="run('comment_by_date_select')">
<option value="">w&auml;hlen</option>
<TMPL_LOOP projects>
<TMPL_LOOP months>
<option value="comment_manager.cgi?from=<TMPL_VAR start>&amp;till=<TMPL_VAR end>"><TMPL_VAR year>-<TMPL_VAR month> <TMPL_VAR title></option>
</TMPL_LOOP>
</TMPL_LOOP>
</select>
</li>
</ul>
</div>
</li>
</TMPL_IF>
<!-- update agenda -->
<TMPL_IF access_sync>
<li id="update_agenda_menu">
<a href="#" onclick="toggle('update_agenda_submenu');return false;">Synchronisierung</a>
<div id="update_agenda_submenu">
<ul>
<!--
<TMPL_IF sync_all>
<li>
<select id="update_agenda_select" onchange="run('update_agenda_select')">
<option value="">w&auml;hlen</option>
<option value="update_agenda.cgi">ge&auml;ndert</option>
<TMPL_LOOP projects>
<TMPL_LOOP months>
<option value="update_agenda.cgi?update=all&amp;from=<TMPL_VAR start>&amp;till=<TMPL_VAR end>"><TMPL_VAR year>-<TMPL_VAR month> <TMPL_VAR title></option>
</TMPL_LOOP>
</TMPL_LOOP>
<option value="update_agenda.cgi?update=all">alles</option>
</select>
</li>
</TMPL_IF>
-->
<TMPL_IF sync_own>
<li>
<a id="jobs_menupoint" href="jobs.cgi">Jobs</a>
</li>
</TMPL_IF>
</ul>
</div>
</li>
</TMPL_IF>
<!-- admin -->
<TMPL_IF access_system>
<li id="system_menu">
<a href="#" onclick="toggle('system_submenu');return false;">System</a>
<div id="system_submenu">
<ul>
<li>
<a id="clear_cache_menupoint" href="clear_cache.cgi">Cache l&ouml;schen</a>
</li>
<li>
<a id="compress_menupoint" href="compress_templates.cgi">compress templates</a>
<li>
<a id="pic_scan_menupoint" href="pic_scan.cgi">Bilder Update</a>
</li>
<li>
<a id="log_menupoint" href="error_log.cgi">Error-Log</a>
</li>
<li>
<a id="stats_menupoint" href="/webstat">Statistik</a>
</li>
</ul>
</div>
</li>
</TMPL_IF>
<li class="login" >Willkommen, <TMPL_VAR user>!</li>
</ul>
</div>
<!--
</td><td>
-->
<div style="height:3em"></div>
<div id="content">

24
website/agenda/planung/templates/.old/select_studio.html
View File

@@ -1,24 +0,0 @@
<script type="text/javascript">
function set_studio(id){
var url=window.location.href;
url=url.replace(/[\?\&]+studio_id=[0-9]+/g,'');
if (url.indexOf('?')==-1)url+='?';
url+='&studio_id='+id;
url=url.replace(/\&\&+/g,'&');
url=url.replace(/\?\&+/g,'?');
//$('#select_studio').attr('href',url);
//alert(url);
load(url);
}
</script>
<div style="text-align:right">
<select name="studio_id" onchange="set_studio($(this).val())">
<option value="-1">Studio</option>
<TMPL_LOOP studios>
<option value="<TMPL_VAR id>"<TMPL_VAR selected>><TMPL_VAR name></option>
</TMPL_LOOP>
</select>
<TMPL_VAR user> <a href="<TMPL_VAR logout_url>?action=logout">logout</a>
</div>

1
website/agenda/planung/user_settings.cgi
View File

@@ -45,7 +45,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};

2
website/agenda/planung/user_stats.cgi
View File

@@ -47,8 +47,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#process header

33
website/agenda/planung/users.cgi
View File

@@ -17,7 +17,6 @@ use password_requests();
my $r = shift;
( my $cgi, my $params, my $error ) = params::get($r);
my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug};
my ( $user, $expires ) = auth::get_user( $cgi, $config );
@@ -44,8 +43,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#process header
@@ -201,15 +198,16 @@ sub update_user {
return;
}
#print Dumper($params);
my $users= uac::get_users($config, {email => $params->{user_email}});
if (scalar (@$users) > 0){
#print Dumper($users);
#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;
}
}
return unless password_requests::checkPassword( $params->{user_password} ) ;
return unless password_requests::checkPassword( $params->{user_password} );
if ( $params->{user_password} ne $params->{user_password2} ) {
error('password mismatch');
@@ -245,18 +243,17 @@ sub change_password {
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
my $result = password_requests::changePassword($config, $request, $userName);
my $result = password_requests::changePassword( $config, $request, $userName );
$params->{errors} = $result->{error} if defined $result->{error};
$params->{info} = $result->{success} if defined $result->{success};
$params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'users' } );
$params->{info} = $result->{success} if defined $result->{success};
$params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'users' } );
uac::set_template_permissions( $permissions, $params );
#print Dumper($permissions);
template::process( 'print', template::check('change_password'), $params );
}
sub delete_user {
my $config = shift;
my $request = shift;
@@ -423,16 +420,16 @@ sub check_params {
$checked->{studio_id} = -1;
}
for my $param ( 'user_name', 'user_full_name', 'user_email') {
for my $param ( 'user_name', 'user_full_name', 'user_email' ) {
if ( defined $params->{$param} ) {
my $value = $params->{$param};
$value =~s/^\s+//g;
$value =~s/\s+$//g;
$checked->{$param} = $value;
$value =~ s/^\s+//g;
$value =~ s/\s+$//g;
$checked->{$param} = $value;
}
}
for my $param ( 'user_password', 'user_password2' ) {
for my $param ( 'user_password', 'user_password2' ) {
if ( defined $params->{$param} ) {
$checked->{$param} = $params->{$param};
}

2
website/agenda/planung/work_time.cgi
View File

@@ -54,8 +54,6 @@ my $request = {
},
};
$request = uac::prepare_request( $request, $user_presets );
log::init($request);
$params = $request->{params}->{checked};
#process header

1
website/agenda/series.cgi
View File

@@ -71,7 +71,6 @@ sub list_series {
template::process( 'print', 'templates/series.html', $params );
}
sub check_params {
my $params = shift;

3
website/agenda/series_names.cgi
View File

@@ -2,7 +2,6 @@
#use utf8;
use warnings "all";
#use diagnostics;
use strict;
use Data::Dumper;
@@ -36,7 +35,6 @@ my $request = {
checked => check_params( $config, $params )
},
};
log::init($request);
$params = $request->{params}->{checked};
@@ -44,7 +42,6 @@ $params = $request->{params}->{checked};
my $cache = {};
if ( $config->{cache}->{use_cache} eq '1' ) {
cache::configure('series_names.html');
log::write( $config, 'cache_files', cache::get_map() ) if ($debug);
$cache = cache::load( $config, $params );
if ( defined $cache->{content} ) {
print $cache->{content};