From 4c52986fab0416011b42780ff95eb71555173253 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Fri, 3 Nov 2017 11:35:25 +0100
Subject: [PATCH] oops
---
bin/account-manager-client.pl | 3 +--
bin/account-manager-web.pl | 14 +++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/bin/account-manager-client.pl b/bin/account-manager-client.pl
index bb68573..a053b5f 100755
--- a/bin/account-manager-client.pl
+++ b/bin/account-manager-client.pl
@@ -10,14 +10,13 @@
use strict;
use warnings;
use utf8;
-use lib qw(lib conf);
+use lib qw(lib);
use feature "switch";
no warnings 'experimental::smartmatch';
use Getopt::Long qw(:config auto_help);
use Pod::Usage;
-use Conf;
use IdPAccountManager::Data::AuthenticationToken;
use IdPAccountManager::Data::AuthenticationToken::Manager;
use IdPAccountManager::Data::ServiceProvider;
diff --git a/bin/account-manager-web.pl b/bin/account-manager-web.pl
index dcf73ec..208cd4a 100755
--- a/bin/account-manager-web.pl
+++ b/bin/account-manager-web.pl
@@ -10,7 +10,7 @@
use strict;
use warnings;
use utf8;
-use lib qw(lib conf);
+use lib qw(lib);
use IdPAccountManager::Configuration;
use IdPAccountManager::WebRequest;
@@ -27,22 +27,22 @@ my %format = (
'sp_entityid' => $urn_or_url_regex,
);
+my $configuration = IdPAccountManager::Configuration->new(
+ file => 'conf/IdPAccountManager.conf'
+);
+
my %actions = (
'select_sp' => { 'title_en' => 'Select your Service Provider' },
'account_wizard' => { 'title_en' => 'Select your Service Provider' },
'generate_token' => { 'title_en' => 'Generate an authentication token' },
'validate_token' => { 'title_en' => 'Complete Email Challenge' },
- 'home' => { 'title_en' => $Conf::global{app_name} },
+ 'home' => { 'title_en' => $configuration->{app_name} },
);
## Gives writes for the group
umask 0002;
-chdir $Conf::global{root_manager_dir};
-
-my $configuration = IdPAccountManager::Configuration->new(
- file => 'conf/IdPAccountManager.conf'
-);
+chdir $configuration->{root_manager_dir};
my $request = new IdPAccountManager::WebRequest(
actions => \%actions,
--
GitLab