From f9c4e183dfca12bc3be5464385d3314f8f265749 Mon Sep 17 00:00:00 2001
From: Milan <mc@radiopiloten.de>
Date: Thu, 26 Mar 2020 16:11:59 +0100
Subject: [PATCH] uue same order of imports

---
 website/agenda/planung/assign-series.cgi    |  2 +-
 website/agenda/planung/assignments.cgi      |  1 +
 website/agenda/planung/audio-recordings.cgi |  9 ++++-----
 website/agenda/planung/calendar.cgi         |  1 +
 website/agenda/planung/comment.cgi          |  1 +
 website/agenda/planung/create-events.cgi    |  2 +-
 website/agenda/planung/event.cgi            | 13 ++++++-------
 website/agenda/planung/help.cgi             |  1 +
 website/agenda/planung/image-upload.cgi     |  1 +
 website/agenda/planung/localization.cgi     |  1 +
 website/agenda/planung/notify-events.cgi    |  1 +
 website/agenda/planung/playout.cgi          |  1 +
 website/agenda/planung/projects.cgi         |  1 +
 website/agenda/planung/request-password.cgi |  1 +
 website/agenda/planung/series.cgi           |  2 +-
 website/agenda/planung/studio-timeslots.cgi |  1 +
 website/agenda/planung/studios.cgi          |  1 +
 website/agenda/planung/user-settings.cgi    |  1 +
 website/agenda/planung/user-stats.cgi       |  2 +-
 19 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/website/agenda/planung/assign-series.cgi b/website/agenda/planung/assign-series.cgi
index c79dce0..e338eaf 100755
--- a/website/agenda/planung/assign-series.cgi
+++ b/website/agenda/planung/assign-series.cgi
@@ -10,8 +10,8 @@ use Encode();
 
 use params();
 use config();
-use log();
 use entry();
+use log();
 use template();
 use auth();
 use uac();
diff --git a/website/agenda/planung/assignments.cgi b/website/agenda/planung/assignments.cgi
index b3d72d5..1bf0f10 100755
--- a/website/agenda/planung/assignments.cgi
+++ b/website/agenda/planung/assignments.cgi
@@ -9,6 +9,7 @@ use Encode();
 
 use params();
 use config();
+use entry();
 use log();
 use template();
 use auth();
diff --git a/website/agenda/planung/audio-recordings.cgi b/website/agenda/planung/audio-recordings.cgi
index a142df6..d80692b 100755
--- a/website/agenda/planung/audio-recordings.cgi
+++ b/website/agenda/planung/audio-recordings.cgi
@@ -5,7 +5,7 @@ use warnings;
 no warnings 'redefine';
 
 use Data::Dumper;
-use CGI::Simple   ();
+use CGI::Simple();
 use ModPerl::Util ();
 use Date::Calc();
 use Time::Local();
@@ -144,6 +144,7 @@ sub uploadRecording {
         #$params->{duration} = $fileInfo->{duration};
         $params = updateDatabase( $config, $params, $user ) if $params->{error} eq '';
     } else {
+        print STDERR "could not get file handle\n";
         $params->{error} .= 'Could not get file handle';
     }
 
@@ -554,11 +555,9 @@ sub check_params {
         $checked->{studio_id} = -1;
     }
 
-    $checked->{action} = entry::element_of($params->{action}, 
-        ['update', 'delete']);
+    $checked->{action} = entry::element_of( $params->{action}, ['upload', 'delete'] );
 
-    entry::set_strings( $checked, $params, [
-        'name', 'description', 'path' ]);
+    entry::set_strings( $checked, $params, [ 'name', 'description', 'path' ]);
 
     $checked->{upload} = $params->{upload};
     return $checked;
diff --git a/website/agenda/planung/calendar.cgi b/website/agenda/planung/calendar.cgi
index 2929a53..6302da7 100755
--- a/website/agenda/planung/calendar.cgi
+++ b/website/agenda/planung/calendar.cgi
@@ -11,6 +11,7 @@ use DateTime();
 use utf8();
 use params();
 use config();
+use entry();
 use log();
 use entry();
 use template();
diff --git a/website/agenda/planung/comment.cgi b/website/agenda/planung/comment.cgi
index 3f61201..fe6105c 100755
--- a/website/agenda/planung/comment.cgi
+++ b/website/agenda/planung/comment.cgi
@@ -12,6 +12,7 @@ use Encode::Locale();
 
 use params();
 use config();
+use entry();
 use log();
 use template();
 use db();
diff --git a/website/agenda/planung/create-events.cgi b/website/agenda/planung/create-events.cgi
index f104988..4194792 100755
--- a/website/agenda/planung/create-events.cgi
+++ b/website/agenda/planung/create-events.cgi
@@ -8,8 +8,8 @@ use Data::Dumper;
 
 use params();
 use config();
+use entry();
 use template();
-
 use auth();
 use uac();
 use time();
diff --git a/website/agenda/planung/event.cgi b/website/agenda/planung/event.cgi
index f7a2b36..7a2ddd3 100755
--- a/website/agenda/planung/event.cgi
+++ b/website/agenda/planung/event.cgi
@@ -11,8 +11,8 @@ use Encode::Locale();
 
 use params();
 use config();
-use log();
 use entry();
+use log();
 use template();
 use db();
 use auth();
@@ -843,11 +843,10 @@ sub check_params {
         }
     }
 
-    $checked->{action} = entry::element_of($params->{action}, 
-        [qw{
-          save delete download show_new_event show_new_event_from_schedule
-          create_event create_event_from_schedule get_json
-        }]
-    );
+    $checked->{action} = entry::element_of( $params->{action}, 
+        [ 'save', 'delete', 'download', 'show_new_event', 'show_new_event_from_schedule', 
+          'create_event', 'create_event_from_schedule', 'get_json'
+        ]
+    )//'';
     return $checked;
 }
diff --git a/website/agenda/planung/help.cgi b/website/agenda/planung/help.cgi
index 43d5be0..0089709 100755
--- a/website/agenda/planung/help.cgi
+++ b/website/agenda/planung/help.cgi
@@ -9,6 +9,7 @@ use URI::Escape();
 
 use params();
 use config();
+use entry();
 use log();
 use template();
 use auth();
diff --git a/website/agenda/planung/image-upload.cgi b/website/agenda/planung/image-upload.cgi
index adeb683..31a9aec 100755
--- a/website/agenda/planung/image-upload.cgi
+++ b/website/agenda/planung/image-upload.cgi
@@ -18,6 +18,7 @@ use Image::Magick();
 use Image::Magick::Square;
 
 use config();
+use entry();
 use auth();
 use uac();
 use studios();
diff --git a/website/agenda/planung/localization.cgi b/website/agenda/planung/localization.cgi
index dcb9b1d..e79115d 100755
--- a/website/agenda/planung/localization.cgi
+++ b/website/agenda/planung/localization.cgi
@@ -10,6 +10,7 @@ use JSON();
 use config();
 use params();
 use log();
+use entry();
 use auth();
 use localization();
 
diff --git a/website/agenda/planung/notify-events.cgi b/website/agenda/planung/notify-events.cgi
index f7fbf8b..b7a283d 100755
--- a/website/agenda/planung/notify-events.cgi
+++ b/website/agenda/planung/notify-events.cgi
@@ -10,6 +10,7 @@ use MIME::Lite();
 
 use params();
 use config();
+use entry();
 use log();
 use template();
 use db();
diff --git a/website/agenda/planung/playout.cgi b/website/agenda/planung/playout.cgi
index efa560e..34aa720 100755
--- a/website/agenda/planung/playout.cgi
+++ b/website/agenda/planung/playout.cgi
@@ -10,6 +10,7 @@ use URI::Escape();
 use localization();
 use params();
 use config();
+use entry();
 use log();
 use template();
 use auth();
diff --git a/website/agenda/planung/projects.cgi b/website/agenda/planung/projects.cgi
index f0d8fe3..1a0684d 100755
--- a/website/agenda/planung/projects.cgi
+++ b/website/agenda/planung/projects.cgi
@@ -7,6 +7,7 @@ no warnings 'redefine';
 use Data::Dumper;
 
 use config();
+use entry();
 use params();
 use log();
 use template();
diff --git a/website/agenda/planung/request-password.cgi b/website/agenda/planung/request-password.cgi
index 0bc8781..6b89334 100755
--- a/website/agenda/planung/request-password.cgi
+++ b/website/agenda/planung/request-password.cgi
@@ -8,6 +8,7 @@ use Data::Dumper;
 
 use params();
 use config();
+use entry();
 use db();
 use auth();
 use password_requests();
diff --git a/website/agenda/planung/series.cgi b/website/agenda/planung/series.cgi
index 112767c..07cda8f 100755
--- a/website/agenda/planung/series.cgi
+++ b/website/agenda/planung/series.cgi
@@ -1232,7 +1232,7 @@ sub show_series {
     }
 
     for my $value ('markdown', 'creole'){
-        $params->{"content_format_$value"}=1 if $params->{content_format} eq $value;
+        $params->{"content_format_$value"}=1 if ($params->{content_format}//'') eq $value;
     }
 
     $params->{loc} =
diff --git a/website/agenda/planung/studio-timeslots.cgi b/website/agenda/planung/studio-timeslots.cgi
index 84f0f24..349fa58 100755
--- a/website/agenda/planung/studio-timeslots.cgi
+++ b/website/agenda/planung/studio-timeslots.cgi
@@ -9,6 +9,7 @@ use URI::Escape();
 
 use params();
 use config();
+use entry();
 use log();
 use template();
 use auth();
diff --git a/website/agenda/planung/studios.cgi b/website/agenda/planung/studios.cgi
index 8e74521..cb3f431 100755
--- a/website/agenda/planung/studios.cgi
+++ b/website/agenda/planung/studios.cgi
@@ -7,6 +7,7 @@ no warnings 'redefine';
 use Data::Dumper;
 
 use config();
+use entry();
 use params();
 use log();
 use template();
diff --git a/website/agenda/planung/user-settings.cgi b/website/agenda/planung/user-settings.cgi
index f1eca32..9224ea5 100755
--- a/website/agenda/planung/user-settings.cgi
+++ b/website/agenda/planung/user-settings.cgi
@@ -7,6 +7,7 @@ no warnings 'redefine';
 use Data::Dumper;
 
 use config();
+use entry();
 use log();
 use template();
 use auth();
diff --git a/website/agenda/planung/user-stats.cgi b/website/agenda/planung/user-stats.cgi
index 24d49ae..a14c0f9 100755
--- a/website/agenda/planung/user-stats.cgi
+++ b/website/agenda/planung/user-stats.cgi
@@ -7,10 +7,10 @@ no warnings 'redefine';
 use Data::Dumper;
 
 use config();
+use entry();
 use log();
 use template();
 use auth();
-use entry();
 use uac();
 use roles();
 use project();