Umstellung des Dispatcher-Moduls auf Objekt-Aufrufsyntax

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index cc886d8ca70ae19949ee4b6cfb70f6d5af5c58f6..e6aa5477487b6015dcfc89a979a20ead4b7909b8 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -22,6 +22,15 @@ use File::Basename;
 # number 'die' was called in.
 use constant END_OF_REQUEST => "END-OF-REQUEST\n";
 
 # number 'die' was called in.
 use constant END_OF_REQUEST => "END-OF-REQUEST\n";
 

+sub new {
+  my ($class, $interface) = @_;
+
+  my $self           = bless {}, $class;
+  $self->{interface} = lc($interface || 'cgi');
+
+  return $self;
+}
+

 sub pre_request_checks {
   if (!$::auth->session_tables_present) {
     if ($::form->{script} eq 'admin.pl') {
 sub pre_request_checks {
   if (!$::auth->session_tables_present) {
     if ($::form->{script} eq 'admin.pl') {


@@ -138,15 +147,16 @@ sub _run_controller {
 }
 
 sub handle_request {
 }
 
 sub handle_request {

+  my $self = shift;
+

   $::lxdebug->enter_sub;
   $::lxdebug->begin_request;
 
   $::lxdebug->enter_sub;
   $::lxdebug->begin_request;
 

-  my $interface = lc(shift || 'cgi');

   my ($script, $path, $suffix, $script_name, $action, $routing_type);
 
   $script_name = $ENV{SCRIPT_NAME};
 
   my ($script, $path, $suffix, $script_name, $action, $routing_type);
 
   $script_name = $ENV{SCRIPT_NAME};
 

-  unrequire_bin_mozilla($interface);
+  $self->unrequire_bin_mozilla;

 
   $::cgi         = CGI->new('');
   $::locale      = Locale->new($::language);
 
   $::cgi         = CGI->new('');
   $::locale      = Locale->new($::language);


@@ -230,7 +240,8 @@ sub handle_request {
 }
 
 sub unrequire_bin_mozilla {
 }
 
 sub unrequire_bin_mozilla {

-  return unless $_[0] =~ m/^(?:fastcgi|fcgid|fcgi)$/;
+  my $self = shift;
+  return unless $self->{interface} =~ m/^(?:fastcgi|fcgid|fcgi)$/;

 
   for (keys %INC) {
     next unless m#^bin/mozilla/#;
 
   for (keys %INC) {
     next unless m#^bin/mozilla/#;

diff --git a/admin.pl b/admin.pl
index 603d166b2ca7a63d4c7f36408ee3ca41741e849e..60c4ff206ccb2128e917b904fdda02f80f9083f1 100755 (executable)
--- a/admin.pl
+++ b/admin.pl
@@ -4,7 +4,8 @@ use strict;
 
 use SL::Dispatcher;
 
 
 use SL::Dispatcher;
 

-SL::Dispatcher::pre_startup();
-SL::Dispatcher::handle_request('CGI');
+my $dispatcher = SL::Dispatcher->new('CGI');
+$dispatcher->pre_startup;
+$dispatcher->handle_request;

 
 1;
 
 1;

diff --git a/dispatcher.fpl b/dispatcher.fpl
index afe1bc6edec6aa912ab6890e417421e8c7c5b1ef..e5c8ca9ddb90ef9e60686ed581ec2d3273479dd2 100755 (executable)
--- a/dispatcher.fpl
+++ b/dispatcher.fpl
@@ -8,8 +8,10 @@ use SL::FCGIFixes;
 
 SL::FCGIFixes::apply_fixes();
 
 
 SL::FCGIFixes::apply_fixes();
 

-SL::Dispatcher::pre_startup();
+my $dispatcher = SL::Dispatcher->new('FastCGI');
+$dispatcher->pre_startup;
+

 my $request = FCGI::Request();
 my $request = FCGI::Request();

-SL::Dispatcher::handle_request('FastCGI') while $request->Accept() >= 0;
+$dispatcher->handle_request($request) while $request->Accept() >= 0;

 
 1;
 
 1;