dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair lemonldap-ng-cli (closes: #921)

Browse Source
This commit is contained in:
Xavier Guimard 2016-02-25 08:40:25 +00:00
parent 7a59915ee1
commit d12a82f8f1
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lemonldap-ng-common/lib/Lemonldap/NG/Common/Cli.pm
View File

@ -7,10 +7,16 @@ use Lemonldap::NG::Common::Conf;
has confAccess => (
is => 'rw',
isa => 'HashRef',
builder => sub {
my $res =
Lemonldap::NG::Common::Conf->new( { confFile => $_[0]->{iniFile} } );
my $res = Lemonldap::NG::Common::Conf->new(
{
(
ref $_[0] && $_[0]->{iniFile}
? ( confFile => $_[0]->{iniFile} )
: ()
)
}
);
die $Lemonldap::NG::Common::Conf::msg unless ($res);
return $res;
},
@ -23,13 +29,14 @@ has cfgNum => (
sub info {
my ($self) = @_;
my $conf = $self->confAccess( { cfgNum => $self->cfgNum, raw => 1 } )
my $conf =
$self->confAccess->getConf( { cfgNum => $self->cfgNum, raw => 1 } )
or die $Lemonldap::NG::Common::Conf::msg;
print qq{
Num : $conf->{cfgNum}
Author : $conf->{cfgAuthor}
Author IP: $conf->{cfgAuthorIP}
Date : $conf->{cfgDate}
Date : } . localtime( $conf->{cfgDate} ) . qq{
Log : $conf->{cfgLog}
};
}
@ -46,7 +53,7 @@ sub run {
my $self = shift;
# Options simply call corresponding accessor
my $args;
my $args = {};
while ( $_[0] =~ s/^--?// ) {
my $k = shift;
my $v = shift;

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm
View File

@ -201,7 +201,7 @@ sub run {
print STDERR "VERY EXPERIMENTAL FEATURE, prefer web interface\n";
# Options simply call corresponding accessor
my $args;
my $args = {};
while ( $_[0] =~ s/^--?// ) {
my $k = shift;
my $v = shift;