From 07219ad3ee8f51d1f81a814a93618625a526ef51 Mon Sep 17 00:00:00 2001
From: Milan <mc@radiopiloten.de>
Date: Sun, 8 Mar 2020 14:16:58 +0100
Subject: [PATCH] set parameter strings with entry::set_strings

---
 website/agenda/planung/assignments.cgi | 18 ++++--------------
 website/agenda/planung/event.cgi       | 26 ++++++--------------------
 website/agenda/planung/series.cgi      | 23 +++++------------------
 website/agenda/planung/work-time.cgi   | 17 ++++-------------
 4 files changed, 19 insertions(+), 65 deletions(-)

diff --git a/website/agenda/planung/assignments.cgi b/website/agenda/planung/assignments.cgi
index 2a3c02c..898c1ac 100755
--- a/website/agenda/planung/assignments.cgi
+++ b/website/agenda/planung/assignments.cgi
@@ -392,22 +392,12 @@ sub check_params {
         $checked->{create_events}  = 0;
         $checked->{publish_events} = 0;
     }
-    for my $param ( 'frequency', 'duration', 'default_duration', 'create_events', 'publish_events', 'live',
-        'count_episodes' )
-    {
-        if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d+)/ ) ) {
-            $checked->{$param} = $1;
-        }
-    }
+    entry::set_numbers( $checked, $params, [
+        'frequency', 'duration', 'default_duration', 'create_events', 'publish_events', 'live']);
 
     #scalars
-    for my $param ( 'search', 'from', 'till' ) {
-        if ( defined $params->{$param} ) {
-            $checked->{$param} = $params->{$param};
-            $checked->{$param} =~ s/^\s+//g;
-            $checked->{$param} =~ s/\s+$//g;
-        }
-    }
+    entry::set_strings( $checked, $params, 
+        [ 'search', 'from', 'till' ]);
 
     return $checked;
 }
diff --git a/website/agenda/planung/event.cgi b/website/agenda/planung/event.cgi
index 4cb78d6..8a0d2aa 100755
--- a/website/agenda/planung/event.cgi
+++ b/website/agenda/planung/event.cgi
@@ -821,13 +821,9 @@ sub check_params {
     }
 
     #scalars
-    for my $param ( 'studio', 'search', 'from', 'till', 'hide_series' ) {
-        if ( defined $params->{$param} ) {
-            $checked->{$param} = $params->{$param};
-            $checked->{$param} =~ s/^\s+//g;
-            $checked->{$param} =~ s/\s+$//g;
-        }
-    }
+    entry::set_strings( $checked, $params, [
+        'studio', 'search', 'from', 'till', 'hide_series'
+    ]);
 
     #numbers
     for my $param ( 'duration', 'recurrence' ) {
@@ -847,23 +843,13 @@ sub check_params {
         }
     }
 
-    #strings
-    for my $param (
+    entry::set_strings( $checked, $params, [
         'series_name',  'title',        'excerpt',    'content',
         'topic',        'program',      'category',   'image',
         'series_image', 'user_content', 'user_title', 'user_excerpt',
         'podcast_url',  'archive_url',  'setImage',   'content_format'
-      )
-    {
-        if ( defined $params->{$param} ) {
-
-            #$checked->{$param}=uri_unescape();
-            $checked->{$param} = $params->{$param};
-            $checked->{$param} =~ s/^\s+//g;
-            $checked->{$param} =~ s/\s+$//g;
-        }
-    }
-
+    ]);
+    
     #dates
     for my $param ( 'start_date', 'end_date' ) {
         if (   ( defined $params->{$param} )
diff --git a/website/agenda/planung/series.cgi b/website/agenda/planung/series.cgi
index 198bc44..0e65e97 100755
--- a/website/agenda/planung/series.cgi
+++ b/website/agenda/planung/series.cgi
@@ -1469,15 +1469,11 @@ sub check_params {
     ]);
 
     #scalars
-    for my $param ( 'search', 'from', 'till', 'period_type' ) {
-        if ( defined $params->{$param} ) {
-            $checked->{$param} = $params->{$param};
-            $checked->{$param} =~ s/^\s+//g;
-            $checked->{$param} =~ s/\s+$//g;
-        }
-    }
+    entry::set_strings( $checked, $params, 
+        [ 'search', 'from', 'till', 'period_type' ]
+    );
 
-    for my $param (
+    entry::set_strings( $checked, $params, [
         'series_name',        'title',
         'excerpt',            'content',
         'topic',              'image',
@@ -1485,16 +1481,7 @@ sub check_params {
         'assign_event_title', 'comment',
         'podcast_url',        'archive_url',
         'setImage',           'content_format'
-      )
-    {
-        if ( defined $params->{$param} ) {
-
-            #$checked->{$param}=uri_unescape();
-            $checked->{$param} = $params->{$param};
-            $checked->{$param} =~ s/^\s+//g;
-            $checked->{$param} =~ s/\s+$//g;
-        }
-    }
+    ]);
 
     for my $attr ('start') {
         if (   ( defined $params->{$attr} )
diff --git a/website/agenda/planung/work-time.cgi b/website/agenda/planung/work-time.cgi
index a1c6d43..5fc5ec2 100755
--- a/website/agenda/planung/work-time.cgi
+++ b/website/agenda/planung/work-time.cgi
@@ -299,20 +299,11 @@ sub check_params {
         $checked->{create_events}  = 0;
         $checked->{publish_events} = 0;
     }
-    for my $param ( 'frequency', 'duration', 'default_duration' ) {
-        if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d+)/ ) ) {
-            $checked->{$param} = $1;
-        }
-    }
+    entry::set_numbers( $checked, $params, [ 'frequency', 'duration', 'default_duration' ]);
 
-    #scalars
-    for my $param ( 'from', 'till', 'period_type', 'type', 'title' ) {
-        if ( defined $params->{$param} ) {
-            $checked->{$param} = $params->{$param};
-            $checked->{$param} =~ s/^\s+//g;
-            $checked->{$param} =~ s/\s+$//g;
-        }
-    }
+    entry::set_strings( $checked, $params, 
+        [ 'from', 'till', 'period_type', 'type', 'title' ]
+    );
 
     for my $attr ('start') {
         if ( ( defined $params->{$attr} ) && ( $params->{$attr} =~ /(\d\d\d\d\-\d\d\-\d\d[ T]\d\d\:\d\d)/ ) ) {