Fix odd links

[pciids.git] / PciIds / Html / Handler.pm

diff --git a/PciIds/Html/Handler.pm b/PciIds/Html/Handler.pm
index 0d82e3f4031d5ef2a7763eb7cb1cfbc7830c83b2..f9ca889e5dd2830b303ac5e642ab7f2a3fd89911 100644 (file)
--- a/PciIds/Html/Handler.pm
+++ b/PciIds/Html/Handler.pm
@@ -1,3 +1,21 @@
+#      PciIds web database
+#      Copyright (C) 2008 Michal Vaner (vorner@ucw.cz)
+#
+#      This program is free software; you can redistribute it and/or modify
+#      it under the terms of the GNU General Public License as published by
+#      he Free Software Foundation; either version 2 of the License, or
+#      (at your option) any later version.
+#
+#      This program is distributed in the hope that it will be useful,
+#      but WITHOUT ANY WARRANTY; without even the implied warranty of
+#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#
+#      GNU General Public License for more details.
+#
+#      You should have received a copy of the GNU General Public License
+#      along with this program; if not, write to the Free Software
+#      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 package PciIds::Html::Handler;
 use strict;
 use warnings;
@@ -11,10 +29,8 @@ use PciIds::Html::Changes;
 use PciIds::Html::Admin;
 use PciIds::Html::Notifications;
 use PciIds::Html::Help;
+use PciIds::Html::Jump;
 use Apache2::Const qw(:common :http);
-use base 'Exporter';
-
-our @EXPORT = qw(&callHandler);
 
 $ENV{'PATH'} = '';
 my $dbh = connectDb();
@@ -55,31 +71,29 @@ my %handlers = (
                'respass-confirm' => \&PciIds::Html::Users::resetPasswdConfirmFormSubmit,
                'profile' => \&PciIds::Html::Users::profileFormSubmit,
                'admin' => \&PciIds::Html::Admin::submitAdminForm,
-               'notifications' => \&PciIds::Html::Notifications::notifFormSubmit
+               'notifications' => \&PciIds::Html::Notifications::notifFormSubmit,
+               'jump' => \&PciIds::Html::Jump::jump,
+               'help' => \&PciIds::Html::Help::getHelp
        }
 );
 
-sub callHandler( $$$$$$ ) {
-       my( $req, $args, $tables, $auth, $hasSSL, $meth ) = @_;
+sub handler( $$ ) {
+       my( $req, $hasSSL ) = @_;
+       my $args = parseArgs( $req->args() );
+       return HTTPRedirect( $req, protoName( $hasSSL ).'://'.$req->hostname().'/index.html' ) if( $req->uri() eq '/' && ( !defined $args->{'action'} || ( $args->{'action'} ne 'help' && $args->{'action'} ne 'jump' ) ) );
+       return DECLINED if( $req->uri() =~ /^\/((static)\/|robots.txt|index.html)/ );
        my $action = $args->{'action'};
        $action = '' unless( defined $action );
-       my $method = $handlers{$meth};
+       return HTTPRedirect( $req, protoName( $hasSSL ).'://'.$req->hostname().'/' ) if $req->uri() =~ /^\/(read|mods)\/?$/  && ( $action eq '' || $action eq 'list' );
+       my $method = $handlers{$req->method()};
        return HTTP_METHOD_NOT_ALLOWED unless( defined $method );#Can't handle this method
        my $sub = $method->{$action};
        return HTTP_BAD_REQUEST unless( defined $sub );#I do not know this action for given method
-       $auth = checkLogin( $req, $tables ) unless defined $auth;#Check if logged in
+       my $auth = checkLogin( $req, $tables );#Check if logged in
        $auth->{'ssl'} = $hasSSL;
-       return &{$sub}( $req, $args, $tables, $auth );#Just do the right thing
-}
-
-sub handler( $$ ) {
-       my( $req, $hasSSL ) = @_;
-       my $args = parseArgs( $req->args() );
-       return HTTPRedirect( $req, $req->uri()."index.html" ) if( $req->uri() eq '/' && ( !defined $args->{'action'} || $args->{'action'} ne 'help' ) );
-       return DECLINED if( $req->uri() =~ /^\/((static)\/|robots.txt|index.html)/ );
-       my $result;
+       my( $result );
        eval {
-               $result = callHandler( $req, $args, $tables, undef, $hasSSL, $req->method() );
+               $result = &{$sub}( $req, $args, $tables, $auth );#Just do the right thing
                $tables->commit();
        };
        if( $@ ) {