remove CGI where possible

use mod_perl request with fallback to CGI::Simple where possible.

lib/calcms/auth.pm

@@ -3,7 +3,7 @@ package auth;
 use warnings "all";
 use strict;
 
-use CGI;
+use CGI::Simple();
 use CGI::Session qw(-ip-match);
 use CGI::Cookie();
 
@@ -21,22 +21,24 @@ my $debug             = 0;
 
 sub debug;
 
+#TODO: remove CGI
 sub get_user {
-    my $cgi    = shift;
     my $config = shift;
-
-    my %parms = $cgi->Vars();
-    my $parms = \%parms;
+    my $params = shift;
+    my $cgi    = shift;
 
     debug("get_user") if ($debug);
 
     # login or logout on action
-    if ( defined $parms->{action} ) {
-        if ( $parms->{action} eq 'login' ) {
-            my $user = login( $cgi, $config, $parms->{user}, $parms->{password} );
+    if ( defined $params->{action} ) {
+        if ( $params->{action} eq 'login' ) {
+            my $user = login( $config, $params->{user}, $params->{password} );
+            $cgi = new CGI::Simple() unless defined $cgi;
+
             $cgi->delete( 'user', 'password', 'uri', 'action' );
             return $user;
-        } elsif ( $parms->{action} eq 'logout' ) {
+        } elsif ( $params->{action} eq 'logout' ) {
+            $cgi = new CGI::Simple() unless defined $cgi;
             logout($cgi);
             $cgi->delete( 'user', 'password', 'uri', 'action' );
             return undef;
@@ -44,20 +46,20 @@ sub get_user {
     }
 
     # read session id from cookie
-    my $session_id = read_cookie($cgi);
+    my $session_id = read_cookie();
 
     # login if no cookie found
-    return show_login_form( $parms->{user}, 'Please login' ) unless defined $session_id;
+    return show_login_form( $params->{user}, 'Please login' ) unless defined $session_id;
 
     # read session
     my $session = read_session($session_id);
 
     # login if user not found
-    return show_login_form( $parms->{user}, 'unknown User' ) unless defined $session;
+    return show_login_form( $params->{user}, 'unknown User' ) unless defined $session;
 
-    $parms->{user}    = $session->{user};
-    $parms->{expires} = $session->{expires};
-    debug( $parms->{expires} );
+    $params->{user}    = $session->{user};
+    $params->{expires} = $session->{expires};
+    debug( $params->{expires} );
     return $session->{user}, $session->{expires};
 }
 
@@ -76,7 +78,6 @@ sub crypt_password {
 }
 
 sub login {
-    my $cgi      = shift;
     my $config   = shift;
     my $user     = shift;
     my $password = shift;
@@ -94,13 +95,14 @@ sub login {
     $timeout = '+' . $timeout . 'm';
 
     my $session_id = create_session( $user, $password, $timeout );
-    return $user if ( create_cookie( $cgi, $session_id, $timeout ) );
+    return $user if create_cookie( $session_id, $timeout );
     return undef;
 }
 
+#TODO: remove cgi
 sub logout {
     my $cgi        = shift;
-    my $session_id = read_cookie($cgi);
+    my $session_id = read_cookie();
     debug("logout") if ($debug);
     unless ( delete_session($session_id) ) {
         return show_login_form( 'Cant delete session', 'logged out' );
@@ -116,44 +118,34 @@ sub logout {
 
 #read and write data from browser, http://perldoc.perl.org/CGI/Cookie.html
 sub create_cookie {
-    my $cgi        = shift;
     my $session_id = shift;
     my $timeout    = shift;
 
-    #debug("create_cookie")if ($debug);
-
     my $cookie = CGI::Cookie->new(
         -name    => 'sessionID',
         -value   => $session_id,
         -expires => $timeout,
-
-        #		-domain  =>  '.capricorn.com',
-        #		-path    =>  '/agenda/admin/',
         -secure  => 1
     );
     print "Set-Cookie: ", $cookie->as_string, "\n";
     print STDERR "#Set-Cookie: ", $cookie->as_string, "\n";
 
-    #	print $cgi->header( -cookie => $cookie );
     return 1;
 }
 
 sub read_cookie {
-    my $cgi = shift;
-
     debug("read_cookie") if ($debug);
     my %cookie = CGI::Cookie->fetch;
     debug( "cookies: " . Dumper( \%cookie ) ) if ($debug);
     my $cookie = $cookie{'sessionID'};
     debug( "cookie: " . $cookie ) if ($debug);
-    return undef unless defined $cookie ;
+    return undef unless defined $cookie;
     my $session_id = $cookie->value || undef;
     debug( "sid: " . $session_id ) if ($debug);
     return $session_id;
-
-    #return $cgi->cookie('sessionID') || undef;
 }
 
+#TODO: remove CGI
 sub delete_cookie {
     my $cgi = shift;
 
@@ -179,7 +171,6 @@ sub create_session {
     $session->param( "user", $user );
     $session->param( "pid",  $$ );
 
-    #	$session->param("password", $password);
     return $session->id();
 }
 

lib/calcms/markup.pm

@@ -7,6 +7,7 @@ use Text::WikiCreole();
 use HTML::Parse();
 use HTML::FormatText();
 use Encode();
+use HTML::Entities();
 
 use log();
 
@@ -498,5 +499,10 @@ sub encode_xml_element_text {
 	return $text;
 }
 
+sub escapeHtml{
+    my $s=shift;
+    return HTML::Entities::encode_entities($s,q{&<>"'});
+}
+
 #do not delete last line!
 1;

lib/calcms/params.pm

@@ -4,7 +4,6 @@ use warnings "all";
 use strict;
 
 use Data::Dumper;
-use CGI();
 use Apache2::Request();
 
 use base 'Exporter';
@@ -50,8 +49,8 @@ sub get {
         #}
         $status = $req->parse;    #parse
     } else {
-
-		#print STDERR "CGI\n";
+        print STDERR "$0: require CGI\n";
+        require "CGI.pm";
         $CGI::POST_MAX     = $upload_limit;
         $CGI::TMPDIRECTORY = $tmp_dir;
         $cgi               = new CGI();
@@ -59,7 +58,6 @@ sub get {
         my %params = $cgi->Vars();
         $params = \%params;
     }
-	$cgi = new CGI() unless ( defined $cgi );
 
     $isJson = 1 if ( defined $params->{json} ) && ( $params->{json} eq '1' );
 

lib/calcms/uac.pm

@@ -2,7 +2,6 @@ package uac;
 use warnings "all";
 use strict;
 
-use CGI();
 use CGI::Session qw(-ip-match);
 use CGI::Cookie();
 use Data::Dumper;

website/agenda/add_comment.cgi

@@ -5,9 +5,6 @@ use diagnostics;
 use strict;
 use Data::Dumper;
 
-use CGI qw(header param Vars escapeHTML uploadInfo cgi_error);
-$CGI::POST_MAX=1024 * 100;
-
 use params();
 use config();
 use db();
@@ -242,7 +239,7 @@ sub escape_text{
 	$s=~s/<[a-z\!\?\[\/][^\>]+?\>//gi;
 	$s=~s/<[a-z\!\?\[\/]\>//gi;
 
-	$s=CGI::escapeHTML($s);
+    $s = markup::escapeHTML($s);
 	$s=~s/[\n\r]+/\<br \/\>/g;
 	$s=~s/\<br \/\>/\<br \/\>\n/g;
 	$s=~s/\<br \/\>\s*$//g;

website/agenda/aggregate.cgi

@@ -3,23 +3,31 @@
 use warnings "all";
 use strict;
 
-use CGI qw(header param Vars);
+#use CGI qw(header param Vars);
 
+use config();
+use params();
 use db();
 use events();
 use time();
 use aggregator();
 use markup();
 use log();
-use config();
 
 if ( $0 =~ /aggregate.*?\.cgi$/ ) {
     binmode STDOUT, ":encoding(UTF-8)";
 
-	#(my $cgi, my $params, my $error)=params::get($r);
-	my $cgi    = new CGI();
-	my %params = $cgi->Vars();
-	my $params = \%params;
+    my $params = {};
+    my $r      = shift;
+    #print STDERR ref($r)."\n";
+    if ( ref($r) eq '' ) {
+        for my $arg (@ARGV) {
+            my ( $key, $value ) = split( /\=/, $arg, 2 );
+            $params->{$key} = $value;
+        }
+    } else {
+        ( my $cgi, $params, my $error ) = params::get($r);
+    }
 
     my $config = config::getFromScriptLocation();
 
@@ -27,7 +35,6 @@ if ( $0 =~ /aggregate.*?\.cgi$/ ) {
     my $mem_debug = $config->{system}->{debug_memory};
     my $base_dir  = $config->{locations}->{base_dir};
 
-	#my $cgi=new CGI();
     my $output_header = '';
     if ( exists $ENV{REQUEST_URI} && $ENV{REQUEST_URI} ne '' ) {
         $output_header .= "Content-type:text/html; charset=UTF-8;\n\n";

website/agenda/cache/.htaccess

@@ -1,3 +1,2 @@
-Order deny,allow
-deny from all
+Require all denied
 

website/agenda/cache/programm/.htaccess

@@ -1,21 +1,19 @@
 <IfModule mod_rewrite.c>
-RewriteBase /programm
+    RewriteBase /programm
 
-RewriteEngine on
-RewriteCond  %{REQUEST_FILENAME} -f
-RewriteRule (.*) $1 [L]
-RewriteCond  %{REQUEST_FILENAME} -d
-RewriteRule (.*) $1 [L]
+    RewriteEngine on
+    RewriteCond  %{REQUEST_FILENAME} -f
+    RewriteRule (.*) $1 [L]
+    RewriteCond  %{REQUEST_FILENAME} -d
+    RewriteRule (.*) $1 [L]
 
-#controller
     RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})_(\d{4}-\d{2}-\d{2})\.html[\?]?(.*)$	/agenda/aggregate.cgi?from_date=$1&till_date=$2&$3 [L]
     RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})\.html[\?]?(.*)$          		/agenda/aggregate.cgi?date=$1&$2 [L]
     RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})\.html[\?]?(.*)$         		/agenda/aggregate.cgi?date=$1&$2 [L]
-# RewriteRule ^sendung/(\d+)\.html/[^&]*(&.*)?$                  		/agenda/aggregate.cgi?event_id=$1&$2 [L]
+    #  RewriteRule ^sendung/(\d+)\.html/[^&]*(&.*)?$                  		/agenda/aggregate.cgi?event_id=$1&$2 [L]
     RewriteRule ^sendung/(\d+)\.html[\?]?(.*)$                                 	/agenda/aggregate.cgi?event_id=$1&$2 [L]
     RewriteRule ^sendung/serie_plus/(\d+)\.html[\?]?(.*)$                         /agenda/aggregate.cgi?next_series=$1&$2 [L]
     RewriteRule ^sendung/serie_minus/(\d+)\.html[\?]?(.*)$                        /agenda/aggregate.cgi?previous_series=$1&$2 [L]
-#controller end
 </IfModule>
 
 Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
@@ -33,6 +31,5 @@ Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
 	AddHandler cgi-script .cgi .pl
 </IfModule>
 
-#Order allow,deny
-#allow from all
 Require all granted
+

website/agenda/cal.cgi

@@ -4,10 +4,6 @@
 use warnings "all";
 use strict;
 
-use CGI qw(header param Vars);
-$CGI::POST_MAX        = 1000;
-$CGI::DISABLE_UPLOADS = 1;
-
 use Data::Dumper;
 use params();
 use config();

website/agenda/category.cgi

@@ -3,9 +3,6 @@
 use strict;
 use warnings;
 use Data::Dumper;
-use CGI qw(header param Vars);
-$CGI::POST_MAX        = 1000;
-$CGI::DISABLE_UPLOADS = 1;
 
 use params();
 use db();

website/agenda/comments.cgi

@@ -2,9 +2,6 @@
 
 use warnings "all";
 use strict;
-use CGI qw(header param Vars);
-$CGI::POST_MAX        = 1000;
-$CGI::DISABLE_UPLOADS = 1;
 
 use Data::Dumper;
 

website/agenda/config/.htaccess

@@ -1,3 +1 @@
-Order deny,allow
-deny from all
-Require all granted
+Require all denied

website/agenda/events.cgi

@@ -6,11 +6,6 @@ no warnings 'redefine';
 
 use Data::Dumper;
 
-use DBI;
-use CGI qw(header param Vars);
-$CGI::POST_MAX        = 1000;
-$CGI::DISABLE_UPLOADS = 1;
-
 use params();
 use config();
 use log();

website/agenda/planung/assign_series.cgi

@@ -30,7 +30,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( !defined $user ) || ( $user eq '' );
 
 #print STDERR $params->{project_id}."\n";

website/agenda/planung/assignments.cgi

@@ -31,7 +31,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 #print STDERR $params->{project_id}."\n";

website/agenda/planung/audio_recordings.cgi

@@ -45,7 +45,7 @@ my $fh     = undef;
 $CGI::Simple::POST_MAX        = $uploadLimit;
 $CGI::Simple::DISABLE_UPLOADS = 0;
 
-$cgi = $cgi = CGI::Simple->new;
+$cgi = CGI::Simple->new;
 my $filename = $cgi->param('upload');
 $fh     = $cgi->upload($filename);
 $error  = $cgi->cgi_error() || '';
@@ -55,7 +55,7 @@ my $params = \%params;
 binmode $fh if defined $fh;
 
 #print "Content-type:text/html; charset=UTF-8;\n\n";
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 exit if ( !defined $user ) || ( $user eq '' );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/calendar.cgi

@@ -36,7 +36,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( !defined $user ) || ( $user eq '' );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/comment.cgi

@@ -31,7 +31,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( !defined $user ) || ( $user eq '' );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/create_events.cgi

@@ -25,7 +25,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 #print STDERR $params->{project_id}."\n";

website/agenda/planung/event.cgi

@@ -39,7 +39,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/event_history.cgi

@@ -30,7 +30,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets( $config, { user => $user, studio_id => $params->{studio_id} } );

website/agenda/planung/help.cgi

@@ -24,7 +24,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/image.cgi

@@ -8,7 +8,6 @@ use Data::Dumper;
 
 use File::stat();
 use Time::localtime();
-use CGI::Simple();
 use URI::Escape();
 
 use time();
@@ -31,11 +30,10 @@ binmode STDOUT, ":utf8";
 
 my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
-$CGI::POST_MAX = 1024 * 10;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/imageUpload.cgi

@@ -74,7 +74,7 @@ if ( defined $r ) {
     $params = \%params;
 }
 print "Content-type:text/html; charset=UTF-8;\n\n";
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/localization.cgi

@@ -20,7 +20,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( $user eq '' );
 
 my $request = {

website/agenda/planung/notify_events.cgi

@@ -28,7 +28,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/playout.cgi

@@ -33,7 +33,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 print "Content-type:text/html; charset=UTF-8;\n\n";

website/agenda/planung/projects.cgi

@@ -21,7 +21,7 @@ my $r = shift;
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
 
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( $user eq '' );
 
 my $permissions  = roles::get_user_permissions($config);

website/agenda/planung/roles.cgi

@@ -22,7 +22,7 @@ my $r = shift;
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
 
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 our $actions = {

website/agenda/planung/selectEvent.cgi

@@ -21,7 +21,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/selectSeries.cgi

@@ -20,7 +20,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/series.cgi

@@ -33,7 +33,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 #print STDERR $params->{project_id}."\n";

website/agenda/planung/show-playout.cgi

@@ -6,7 +6,6 @@ use warnings;
 use strict;
 
 use Data::Dumper;
-use CGI::Simple   ();
 use ModPerl::Util ();
 
 use config;
@@ -25,7 +24,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 #print STDERR $params->{project_id}."\n";

website/agenda/planung/showImage.cgi

@@ -22,7 +22,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/studio_timeslots.cgi

@@ -29,7 +29,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/studios.cgi

@@ -21,7 +21,7 @@ my $r = shift;
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
 
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( $user eq '' );
 
 my $permissions  = roles::get_user_permissions($config);

website/agenda/planung/user_settings.cgi

@@ -20,7 +20,7 @@ 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 );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/user_stats.cgi

@@ -22,7 +22,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 my $user_presets = uac::get_user_presets(

website/agenda/planung/users.cgi

@@ -19,7 +19,7 @@ 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 );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 my $user_presets = uac::get_user_presets(
 	$config,

website/agenda/planung/work_time.cgi

@@ -28,7 +28,7 @@ my $r = shift;
 
 my $config = config::get('../config/config.cgi');
 my $debug  = $config->{system}->{debug};
-my ( $user, $expires ) = auth::get_user( $cgi, $config );
+my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
 #print STDERR $params->{project_id}."\n";

website/agenda/series_names.cgi

@@ -7,10 +7,6 @@ use warnings "all";
 use strict;
 use Data::Dumper;
 
-use CGI qw(header param Vars);
-$CGI::POST_MAX        = 1000;
-$CGI::DISABLE_UPLOADS = 1;
-
 use params();
 use db();
 use markup();

website/agenda/upload_playout.cgi

@@ -3,10 +3,6 @@
 use warnings "all";
 use strict;
 
-use CGI qw(header param Vars);
-$CGI::POST_MAX        = 1000;
-$CGI::DISABLE_UPLOADS = 1;
-
 use Data::Dumper;
 
 use JSON();