diff --git a/lib/calcms/uac.pm b/lib/calcms/uac.pm
index b675987..7ace2a2 100644
--- a/lib/calcms/uac.pm
+++ b/lib/calcms/uac.pm
@@ -777,6 +777,24 @@ sub get_user_presets {
return $result;
}
+sub setDefaultProject {
+ my $params = shift;
+ my $user_presets = shift;
+
+ $params->{project_id} = $user_presets->{project_id}
+ if ( !defined $params->{authAction} ) || ( $params->{authAction} eq '' ) || ( $params->{authAction} eq 'login' );
+ return $params;
+}
+
+sub setDefaultStudio {
+ my $params = shift;
+ my $user_presets = shift;
+
+ $params->{studio_id} = $user_presets->{studio_id}
+ if ( !defined $params->{authAction} ) || ( $params->{authAction} eq '' ) || ( $params->{authAction} eq 'login' );
+ return $params;
+}
+
#set user preset properties to request
sub prepare_request {
my $request = shift;
diff --git a/website/agenda/planung/assign_series.cgi b/website/agenda/planung/assign_series.cgi
index 19d0dc2..ecd40ff 100755
--- a/website/agenda/planung/assign_series.cgi
+++ b/website/agenda/planung/assign_series.cgi
@@ -43,10 +43,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' );
-$params->{project_id} = $user_presets->{project_id}
- if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
#print STDERR $params->{project_id}."\n";
my $request = {
diff --git a/website/agenda/planung/assignments.cgi b/website/agenda/planung/assignments.cgi
index bec6c26..a73d7da 100755
--- a/website/agenda/planung/assignments.cgi
+++ b/website/agenda/planung/assignments.cgi
@@ -44,10 +44,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' );
-$params->{project_id} = $user_presets->{project_id}
- if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
#print STDERR $params->{project_id}."\n";
my $request = {
diff --git a/website/agenda/planung/audio_recordings.cgi b/website/agenda/planung/audio_recordings.cgi
index 2564904..b38b770 100755
--- a/website/agenda/planung/audio_recordings.cgi
+++ b/website/agenda/planung/audio_recordings.cgi
@@ -68,10 +68,8 @@ my $user_presets = uac::get_user_presets(
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/calendar.cgi b/website/agenda/planung/calendar.cgi
index bfbd425..39abd8f 100755
--- a/website/agenda/planung/calendar.cgi
+++ b/website/agenda/planung/calendar.cgi
@@ -2,9 +2,11 @@
use warnings "all";
use strict;
+
use Data::Dumper;
use URI::Escape();
-#use Encode();
+use DateTime();
+
use utf8();
use params();
use config();
@@ -18,15 +20,13 @@ use project();
use studios();
use events();
use series();
-use markup();
use series_dates();
+use markup();
+use localization();
use studio_timeslot_dates();
use work_dates();
use playout();
-use markup();
use user_settings();
-use localization();
-use DateTime();
use audio_recordings();
binmode STDOUT, ":utf8";
@@ -48,8 +48,7 @@ my $user_presets = uac::get_user_presets(
}
);
$params->{default_studio_id} = $user_presets->{studio_id};
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
$params->{expires} = $expires;
my $scriptName = 'calendar.cgi';
@@ -76,9 +75,7 @@ my $request = {
checked => check_params( $config, $params ),
},
};
-
$request = uac::prepare_request( $request, $user_presets );
-
$params = $request->{params}->{checked};
if (
@@ -387,9 +384,9 @@ sub showCalendar {
$date->{event_id} = $id;
$date->{title} = '';
$date->{title} .= 'errors: ' . $date->{errors} . '
' if defined $date->{errors};
- $date->{title} .= formatDuration( $date->{duration} ) . "s
" if defined $date->{duration};
- $date->{title} .= formatLoudness( "L:", $date->{rms_left} ) . ' dB, ' if defined $date->{rms_left};
- $date->{title} .= formatLoudness( "R:", $date->{rms_right} ) . ' dB
' if defined $date->{rms_right};
+ $date->{title} .= formatDuration( $date->{duration} ) . "
" if defined $date->{duration};
+ $date->{title} .= formatLoudness( "L:", $date->{rms_left} ) . ', ' if defined $date->{rms_left};
+ $date->{title} .= formatLoudness( "R:", $date->{rms_right} ) . '
' if defined $date->{rms_right};
$date->{title} .= formatBitrate( $date->{bitrate} ) . ' ' . $date->{bitrate_mode} . '
' if defined $date->{bitrate};
$date->{title} .= 'replay gain ' . sprintf( "%.1f", $date->{replay_gain} ) . '
' if defined $date->{replay_gain};
$date->{title} .= ( ( $date->{sampling_rate} || '0' ) / 1000 ) . ' kHz
' if defined $date->{sampling_rate};
@@ -543,24 +540,24 @@ sub formatLoudness {
return '' if $value eq '';
#print STDERR "'$value'\n";
- $value = sprintf( "%.1f", $value );
+ $value = sprintf( "%d", $value+0.5 );
my $class = 'ok';
$class = 'warn' if $value > -18.5;
$class = 'error' if $value > -16.0;
$class = 'warn' if $value < -24.0;
$class = 'error' if $value < -27.0;
- return qq{$label} . $value . qq{};
+ return qq{$label} . $value . qq{dB};
}
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 +30.5 ) % 60)-30;
my $class = "ok";
- $class = "warn" if $result > 1;
- $class = "error" if $result > 10;
- return sprintf( qq{%.01f}, $class, $duration );
+ $class = "warn" if abs($result) > 1;
+ $class = "error" if abs($result) > 2;
+ return sprintf( qq{%ds}, $class, $duration );
}
sub formatBitrate {
@@ -1133,9 +1130,10 @@ sub printTableBody {
if ( $event->{class} eq 'event' ) {
$event->{content} .= '
';
- $event->{content} .= formatDuration( $event->{duration} ) . 's ' if defined $event->{duration};
+ $event->{content} .= formatDuration( $event->{duration} ) . ' ' if defined $event->{duration};
$event->{content} .= formatLoudness( 'L', $event->{rms_left} ) . ' ' if defined $event->{rms_left};
$event->{content} .= formatLoudness( 'R', $event->{rms_right} ) if defined $event->{rms_right};
+ #$event->{content} .= formatBitrate( $event->{bitrate} ) if defined $event->{bitrate};
$event->{content} .= '';
}
@@ -1402,7 +1400,7 @@ sub print_event {
$ystart = int( $ystart * $yzoom );
$yend = int( $yend * $yzoom );
- my $height = $yend - $ystart + 2;
+ my $height = $yend - $ystart +1;
if ( $ypos > 0 ) {
$height = q{height:} . ($height) . 'px;';
diff --git a/website/agenda/planung/comment.cgi b/website/agenda/planung/comment.cgi
index ca9dc05..56e5459 100755
--- a/website/agenda/planung/comment.cgi
+++ b/website/agenda/planung/comment.cgi
@@ -43,10 +43,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/create_events.cgi b/website/agenda/planung/create_events.cgi
index b19e2d1..9f898ad 100755
--- a/website/agenda/planung/create_events.cgi
+++ b/website/agenda/planung/create_events.cgi
@@ -38,10 +38,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' );
-$params->{project_id} = $user_presets->{project_id}
- if ( !defined $params->{action} ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
#print STDERR $params->{project_id}."\n";
my $request = {
diff --git a/website/agenda/planung/event.cgi b/website/agenda/planung/event.cgi
index 37f5dd5..6b4f27e 100755
--- a/website/agenda/planung/event.cgi
+++ b/website/agenda/planung/event.cgi
@@ -51,10 +51,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/event_history.cgi b/website/agenda/planung/event_history.cgi
index 53c616f..2f38016 100755
--- a/website/agenda/planung/event_history.cgi
+++ b/website/agenda/planung/event_history.cgi
@@ -35,8 +35,7 @@ return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( $config, { user => $user, studio_id => $params->{studio_id} } );
$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' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/help.cgi b/website/agenda/planung/help.cgi
index 5ccf7c5..19cb4fb 100755
--- a/website/agenda/planung/help.cgi
+++ b/website/agenda/planung/help.cgi
@@ -36,10 +36,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/image.cgi b/website/agenda/planung/image.cgi
index 0f37323..dd8c2fe 100755
--- a/website/agenda/planung/image.cgi
+++ b/website/agenda/planung/image.cgi
@@ -45,10 +45,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/imageUpload.cgi b/website/agenda/planung/imageUpload.cgi
index 28cbac1..4a12a30 100755
--- a/website/agenda/planung/imageUpload.cgi
+++ b/website/agenda/planung/imageUpload.cgi
@@ -84,10 +84,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' );
-$params->{project_id} = $user_presets->{project_id}
- if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/notify_events.cgi b/website/agenda/planung/notify_events.cgi
index 22bfa2e..31d1080 100755
--- a/website/agenda/planung/notify_events.cgi
+++ b/website/agenda/planung/notify_events.cgi
@@ -40,10 +40,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/playout.cgi b/website/agenda/planung/playout.cgi
index 342a7d6..42850c9 100755
--- a/website/agenda/planung/playout.cgi
+++ b/website/agenda/planung/playout.cgi
@@ -49,12 +49,8 @@ my $user_presets = uac::get_user_presets(
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
-
-#print STDERR $params->{project_id}."\n";
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/projects.cgi b/website/agenda/planung/projects.cgi
index 0cfc923..2b92f8c 100755
--- a/website/agenda/planung/projects.cgi
+++ b/website/agenda/planung/projects.cgi
@@ -34,10 +34,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/roles.cgi b/website/agenda/planung/roles.cgi
index f90c7e8..0fe8d45 100755
--- a/website/agenda/planung/roles.cgi
+++ b/website/agenda/planung/roles.cgi
@@ -45,8 +45,7 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id};
my $request = {
diff --git a/website/agenda/planung/selectEvent.cgi b/website/agenda/planung/selectEvent.cgi
index 623b092..45bd09a 100755
--- a/website/agenda/planung/selectEvent.cgi
+++ b/website/agenda/planung/selectEvent.cgi
@@ -33,10 +33,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/selectSeries.cgi b/website/agenda/planung/selectSeries.cgi
index c723603..332b938 100755
--- a/website/agenda/planung/selectSeries.cgi
+++ b/website/agenda/planung/selectSeries.cgi
@@ -32,10 +32,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/series.cgi b/website/agenda/planung/series.cgi
index dc9d4d6..047bebc 100755
--- a/website/agenda/planung/series.cgi
+++ b/website/agenda/planung/series.cgi
@@ -1,13 +1,15 @@
#! /usr/bin/perl -w
+use warnings "all";
use strict;
-use warnings;
-no warnings 'redefine';
+
+#no warnings 'redefine';
use Data::Dumper;
-use URI::Escape;
+use URI::Escape();
use Encode();
+use utf8();
use params();
use config();
use log();
@@ -19,12 +21,12 @@ use project();
use studios();
use events();
use series();
-use series_schedule();
-use series_events();
use series_dates();
-use user_stats();
use markup();
use localization();
+use series_schedule();
+use series_events();
+use user_stats();
binmode STDOUT, ":utf8";
@@ -34,22 +36,20 @@ my $r = shift;
my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug};
my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
-return if ( ( !defined $user ) || ( $user eq '' ) );
+print STDERR Dumper($user);
+return if ( !defined $user ) || ( $user eq '' );
-#print STDERR $params->{project_id}."\n";
my $user_presets = uac::get_user_presets(
$config,
{
+ user => $user,
project_id => $params->{project_id},
- studio_id => $params->{studio_id},
- user => $user
+ studio_id => $params->{studio_id}
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
#print STDERR $params->{project_id}."\n";
my $request = {
diff --git a/website/agenda/planung/show-playout.cgi b/website/agenda/planung/show-playout.cgi
index f2aa6f2..3d9f950 100755
--- a/website/agenda/planung/show-playout.cgi
+++ b/website/agenda/planung/show-playout.cgi
@@ -25,9 +25,8 @@ my $r = shift;
my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug};
my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
-return if ( ( !defined $user ) || ( $user eq '' ) );
+return if ( !defined $user ) || ( $user eq '' );
-#print STDERR $params->{project_id}."\n";
my $user_presets = uac::get_user_presets(
$config,
{
@@ -37,12 +36,9 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
-#print STDERR $params->{project_id}."\n";
my $request = {
url => $ENV{QUERY_STRING} || '',
params => {
@@ -92,36 +88,39 @@ sub showPlayout {
}
}
+ my $today=time::time_to_date(time());
+ my $startDate=time::add_days_to_date( $today, -14 );
my $events = playout::get(
$config,
- {
+ {
project_id => $params->{project_id},
studio_id => $params->{studio_id},
- order => 'modified_at desc, start desc',
- limit => 500
+ order => 'modified_at asc, start asc',
+ from => $startDate
}
);
- # print ''.Dumper($events).'
';
unless ( defined $events ) {
uac::print_error("not found");
return;
}
+
for my $event (@$events) {
$event->{stream_size} =~ s/(\d)(\d\d\d)$/$1\.$2/g;
$event->{stream_size} =~ s/(\d)(\d\d\d\.\d\d\d)$/$1\.$2/g;
- $event->{duration} =~ s/(\d\.\d)(\d+)$/$1/g;
- $event->{duration} =~ s/(\d)\.0/$1/g;
+ $event->{duration} =~ s/(\d\.\d)(\d+)$/$1/g;
+ $event->{duration} =~ s/(\d)\.0/$1/g;
$event->{rms_left} = formatLoudness( $event->{rms_left} );
$event->{rms_right} = formatLoudness( $event->{rms_right} );
$event->{bitrate} = formatBitrate($event);
$event->{duration} = formatDuration($event);
+ if ($event->{start} lt $today){
+ $event->{class} = "past";
+ }
}
$params->{events} = $events;
-
- #print Dumper($events);
}
sub formatDuration {
@@ -129,10 +128,10 @@ sub formatDuration {
my $duration = $event->{duration};
return '' unless defined $duration;
return '' if $duration eq '';
- my $result = int( ( $duration + 3600 ) * 10 ) % 600;
+ my $result = ( ( $duration +30 ) % 60)-30;
my $class = "ok";
- $class = "warn" if $result > 1;
- $class = "error" if $result > 10;
+ $class = "warn" if abs($result) > 1;
+ $class = "error" if abs($result) > 2;
return sprintf( qq{%.01f
}, $class, $duration );
}
diff --git a/website/agenda/planung/showImage.cgi b/website/agenda/planung/showImage.cgi
index df610ca..2995215 100755
--- a/website/agenda/planung/showImage.cgi
+++ b/website/agenda/planung/showImage.cgi
@@ -34,10 +34,9 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
+
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/studio_timeslots.cgi b/website/agenda/planung/studio_timeslots.cgi
index 915076c..a938c6d 100755
--- a/website/agenda/planung/studio_timeslots.cgi
+++ b/website/agenda/planung/studio_timeslots.cgi
@@ -41,10 +41,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/studios.cgi b/website/agenda/planung/studios.cgi
index 9dd8724..554252f 100755
--- a/website/agenda/planung/studios.cgi
+++ b/website/agenda/planung/studios.cgi
@@ -34,10 +34,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/user_settings.cgi b/website/agenda/planung/user_settings.cgi
index f3e2fd4..6ec3955 100755
--- a/website/agenda/planung/user_settings.cgi
+++ b/website/agenda/planung/user_settings.cgi
@@ -32,10 +32,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/user_stats.cgi b/website/agenda/planung/user_stats.cgi
index 1457344..52a19aa 100755
--- a/website/agenda/planung/user_stats.cgi
+++ b/website/agenda/planung/user_stats.cgi
@@ -34,10 +34,9 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
+
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/users.cgi b/website/agenda/planung/users.cgi
index dc90d4b..408707d 100755
--- a/website/agenda/planung/users.cgi
+++ b/website/agenda/planung/users.cgi
@@ -30,10 +30,8 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
my $request = {
url => $ENV{QUERY_STRING} || '',
diff --git a/website/agenda/planung/work_time.cgi b/website/agenda/planung/work_time.cgi
index b2ab21e..95d15ac 100755
--- a/website/agenda/planung/work_time.cgi
+++ b/website/agenda/planung/work_time.cgi
@@ -41,12 +41,9 @@ my $user_presets = uac::get_user_presets(
}
);
$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' ) );
-$params->{project_id} = $user_presets->{project_id}
- if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
+$params = uac::setDefaultStudio( $params, $user_presets );
+$params = uac::setDefaultProject( $params, $user_presets );
-#print STDERR $params->{project_id}."\n";
my $request = {
url => $ENV{QUERY_STRING} || '',
params => {