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

51
lib/calcms/auth.pm
View File

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

6
lib/calcms/markup.pm
View File

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

6
lib/calcms/params.pm
View File

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

1
lib/calcms/uac.pm
View File

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

5
website/agenda/add_comment.cgi
View File

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

21
website/agenda/aggregate.cgi
View File

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

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

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

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

@@ -7,7 +7,6 @@ RewriteRule (.*) $1 [L]
RewriteCond %{REQUEST_FILENAME} -d RewriteCond %{REQUEST_FILENAME} -d
RewriteRule (.*) $1 [L] 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})_(\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 ^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 ^sendungen/(\d{4}-\d{2}-\d{2})\.html[\?]?(.*)$ /agenda/aggregate.cgi?date=$1&$2 [L]
@@ -15,7 +14,6 @@ RewriteRule (.*) $1 [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_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] RewriteRule ^sendung/serie_minus/(\d+)\.html[\?]?(.*)$ /agenda/aggregate.cgi?previous_series=$1&$2 [L]
#controller end
</IfModule> </IfModule>
Options -Indexes +FollowSymLinks +MultiViews +ExecCGI Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
@@ -33,6 +31,5 @@ Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
AddHandler cgi-script .cgi .pl AddHandler cgi-script .cgi .pl
</IfModule> </IfModule>
#Order allow,deny
#allow from all
Require all granted Require all granted

4
website/agenda/cal.cgi
View File

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

3
website/agenda/category.cgi
View File

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

3
website/agenda/comments.cgi
View File

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

4
website/agenda/config/.htaccess
View File

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

5
website/agenda/events.cgi
View File

@@ -6,11 +6,6 @@ no warnings 'redefine';
use Data::Dumper; use Data::Dumper;
use DBI;
use CGI qw(header param Vars);
$CGI::POST_MAX = 1000;
$CGI::DISABLE_UPLOADS = 1;
use params(); use params();
use config(); use config();
use log(); 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ); return if ( !defined $user ) || ( $user eq '' );
#print STDERR $params->{project_id}."\n"; #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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
#print STDERR $params->{project_id}."\n"; #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::POST_MAX = $uploadLimit;
$CGI::Simple::DISABLE_UPLOADS = 0; $CGI::Simple::DISABLE_UPLOADS = 0;
$cgi = $cgi = CGI::Simple->new; $cgi = CGI::Simple->new;
my $filename = $cgi->param('upload'); my $filename = $cgi->param('upload');
$fh = $cgi->upload($filename); $fh = $cgi->upload($filename);
$error = $cgi->cgi_error() || ''; $error = $cgi->cgi_error() || '';
@@ -55,7 +55,7 @@ my $params = \%params;
binmode $fh if defined $fh; binmode $fh if defined $fh;
#print "Content-type:text/html; charset=UTF-8;\n\n"; #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 '' ); exit if ( !defined $user ) || ( $user eq '' );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ); return if ( !defined $user ) || ( $user eq '' );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ); return if ( !defined $user ) || ( $user eq '' );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
#print STDERR $params->{project_id}."\n"; #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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( $config, { user => $user, studio_id => $params->{studio_id} } ); 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 File::stat();
use Time::localtime(); use Time::localtime();
use CGI::Simple();
use URI::Escape(); use URI::Escape();
use time(); use time();
@@ -31,11 +30,10 @@ binmode STDOUT, ":utf8";
my $r = shift; my $r = shift;
( my $cgi, my $params, my $error ) = params::get($r); ( my $cgi, my $params, my $error ) = params::get($r);
$CGI::POST_MAX = 1024 * 10;
my $config = config::get('../config/config.cgi'); my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( my $user_presets = uac::get_user_presets(

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

@@ -74,7 +74,7 @@ if ( defined $r ) {
$params = \%params; $params = \%params;
} }
print "Content-type:text/html; charset=UTF-8;\n\n"; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ); return if ( $user eq '' );
my $request = { 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
print "Content-type:text/html; charset=UTF-8;\n\n"; 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ); return if ( $user eq '' );
my $permissions = roles::get_user_permissions($config); 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
our $actions = { 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
#print STDERR $params->{project_id}."\n"; #print STDERR $params->{project_id}."\n";

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

@@ -6,7 +6,6 @@ use warnings;
use strict; use strict;
use Data::Dumper; use Data::Dumper;
use CGI::Simple ();
use ModPerl::Util (); use ModPerl::Util ();
use config; use config;
@@ -25,7 +24,7 @@ my $r = shift;
my $config = config::get('../config/config.cgi'); my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
#print STDERR $params->{project_id}."\n"; #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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ); return if ( $user eq '' );
my $permissions = roles::get_user_permissions($config); 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 $cgi, my $params, my $error ) = params::get($r);
my $config = config::get('../config/config.cgi'); my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( 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 $cgi, my $params, my $error ) = params::get($r);
my $config = config::get('../config/config.cgi'); my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( my $user_presets = uac::get_user_presets(
$config, $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 $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; 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 '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
#print STDERR $params->{project_id}."\n"; #print STDERR $params->{project_id}."\n";

4
website/agenda/series_names.cgi
View File

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

4
website/agenda/upload_playout.cgi
View File

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