From 94899fc98c0683b7f3fda6e4b9e0abc7d3923a92 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 28 Jan 2010 11:03:13 +0100 Subject: [PATCH] Gemeinsamen Code von admin.pl und dispatcher.fpl nach SL/Dispatcher.pm verschoben. --- SL/Dispatcher.pm | 184 +++++++++++++++++++++++++++++++++++++++++++++++ admin.pl | 137 +---------------------------------- dispatcher.fpl | 154 ++------------------------------------- 3 files changed, 191 insertions(+), 284 deletions(-) create mode 100644 SL/Dispatcher.pm diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm new file mode 100644 index 000000000..9d968ad0e --- /dev/null +++ b/SL/Dispatcher.pm @@ -0,0 +1,184 @@ +package SL::Dispatcher; + +use strict; + +use CGI qw( -no_xhtml); +use English qw(-no_match_vars); +use SL::Auth; +use SL::LXDebug; +use SL::Locale; +use SL::Common; +use Form; +use Moose; +use Rose::DB; +use Rose::DB::Object; +use File::Basename; + +sub pre_request_checks { + show_error('login/auth_db_unreachable') unless $::auth->session_tables_present; + $::auth->expire_sessions; +} + +sub show_error { + $::lxdebug->enter_sub; + my $template = shift; + my $error_type = shift || ''; + my $locale = Locale->new($::language, 'all'); + $::form->{error} = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session'); + $::form->{error} = $::locale->text('Incorrect password!.') if ($error_type eq 'password'); + $::myconfig{countrycode} = $::language; + $::form->{stylesheet} = 'css/lx-office-erp.css'; + + $::form->header; + print $::form->parse_html_template($template); + $::lxdebug->leave_sub; + + exit; +} + +sub pre_startup_setup { + eval { + package main; + require "config/lx-erp.conf"; + }; + eval { + package main; + require "config/lx-erp-local.conf"; + } if -f "config/lx-erp-local.conf"; + + eval { + package main; + require "bin/mozilla/common.pl"; + require "bin/mozilla/installationcheck.pl"; + } or die $EVAL_ERROR; + + # dummy globals + { + no warnings 'once'; + $::userspath = "users"; + $::templates = "templates"; + $::memberfile = "users/members"; + $::sendmail = "| /usr/sbin/sendmail -t"; + $::lxdebug = LXDebug->new; + $::auth = SL::Auth->new; + %::myconfig = (); + } +} + +sub pre_startup_checks { + ::verify_installation(); +} + +sub pre_startup { + pre_startup_setup(); + pre_startup_checks(); +} + +sub require_main_code { + my ($script, $suffix) = @_; + + eval { + package main; + require "bin/mozilla/$script$suffix"; + } or die $EVAL_ERROR; + + if (-f "bin/mozilla/custom_$script$suffix") { + eval { + package main; + require "bin/mozilla/custom_$script$suffix"; + }; + $::form->error($EVAL_ERROR) if ($EVAL_ERROR); + } + if ($::form->{login} && -f "bin/mozilla/$::form->{login}_$::form->{script}") { + eval { + package main; + require "bin/mozilla/$::form->{login}_$::form->{script}"; + }; + $::form->error($EVAL_ERROR) if ($EVAL_ERROR); + } +} + +sub handle_request { + $::lxdebug->enter_sub; + $::lxdebug->begin_request; + + my $interface = lc(shift || 'cgi'); + my $script_name; + + if ($interface =~ m/^(?:fastcgi|fcgid|fcgi)$/) { + $script_name = $ENV{SCRIPT_NAME}; + unrequire_bin_mozilla(); + + } else { + $script_name = $0; + } + + my ($script, $path, $suffix) = fileparse($script_name, ".pl"); + require_main_code($script, $suffix); + + $::cgi = CGI->new(''); + $::locale = Locale->new($::language, $script); + $::form = Form->new; + $::form->{script} = $script . $suffix; + + pre_request_checks(); + + eval { + if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') { + $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}"; + ::run($::auth->restore_session); + + } elsif ($::form->{action}) { + # copy from am.pl routines + $::form->error($::locale->text('System currently down for maintenance!')) if -e "$main::userspath/nologin" && $script ne 'admin'; + + my $session_result = $::auth->restore_session; + + show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result; + %::myconfig = $::auth->read_user($::form->{login}); + + show_error('login/password_error', 'password') unless $::myconfig{login}; + + $::locale = Locale->new($::myconfig{countrycode}, $script); + + show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}, 0); + + $::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password}); + $::auth->create_or_refresh_session; + delete $::form->{password}; + + map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset) + unless $::form->{action} eq 'save' && $::form->{type} eq 'preferences'; + + $::form->set_standard_title; + ::call_sub('::' . $::locale->findsub($::form->{action})); + + } else { + $::form->error($::locale->text('action= not defined!')); + } + + 1; + } or do { + $::form->{label_error} = $::cgi->pre($EVAL_ERROR); + show_error('generic/error'); + }; + + # cleanup + $::locale = undef; + $::form = undef; + $::myconfig = (); + + $::lxdebug->end_request; + $::lxdebug->leave_sub; +} + +sub unrequire_bin_mozilla { + for (keys %INC) { + next unless m#^bin/mozilla/#; + next if /\bcommon.pl$/; + next if /\binstallationcheck.pl$/; + delete $INC{$_}; + } +} + +1; diff --git a/admin.pl b/admin.pl index 8ae43c6fb..ef97a15a1 100755 --- a/admin.pl +++ b/admin.pl @@ -8,140 +8,9 @@ BEGIN { push @INC, "SL"; # FCGI won't find modules that are not properly named. Help it by inclduging SL } -use FCGI; -use CGI qw( -no_xhtml); -use SL::Auth; -use SL::LXDebug; -use SL::Locale; -use SL::Common; -use Form; -use Moose; -use Rose::DB; -use Rose::DB::Object; -use File::Basename; +use SL::Dispatcher; -my ($script, $path, $suffix) = fileparse($0, ".pl"); -my $request = FCGI::Request(); - -eval { require "config/lx-erp.conf"; }; -eval { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf"; -require "bin/mozilla/common.pl"; -require "bin/mozilla/installationcheck.pl"; -require_main_code($script, $suffix); - -# dummy globals -{ - no warnings 'once'; - $::userspath = "users"; - $::templates = "templates"; - $::memberfile = "users/members"; - $::sendmail = "| /usr/sbin/sendmail -t"; - $::lxdebug = LXDebug->new; - $::auth = SL::Auth->new; - %::myconfig = (); -} - -_pre_startup_checks(); - -if ($request->IsFastCGI) { - handle_request() while $request->Accept() >= 0; -} else { - handle_request(); -} - -# end - -sub handle_request { - $::lxdebug->enter_sub; - $::lxdebug->begin_request; - $::cgi = CGI->new(''); - $::locale = Locale->new($::language, $script); - $::form = Form->new; - $::form->{script} = $script . $suffix; - - _pre_request_checks(); - - eval { - if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') { - $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}"; - run($::auth->restore_session); - } elsif ($::form->{action}) { - # copy from am.pl routines - $::form->error($::locale->text('System currently down for maintenance!')) if -e "$main::userspath/nologin" && $script ne 'admin'; - - my $session_result = $::auth->restore_session; - - _show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result; - %::myconfig = $::auth->read_user($::form->{login}); - - _show_error('login/password_error', 'password') unless $::myconfig{login}; - - $::locale = Locale->new($::myconfig{countrycode}, $script); - - _show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}, 0); - - $::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password}); - $::auth->create_or_refresh_session; - delete $::form->{password}; - - map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset) - unless $::form->{action} eq 'save' && $::form->{type} eq 'preferences'; - - $::form->set_standard_title; - call_sub($::locale->findsub($::form->{action})); - } else { - $::form->error($::locale->text('action= not defined!')); - } - }; - - # cleanup - $::locale = undef; - $::form = undef; - $::myconfig = (); - - $::lxdebug->end_request; - $::lxdebug->leave_sub; -} - -sub _pre_request_checks { - _show_error('login/auth_db_unreachable') unless $::auth->session_tables_present; - $::auth->expire_sessions; -} - -sub _show_error { - $::lxdebug->enter_sub; - my $template = shift; - my $error_type = shift; - my $locale = Locale->new($::language, 'all'); - $::form->{error} = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session'); - $::form->{error} = $::locale->text('Incorrect password!.') if ($error_type eq 'password'); - $::myconfig{countrycode} = $::language; - $::form->{stylesheet} = 'css/lx-office-erp.css'; - - $::form->header; - print $::form->parse_html_template($template); - $::lxdebug->leave_sub; - - exit; -} - -sub _pre_startup_checks { - verify_installation(); -} - -sub require_main_code { - my ($script, $suffix) = @_; - - require "bin/mozilla/$script$suffix"; - - if (-f "bin/mozilla/custom_$script$suffix") { - eval { require "bin/mozilla/custom_$script$suffix"; }; - $::form->error($@) if ($@); - } - if ($::form->{login} && -f "bin/mozilla/$::form->{login}_$::form->{script}") { - eval { require "bin/mozilla/$::form->{login}_$::form->{script}"; }; - $::form->error($@) if ($@); - } -} +SL::Dispatcher::pre_startup(); +SL::Dispatcher::handle_request('CGI'); 1; diff --git a/dispatcher.fpl b/dispatcher.fpl index 60697200d..a4083c115 100755 --- a/dispatcher.fpl +++ b/dispatcher.fpl @@ -9,156 +9,10 @@ BEGIN { } use FCGI; -use CGI qw( -no_xhtml); -use SL::Auth; -use SL::LXDebug; -use SL::Locale; -use SL::Common; -use Form; -use Moose; -use Rose::DB; -use Rose::DB::Object; -use File::Basename; +use SL::Dispatcher; - -eval { require "config/lx-erp.conf"; }; -eval { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf"; -require "bin/mozilla/common.pl"; -require "bin/mozilla/installationcheck.pl"; - -# dummy globals -{ - no warnings 'once'; - $::userspath = "users"; - $::templates = "templates"; - $::memberfile = "users/members"; - $::sendmail = "| /usr/sbin/sendmail -t"; - $::lxdebug = LXDebug->new; - $::auth = SL::Auth->new; - %::myconfig = (); -} - -_pre_startup_checks(); - -my $request = FCGI::Request(); -#if ($request->IsFastCGI) { - handle_request() while $request->Accept() >= 0; -#} else { -# handle_request(); -#} - -# end - -sub handle_request { - $::lxdebug->enter_sub; - $::lxdebug->begin_request; - - my ($script, $path, $suffix) = fileparse($ENV{SCRIPT_NAME}, ".pl"); - unrequire_bin_mozilla(); - require_main_code($script, $suffix); - - $::cgi = CGI->new(''); - $::locale = Locale->new($::language, $script); - $::form = Form->new; - $::form->{script} = $script . $suffix; - - _pre_request_checks(); - - eval { - if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') { - $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}"; - run($::auth->restore_session); - } elsif ($::form->{action}) { - # copy from am.pl routines - $::form->error($::locale->text('System currently down for maintenance!')) if -e "$main::userspath/nologin" && $script ne 'admin'; - - my $session_result = $::auth->restore_session; - - _show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result; - %::myconfig = $::auth->read_user($::form->{login}); - - _show_error('login/password_error', 'password') unless $::myconfig{login}; - - $::locale = Locale->new($::myconfig{countrycode}, $script); - - _show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}, 0); - - $::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password}); - $::auth->create_or_refresh_session; - delete $::form->{password}; - - map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset) - unless $::form->{action} eq 'save' && $::form->{type} eq 'preferences'; - - $::form->set_standard_title; - call_sub($::locale->findsub($::form->{action})); - } else { - $::form->error($::locale->text('action= not defined!')); - } - - 1; - } or do { - $::form->{label_error} = $::cgi->pre($@); - _show_error('generic/error'); - }; - - # cleanup - $::locale = undef; - $::form = undef; - $::myconfig = (); - - $::lxdebug->end_request; - $::lxdebug->leave_sub; -} - -sub _pre_request_checks { - _show_error('login/auth_db_unreachable') unless $::auth->session_tables_present; - $::auth->expire_sessions; -} - -sub _show_error { - $::lxdebug->enter_sub; - my $template = shift; - my $error_type = shift; - my $locale = Locale->new($::language, 'all'); - $::form->{error} = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session'); - $::form->{error} = $::locale->text('Incorrect password!.') if ($error_type eq 'password'); - $::myconfig{countrycode} = $::language; - $::form->{stylesheet} = 'css/lx-office-erp.css'; - - $::form->header; - print $::form->parse_html_template($template); - $::lxdebug->leave_sub; - - exit; -} - -sub _pre_startup_checks { - verify_installation(); -} - -sub unrequire_bin_mozilla { - for (keys %INC) { - next unless m#^bin/mozilla/#; - next if /\bcommon.pl$/; - next if /\binstallationcheck.pl$/; - delete $INC{$_}; - } -} - -sub require_main_code { - my ($script, $suffix) = @_; - - require "bin/mozilla/$script$suffix"; - - if (-f "bin/mozilla/custom_$script$suffix") { - eval { require "bin/mozilla/custom_$script$suffix"; }; - $::form->error($@) if ($@); - } - if ($::form->{login} && -f "bin/mozilla/$::form->{login}_$::form->{script}") { - eval { require "bin/mozilla/$::form->{login}_$::form->{script}"; }; - $::form->error($@) if ($@); - } -} +SL::Dispatcher::pre_startup(); +my $request = FCGI::Request(); +SL::Dispatcher::handle_request('FastCGI') while $request->Accept() >= 0; 1; -- 2.20.1