use SL::Common;
use Form;
use List::Util qw(first);
-use Moose;
-use Rose::DB;
-use Rose::DB::Object;
use File::Basename;
# Trailing new line is added so that Perl will not add the line
use constant END_OF_REQUEST => "END-OF-REQUEST\n";
sub pre_request_checks {
- show_error('login/auth_db_unreachable') unless $::auth->session_tables_present;
+ if (!$::auth->session_tables_present) {
+ if ($::form->{script} eq 'admin.pl') {
+ ::run();
+ ::end_of_request();
+ } else {
+ show_error('login/auth_db_unreachable');
+ }
+ }
$::auth->expire_sessions;
}
require "bin/mozilla/installationcheck.pl";
} or die $EVAL_ERROR;
- # dummy globals
+ # canonial globals. if it's not here, chances are it will get refactored someday.
{
no warnings 'once';
- $::userspath = "users";
- $::templates = "templates";
- $::memberfile = "users/members";
- $::menufile = "menu.ini";
- $::sendmail = "| /usr/sbin/sendmail -t";
- $::lxdebug = LXDebug->new;
- $::auth = SL::Auth->new;
- %::myconfig = ();
+ $::userspath = "users";
+ $::templates = "templates";
+ $::memberfile = "users/members";
+ $::menufile = "menu.ini";
+ $::sendmail = "| /usr/sbin/sendmail -t";
+ $::lxdebug = LXDebug->new;
+ $::auth = SL::Auth->new;
+ $::form = undef;
+ %::myconfig = ();
+ %::called_subs = (); # currently used for recursion detection
+ }
+
+ $SIG{__WARN__} = sub {
+ $::lxdebug->warn(@_);
}
}
}
sub require_main_code {
+ $::lxdebug->enter_sub;
my ($script, $suffix) = @_;
eval {
};
$::form->error($EVAL_ERROR) if ($EVAL_ERROR);
}
- if ($::form->{login} && -f "bin/mozilla/$::form->{login}_$::form->{script}") {
+ if ($::form->{login} && -f "bin/mozilla/$::form->{login}_$script") {
eval {
package main;
- require "bin/mozilla/$::form->{login}_$::form->{script}";
+ require "bin/mozilla/$::form->{login}_$script";
};
$::form->error($EVAL_ERROR) if ($EVAL_ERROR);
}
+ $::lxdebug->leave_sub;
+}
+
+sub _require_controller {
+ my $controller = shift;
+ $controller =~ s|[^A-Za-z0-9_]||g;
+
+ eval {
+ package main;
+ require "SL/Controller/${controller}.pm";
+ } or die $EVAL_ERROR;
+}
+
+sub _run_controller {
+ "SL::Controller::$_[0]"->new->_run_action($_[1]);
}
sub handle_request {
$::lxdebug->begin_request;
my $interface = lc(shift || 'cgi');
- my ($script_name, $action);
+ my ($script, $path, $suffix, $script_name, $action, $routing_type);
- if ($interface =~ m/^(?:fastcgi|fcgid|fcgi)$/) {
- $script_name = $ENV{SCRIPT_NAME};
- unrequire_bin_mozilla();
+ $script_name = $ENV{SCRIPT_NAME};
- } else {
- $script_name = $0;
- }
+ unrequire_bin_mozilla($interface);
+
+ $::cgi = CGI->new('');
+ $::locale = Locale->new($::language);
+ $::form = Form->new;
+ %::called_subs = ();
- $::cgi = CGI->new('');
- $::locale = Locale->new($::language);
- $::form = Form->new;
+ eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return;
- eval { ($script_name, $action) = _route_request($script_name); 1; } or return;
+ if ($routing_type eq 'old') {
+ $::form->{action} = lc $::form->{action};
+ $::form->{action} =~ s/( |-|,|\#)/_/g;
- my ($script, $path, $suffix) = fileparse($script_name, ".pl");
- require_main_code($script, $suffix);
+ ($script, $path, $suffix) = fileparse($script_name, ".pl");
+ require_main_code($script, $suffix);
- $::form->{script} = $script . $suffix;
+ $::form->{script} = $script . $suffix;
+
+ } else {
+ _require_controller($script_name);
+ $::form->{script} = "controller.pl";
+ }
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);
+ my $session_result = $::auth->restore_session;
+ $::auth->create_or_refresh_session;
- } elsif ($action) {
- # copy from am.pl routines
- $::form->error($::locale->text('System currently down for maintenance!')) if -e "$main::userspath/nologin" && $script ne 'admin';
+ $::form->error($::locale->text('System currently down for maintenance!')) if -e "$::userspath/nologin" && $script ne 'admin';
- my $session_result = $::auth->restore_session;
+ if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') {
+ $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
+ ::run($session_result);
+ } else {
show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
%::myconfig = $::auth->read_user($::form->{login});
$::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password});
$::auth->create_or_refresh_session;
+ $::auth->delete_session_value('FLASH')->save_session();
delete $::form->{password};
- map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
- unless $action eq 'save' && $::form->{type} eq 'preferences';
-
- $::form->set_standard_title;
- ::call_sub('::' . $::locale->findsub($action));
-
- } else {
- $::form->error($::locale->text('action= not defined!'));
+ if ($action) {
+ map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
+ unless $action eq 'save' && $::form->{type} eq 'preferences';
+
+ $::form->set_standard_title;
+ if ($routing_type eq 'old') {
+ ::call_sub('::' . $::locale->findsub($action));
+ } else {
+ _run_controller($script_name, $action);
+ }
+ } else {
+ $::form->error($::locale->text('action= not defined!'));
+ }
}
1;
}
sub unrequire_bin_mozilla {
+ return unless $_[0] =~ m/^(?:fastcgi|fcgid|fcgi)$/;
+
for (keys %INC) {
next unless m#^bin/mozilla/#;
next if /\bcommon.pl$/;
sub _route_request {
my $script_name = shift;
- return $script_name =~ m/dispatcher\.pl$/ ? _route_dispatcher_request() : ($script_name, $::form->{action});
+ return $script_name =~ m/dispatcher\.pl$/ ? ('old', _route_dispatcher_request())
+ : $script_name =~ m/controller\.pl/ ? ('controller', _route_controller_request())
+ : ('old', $script_name, $::form->{action});
}
sub _route_dispatcher_request {
return ($script_name, $action);
}
+sub _route_controller_request {
+ my ($controller, $action);
+
+ eval {
+ $::form->{action} =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) $|x || die "Unroutable request -- inavlid controller/action.\n";
+ ($controller, $action) = ($1, $2);
+ delete $::form->{action};
+
+ 1;
+ } or do {
+ $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
+ show_error('generic/error');
+ };
+
+ return ($controller, $action);
+}
+
package main;
use strict;