From 5f552f408514b1e2782977a64d9849b93191d44f Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Wed, 3 Dec 2008 18:30:57 +0000
Subject: [PATCH] LEMONLDAP::NG : minnor things

---
 modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm  | 5 +----
 .../lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm    | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm
index 693a8fe34..ff0492c2c 100755
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm
@@ -2,7 +2,6 @@ package Lemonldap::NG::Portal::Menu;
 
 use strict;
 use warnings;
-use Exporter 'import';
 use Lemonldap::NG::Portal::SharedConf;
 use Lemonldap::NG::Portal::_LDAP;
 use XML::LibXML;
@@ -10,8 +9,6 @@ use Safe;
 
 our $VERSION = '0.01';
 
-our @ISA = qw(Exporter);
-
 ### ACCESS CONTROL DISPLAY SYSTEM
 
 our ( $defaultCondition, $locationCondition, $locationRegexp, $cfgNum, $path ) =
@@ -201,7 +198,7 @@ sub _getXML {
     eval {
         $xml = $parser->parse_file( $self->{apps}->{xmlfile} );
     };
-    $self->{portalObject}->abort("Fichier XML incorrect", $@) if($@);
+    $self->{portalObject}->abort("Bad XML file", $@) if($@);
     my $root = $xml->documentElement;
 
     # Filter XML file with user's authorizations
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
index 26446098d..e31d5e019 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
@@ -456,7 +456,7 @@ sub controlExistingSession {
                 -expires=> '-1d',
                 @_,
               );
-                $self->{error} = PE_REDIRECT;
+            $self->{error} = PE_REDIRECT;
             $self->_subProcess(qw(log autoRedirect));
             return PE_FIRSTACCESS;
         }