Merge remote-tracking branch 'calcms/master'

studios: remove google_calendar field
uac.pm: add admin permission
remove deprecated role model
Remove past recordings
fixup! category: remove
Configure event notification sender email address

website/agenda/config/config.cgi.off

@@ -72,6 +72,7 @@ domain                      ${DOMAIN}
     # multi language support
     admin_pot_dir           ${BASE_DIR}/agenda/planung/pot/
     email                   info@${DOMAIN}
+    event_sender_email      programm@${DOMAIN}
     theme                   default
 </locations>
 

website/agenda/planung/assign-series.cgi

@@ -15,7 +15,6 @@ use log();
 use template();
 use auth();
 use uac();
-use roles();
 use project();
 use studios();
 use events();

website/agenda/planung/assignments.cgi

@@ -14,7 +14,6 @@ use log();
 use template();
 use auth();
 use uac();
-use roles();
 use project();
 use studios();
 use events();

website/agenda/planung/calendar.cgi

@@ -20,7 +20,6 @@ use template();
 use calendar();
 use auth();
 use uac();
-use roles();
 use project();
 use studios();
 use events();

website/agenda/planung/event.cgi

@@ -20,7 +20,6 @@ use db();
 use auth();
 use uac();
 
-#use roles;
 use time();
 use markup();
 use project();

website/agenda/planung/help.cgi

@@ -14,7 +14,6 @@ use log();
 use template();
 use auth();
 use uac();
-use roles();
 use studios();
 use markup();
 use localization();

website/agenda/planung/notify-events.cgi

@@ -202,12 +202,12 @@ sub getMail {
         $event->{noRecipient} = 1;
         return;
     }
-
+    my $sender = $config->{location}->{event_sender_email};
     my $mail = {
-        'From'     => 'programm@radiopiloten.de',
+        'From'     => $sender,
         'To'       => join( ', ', @$userMails ),
-        'Cc'       => 'programm@radiopiloten.de',
-        'Reply-To' => 'programm@radiopiloten.de',
+        'Cc'       => $sender,
+        'Reply-To' => $sender,
         'Subject'  => "$event->{start} - $event->{full_title}",
         'Data'     => "Hallo " . join( ' und ', @$userNames ) . ",\n\n"
     };

website/agenda/planung/playout.cgi

@@ -15,7 +15,6 @@ use log();
 use template();
 use auth();
 use uac();
-use roles();
 use project();
 use studios();
 use events();

website/agenda/planung/pot/de/studios.po

@@ -40,6 +40,3 @@ msgstr "Logo"
 msgid "label_stream"
 msgstr "Stream-URL"
 
-msgid "label_google_calendar"
-msgstr "Google Kalender"
-

website/agenda/planung/pot/en/studios.po

@@ -39,7 +39,3 @@ msgstr "image"
 
 msgid "label_stream"
 msgstr "stream"
-
-msgid "label_google_calendar"
-msgstr "google_calendar"
-

website/agenda/planung/projects.cgi

@@ -12,7 +12,6 @@ use params();
 use log();
 use template();
 use auth();
-use roles();
 use uac();
 use studios();
 use series();
@@ -26,7 +25,6 @@ my $config = config::get('../config/config.cgi');
 my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( $user eq '' );
 
-my $permissions  = roles::get_user_permissions($config);
 my $user_presets = uac::get_user_presets(
     $config,
     {

website/agenda/planung/roles.cgi

@@ -12,7 +12,6 @@ use entry();
 use log();
 use template();
 use auth();
-use roles();
 use uac();
 use studios();
 use localization();
@@ -152,8 +151,14 @@ sub save_roles {
                     }
                 } elsif ( $column eq 'role' ) {
                     $values->{$id}->{$column} = $value;
+                } elsif ( $column eq 'admin' ) {
+                    if ( $permissions->{is_admin} ){
+                        $values->{$id}->{$column} = $value;
+                    } else {
+                        uac::permissions_denied("set admin!");
+                        return;
+                    }
                 } elsif ( $column eq 'id' || $column eq 'project_id' || $column eq 'studio_id' ) {
-
                     #id and studio id will be set later
                 } else {
                     $values->{$id}->{$column} = 1 if ( $value =~ /^\d+$/ );
@@ -310,7 +315,6 @@ sub show_roles {
     }
 
     for my $role (@$roles) {
-
         my $id    = $role->{id}   || '';
         my $value = $role->{role} || '';
         my $style = '';

website/agenda/planung/series.cgi

@@ -16,7 +16,6 @@ use log();
 use template();
 use auth();
 use uac();
-use roles();
 use project();
 use studios();
 use events();

website/agenda/planung/studio-timeslots.cgi

@@ -14,7 +14,6 @@ use log();
 use template();
 use auth();
 use uac();
-use roles();
 use project();
 use studios();
 use studio_timeslot_schedule();

website/agenda/planung/studios.cgi

@@ -12,7 +12,6 @@ use params();
 use log();
 use template();
 use auth();
-use roles();
 use uac();
 use studios();
 use series();
@@ -26,7 +25,6 @@ my $config = config::get('../config/config.cgi');
 my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( $user eq '' );
 
-my $permissions  = roles::get_user_permissions($config);
 my $user_presets = uac::get_user_presets(
     $config,
     {
@@ -220,7 +218,7 @@ sub check_params {
     $checked->{action} = entry::element_of( $params->{action}, ['save', 'delete']);
 
     entry::set_strings( $checked, $params, [
-        'name', 'description', 'location', 'stream', 'google_calendar', 'image', 'setImage' ]);
+        'name', 'description', 'location', 'stream', 'image', 'setImage' ]);
 
     entry::set_numbers( $checked, $params, [
         'project_id', 'studio_id', 'default_studio_id', 'id'

website/agenda/planung/user-settings.cgi

@@ -13,7 +13,6 @@ use template();
 use auth();
 use entry();
 use uac();
-use roles();
 use project();
 use studios();
 use params();

website/agenda/planung/user-stats.cgi

@@ -12,7 +12,6 @@ use log();
 use template();
 use auth();
 use uac();
-use roles();
 use project();
 use studios();
 use params();

website/agenda/planung/users.cgi

@@ -12,7 +12,6 @@ use log();
 use template();
 use auth();
 use uac();
-use roles();
 use studios();
 use params();
 use localization();

website/agenda/planung/work-time.cgi

@@ -13,7 +13,6 @@ use log();
 use template();
 use auth();
 use uac();
-use roles();
 use project();
 use studios();
 use work_schedule();