kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove CGI where possible

Browse Source 
use mod_perl request with fallback to CGI::Simple where possible.
This commit is contained in:
Milan
2018-09-23 15:47:03 +02:00
parent 56881b92d0
commit 7ff41cecd2
42 changed files with 242 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/agenda/add_comment.cgi
View File

@@ -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;

237
website/agenda/aggregate.cgi
View File

@@ -3,167 +3,174 @@
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)";
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();
my $config = config::getFromScriptLocation();
my $debug = $config->{system}->{debug};
my $mem_debug = $config->{system}->{debug_memory};
my $base_dir = $config->{locations}->{base_dir};
my $debug = $config->{system}->{debug};
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";
}
my $output_header = '';
if ( exists $ENV{REQUEST_URI} && $ENV{REQUEST_URI} ne '' ) {
$output_header .= "Content-type:text/html; charset=UTF-8;\n\n";
}
$params->{exclude_locations} = 1;
$params->{exclude_projects} = 1;
$params->{exclude_event_images} = 1;
$params->{exclude_locations} = 1;
$params->{exclude_projects} = 1;
$params->{exclude_event_images} = 1;
# $output_header.='<!DOCTYPE html>'."\n";
my $request = {
url => $ENV{QUERY_STRING},
params => {
original => $params,
checked => aggregator::check_params( $config, $params ),
},
};
$params = $request->{params}->{checked};
# $output_header.='<!DOCTYPE html>'."\n";
my $request = {
url => $ENV{QUERY_STRING},
params => {
original => $params,
checked => aggregator::check_params( $config, $params ),
},
};
$params = $request->{params}->{checked};
my $mem = 0;
my $mem = 0;
#get result from cache
my $cache = aggregator::get_cache( $config, $request );
#get result from cache
my $cache = aggregator::get_cache( $config, $request );
if ( ( defined $cache->{content} ) && ( $cache->{content} ne '' ) ) {
my $content = $cache->{content};
print $output_header;
print $content;
return;
}
if ( ( defined $cache->{content} ) && ( $cache->{content} ne '' ) ) {
my $content = $cache->{content};
print $output_header;
print $content;
return;
}
my $content = load_file( $base_dir . './index.html' );
$content = $$content || '';
my $content = load_file( $base_dir . './index.html' );
$content = $$content || '';
#replace HTML escaped calcms_title span by unescaped one
$content =~ s/\&lt\;span id\=&quot\;calcms_title&quot\;\&gt\;[^\&]*\&lt\;\/span\&gt\;/\<span id=\"calcms_title\" \>\<\/span\>/g;
#replace HTML escaped calcms_title span by unescaped one
$content =~ s/\&lt\;span id\=&quot\;calcms_title&quot\;\&gt\;[^\&]*\&lt\;\/span\&gt\;/\<span id=\"calcms_title\" \>\<\/span\>/g;
# print $content;
# print $content;
my $list = aggregator::get_list( $config, $request );
my $list = aggregator::get_list( $config, $request );
my $menu = { content => '' };
my $menu = { content => '' };
$list->{day} = '' unless defined $list->{day};
$list->{day} = $params->{date} if ( defined $params->{date} ) && ( $params->{date} ne '' );
$list->{day} = $params->{from_date} if ( defined $params->{from_date} ) && ( $params->{from_date} ne '' );
$list->{day} = 'today' if $list->{day} eq '';
$list->{day} = '' unless defined $list->{day};
$list->{day} = $params->{date} if ( defined $params->{date} ) && ( $params->{date} ne '' );
$list->{day} = $params->{from_date} if ( defined $params->{from_date} ) && ( $params->{from_date} ne '' );
$list->{day} = 'today' if $list->{day} eq '';
$menu = aggregator::get_menu( $config, $request, $list->{day}, $list->{results} );
$menu = aggregator::get_menu( $config, $request, $list->{day}, $list->{results} );
my $calendar = aggregator::get_calendar( $config, $request, $list->{day} );
my $newest_comments = aggregator::get_newest_comments( $config, $request );
my $calendar = aggregator::get_calendar( $config, $request, $list->{day} );
my $newest_comments = aggregator::get_newest_comments( $config, $request );
#my $newest_comments={};
#db::disconnect($request) if (defined $request && defined $request->{connection});
#print STDERR "$list->{project_title}\n";
#my $newest_comments={};
#db::disconnect($request) if (defined $request && defined $request->{connection});
#print STDERR "$list->{project_title}\n";
#build results list
my $output = {};
$output->{calcms_menu} = \$menu->{content};
$output->{calcms_list} = \$list->{content};
$output->{calcms_calendar} = \$calendar->{content};
$output->{calcms_newest_comments} = \$newest_comments->{content};
#build results list
my $output = {};
$output->{calcms_menu} = \$menu->{content};
$output->{calcms_list} = \$list->{content};
$output->{calcms_calendar} = \$calendar->{content};
$output->{calcms_newest_comments} = \$newest_comments->{content};
# $output->{calcms_categories} = load_file($base_dir.'/cache/categories.html');
# $output->{calcms_series_names} = load_file($base_dir.'/cache/series_names.html');
# $output->{calcms_programs} = load_file($base_dir.'/cache/programs.html');
# $output->{calcms_categories} = load_file($base_dir.'/cache/categories.html');
# $output->{calcms_series_names} = load_file($base_dir.'/cache/series_names.html');
# $output->{calcms_programs} = load_file($base_dir.'/cache/programs.html');
my $url = $list->{url};
my $js = qq{
my $url = $list->{url};
my $js = qq{
set('preloaded','1');
set('last_list_url','$url');
};
$content =~ s/\/\/\s*(calcms_)?preload/$js/;
$content =~ s/\/\/\s*(calcms_)?preload/$js/;
#insert results into page
for my $key ( keys %$output ) {
my $val = ${ $output->{$key} };
my $start = index( $val, "<body>" );
if ( $start != -1 ) {
$val = substr( $val, $start + length('<body>') );
}
my $end = index( $val, "</body>" );
if ( $end != -1 ) {
$val = substr( $val, 0, $end );
}
$content =~ s/(<(div|span)\s+id="$key".*?>).*?(<\/(div|span)>)/$1$val$3/g;
}
#insert results into page
for my $key ( keys %$output ) {
my $val = ${ $output->{$key} };
my $start = index( $val, "<body>" );
if ( $start != -1 ) {
$val = substr( $val, $start + length('<body>') );
}
my $end = index( $val, "</body>" );
if ( $end != -1 ) {
$val = substr( $val, 0, $end );
}
$content =~ s/(<(div|span)\s+id="$key".*?>).*?(<\/(div|span)>)/$1$val$3/g;
}
#replace whole element span with id="calcms_title" by value
$list->{project_title} = '' unless ( defined $list->{project_title} );
$content =~ s/(<(div|span)\s+id="calcms_title".*?>).*?(<\/(div|span)>)/$list->{project_title}/g;
#replace whole element span with id="calcms_title" by value
$list->{project_title} = '' unless ( defined $list->{project_title} );
$content =~ s/(<(div|span)\s+id="calcms_title".*?>).*?(<\/(div|span)>)/$list->{project_title}/g;
my $values = [];
for my $value ( $list->{'program'}, $list->{'series_name'}, $list->{'title'}, $list->{'location'}, $list->{'project_title'} ) {
next unless defined $value;
next if $value eq '';
push @$values, $value;
}
my $values = [];
for my $value ( $list->{'program'}, $list->{'series_name'}, $list->{'title'}, $list->{'location'}, $list->{'project_title'} ) {
next unless defined $value;
next if $value eq '';
push @$values, $value;
}
my $title = join( ' - ', @$values );
my $title = join( ' - ', @$values );
$content =~ s/(<title>)(.*?)(<\/title>)/$1$title$3/;
$content =~ s/(<title>)(.*?)(<\/title>)/$1$title$3/;
$js = '';
if ( ( defined $list->{event_id} ) && ( $list->{event_id} ne '' ) ) {
$js .= qq{showCommentsByEventIdOrEventStart('$list->{event_id}','$list->{start_datetime}')};
}
$js = '';
if ( ( defined $list->{event_id} ) && ( $list->{event_id} ne '' ) ) {
$js .= qq{showCommentsByEventIdOrEventStart('$list->{event_id}','$list->{start_datetime}')};
}
$content =~ s/startCalcms\(\)\;/$js/gi;
$content =~ s/startCalcms\(\)\;/$js/gi;
#replace link to uncompressed or compressed drupal (first link in <head>)
my @parts = split( /<\/head>/, $content );
$parts[0] =~ s|/misc/jquery.js|/agenda_files/js/jquery.js|;
$parts[0] =~ s|/sites/default/files/js/[a-z0-9\_]+\.js|/agenda_files/js/jquery.js|;
$content = join( '</head>', @parts );
#replace link to uncompressed or compressed drupal (first link in <head>)
my @parts = split( /<\/head>/, $content );
$parts[0] =~ s|/misc/jquery.js|/agenda_files/js/jquery.js|;
$parts[0] =~ s|/sites/default/files/js/[a-z0-9\_]+\.js|/agenda_files/js/jquery.js|;
$content = join( '</head>', @parts );
print $output_header;
print $content;
print $output_header;
print $content;
if ( $config->{cache}->{use_cache} eq '1' ) {
$cache->{content} = $content;
cache::save($cache);
}
if ( $config->{cache}->{use_cache} eq '1' ) {
$cache->{content} = $content;
cache::save($cache);
}
# $config=undef;
$content = undef;
$cache = undef;
# $config=undef;
$content = undef;
$cache = undef;
}
sub load_file {
my $filename = shift;
my $content = "cannot load '$filename'";
open my $FILE, '<:utf8', $filename or return \$content;
$content = join( "", (<$FILE>) );
close $FILE;
return \$content;
my $filename = shift;
my $content = "cannot load '$filename'";
open my $FILE, '<:utf8', $filename or return \$content;
$content = join( "", (<$FILE>) );
close $FILE;
return \$content;
}

3
website/agenda/cache/.htaccess vendored
View File

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

33
website/agenda/cache/programm/.htaccess vendored
View File

@@ -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/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
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/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]
</IfModule>
Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
@@ -30,9 +28,8 @@ Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
</IfModule>
<IfModule !mod_perl.c>
AddHandler cgi-script .cgi .pl
AddHandler cgi-script .cgi .pl
</IfModule>
#Order allow,deny
#allow from all
Require all granted

4
website/agenda/cal.cgi
View File

@@ -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();

3
website/agenda/category.cgi
View File

@@ -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();

3
website/agenda/comments.cgi
View File

@@ -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;

4
website/agenda/config/.htaccess
View File

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

5
website/agenda/events.cgi
View File

@@ -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();

2
website/agenda/planung/assign_series.cgi
View File

@@ -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";

2
website/agenda/planung/assignments.cgi
View File

@@ -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";

4
website/agenda/planung/audio_recordings.cgi
View File

@@ -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(

2
website/agenda/planung/calendar.cgi
View File

@@ -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(

2
website/agenda/planung/comment.cgi
View File

@@ -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(

2
website/agenda/planung/create_events.cgi
View File

@@ -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";

2
website/agenda/planung/event.cgi
View File

@@ -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(

2
website/agenda/planung/event_history.cgi
View File

@@ -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} } );

2
website/agenda/planung/help.cgi
View File

@@ -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(

4
website/agenda/planung/image.cgi
View File

@@ -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(

2
website/agenda/planung/imageUpload.cgi
View File

@@ -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(

2
website/agenda/planung/localization.cgi
View File

@@ -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 = {

2
website/agenda/planung/notify_events.cgi
View File

@@ -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(

2
website/agenda/planung/playout.cgi
View File

@@ -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";

2
website/agenda/planung/projects.cgi
View File

@@ -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);

2
website/agenda/planung/roles.cgi
View File

@@ -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 = {

2
website/agenda/planung/selectEvent.cgi
View File

@@ -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(

2
website/agenda/planung/selectSeries.cgi
View File

@@ -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(

2
website/agenda/planung/series.cgi
View File

@@ -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";

3
website/agenda/planung/show-playout.cgi
View File

@@ -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";

2
website/agenda/planung/showImage.cgi
View File

@@ -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(

2
website/agenda/planung/studio_timeslots.cgi
View File

@@ -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(

2
website/agenda/planung/studios.cgi
View File

@@ -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);

2
website/agenda/planung/user_settings.cgi
View File

@@ -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(

2
website/agenda/planung/user_stats.cgi
View File

@@ -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(

2
website/agenda/planung/users.cgi
View File

@@ -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,

2
website/agenda/planung/work_time.cgi
View File

@@ -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";

4
website/agenda/series_names.cgi
View File

@@ -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();

4
website/agenda/upload_playout.cgi
View File

@@ -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();