Merge branch 'v2.0'
This commit is contained in:
commit
c77783eb2f
|
@ -86,7 +86,7 @@
|
|||
"authentication" : "Demo",
|
||||
"cfgAuthor" : "The LemonLDAP::NG team",
|
||||
"cfgNum" : 1,
|
||||
"cfgVersion" : "2.0.1",
|
||||
"cfgVersion" : "2.0.2",
|
||||
"cookieName" : "lemonldap",
|
||||
"demoExportedVars" : {
|
||||
"cn" : "cn",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package Lemonldap::NG::Handler::Main::Reload;
|
||||
|
||||
our $VERSION = '2.0.1';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
package Lemonldap::NG::Handler::Main;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Main running methods file
|
||||
package Lemonldap::NG::Handler::Main::Run;
|
||||
|
||||
our $VERSION = '2.0.0';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
package Lemonldap::NG::Handler::Main;
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ package Lemonldap::NG::Handler::Server::Main;
|
|||
|
||||
use strict;
|
||||
|
||||
our $VERSION = '2.0.0';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
use base 'Lemonldap::NG::Handler::PSGI::Main';
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package Lemonldap::NG::Manager::Conf::Zero;
|
||||
|
||||
our $VERSION = '2.0.1';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
sub zeroConf {
|
||||
my ( $domain, $sessionDir, $persistentSessionDir, $notificationDir ) = @_;
|
||||
|
|
|
@ -17,7 +17,7 @@ use feature 'state';
|
|||
extends 'Lemonldap::NG::Common::Conf::AccessLib',
|
||||
'Lemonldap::NG::Common::Session::REST';
|
||||
|
||||
our $VERSION = '2.0.0';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
#############################
|
||||
# I. INITIALIZATION METHODS #
|
||||
|
|
|
@ -5,7 +5,7 @@ use strict;
|
|||
use Mouse;
|
||||
use JSON qw(from_json to_json);
|
||||
|
||||
our $VERSION = '2.0.0';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
extends 'Lemonldap::NG::Portal::Main::Plugin',
|
||||
'Lemonldap::NG::Portal::Lib::U2F';
|
||||
|
|
|
@ -6,7 +6,7 @@ use Lemonldap::NG::Common::Combination::Parser;
|
|||
use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_ERROR);
|
||||
use Scalar::Util 'weaken';
|
||||
|
||||
our $VERSION = '2.0.0';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
# TODO: See Lib::Wrapper
|
||||
extends 'Lemonldap::NG::Portal::Main::Auth';
|
||||
|
|
|
@ -15,7 +15,7 @@ use Email::Sender::Transport::SMTP qw();
|
|||
use MIME::Base64;
|
||||
use Encode;
|
||||
|
||||
our $VERSION = '2.0.1';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
our $transport;
|
||||
|
||||
|
|
|
@ -729,6 +729,8 @@ sub _dump {
|
|||
|
||||
sub sendHtml {
|
||||
my ( $self, $req, $template, %args ) = @_;
|
||||
$self->{templateDir} =
|
||||
$self->conf->{templateDir} . '/' . $self->getSkin($req);
|
||||
$args{params}->{TROVER} = $self->trOver;
|
||||
my $res = $self->SUPER::sendHtml( $req, $template, %args );
|
||||
push @{ $res->[1] },
|
||||
|
@ -793,13 +795,16 @@ sub sendHtml {
|
|||
|
||||
sub sendCss {
|
||||
my ( $self, $req ) = @_;
|
||||
my $s =
|
||||
'html,body{background:url("'
|
||||
. $self->staticPrefix
|
||||
. '/common/backgrounds/'
|
||||
. $self->conf->{portalSkinBackground}
|
||||
. '") no-repeat center fixed;'
|
||||
. 'background-size:cover;}';
|
||||
my $s = '/* LL::NG Portal CSS */';
|
||||
if ( $self->conf->{portalSkinBackground} ) {
|
||||
$s .=
|
||||
'html,body{background:url("'
|
||||
. $self->staticPrefix
|
||||
. '/common/backgrounds/'
|
||||
. $self->conf->{portalSkinBackground}
|
||||
. '") no-repeat center fixed;'
|
||||
. 'background-size:cover;}';
|
||||
}
|
||||
return [
|
||||
200,
|
||||
[
|
||||
|
@ -852,7 +857,7 @@ sub tplParams {
|
|||
|
||||
for my $session_key ( keys %{ $req->{sessionInfo} } ) {
|
||||
$templateParams{ "session_" . $session_key } =
|
||||
$req->{sessionInfo}->{$session_key};
|
||||
$req->{sessionInfo}->{$session_key};
|
||||
}
|
||||
|
||||
for my $env_key ( keys %{ $req->env } ) {
|
||||
|
@ -860,7 +865,7 @@ sub tplParams {
|
|||
}
|
||||
|
||||
return (
|
||||
SKIN => $self->getSkin( $req ),
|
||||
SKIN => $self->getSkin($req),
|
||||
PORTAL_URL => $self->conf->{portal},
|
||||
SKIN_PATH => $portalPath . "skins",
|
||||
ANTIFRAME => $self->conf->{portalAntiFrame},
|
||||
|
|
|
@ -8,7 +8,7 @@ use Lemonldap::NG::Portal::Main::Constants qw(
|
|||
PE_BADCREDENTIALS
|
||||
);
|
||||
|
||||
our $VERSION = '2.0.0';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
extends 'Lemonldap::NG::Portal::Main::Plugin';
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ use Lemonldap::NG::Portal::Main::Constants qw(
|
|||
PE_TOKENEXPIRED
|
||||
);
|
||||
|
||||
our $VERSION = '2.0.1';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
extends 'Lemonldap::NG::Portal::Main::Plugin',
|
||||
'Lemonldap::NG::Portal::Lib::SMTP';
|
||||
|
|
|
@ -11,7 +11,7 @@ use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_BADCREDENTIALS);
|
|||
|
||||
extends 'Lemonldap::NG::Common::Module';
|
||||
|
||||
our $VERSION = '2.0.0';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
# Sample accounts from Doctor Who characters
|
||||
our %demoAccounts = (
|
||||
|
|
|
@ -8,7 +8,7 @@ use Lemonldap::NG::Portal::Main::Constants
|
|||
|
||||
extends 'Lemonldap::NG::Portal::Lib::LDAP';
|
||||
|
||||
our $VERSION = '2.0.1';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
has ldapGroupAttributeNameSearch => (
|
||||
is => 'rw',
|
||||
|
|
|
@ -10,7 +10,7 @@ use Lemonldap::NG::Portal::Main::Constants qw(
|
|||
|
||||
extends 'Lemonldap::NG::Common::Module', 'Lemonldap::NG::Portal::Lib::REST';
|
||||
|
||||
our $VERSION = '2.0.0';
|
||||
our $VERSION = '2.0.2';
|
||||
|
||||
# INITIALIZATION
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
# Main package
|
||||
#==============================================================================
|
||||
Name: lemonldap-ng
|
||||
Version: 2.0.1
|
||||
Version: 2.0.2
|
||||
Release: %{?pre_release:0.}1%{?pre_release:.%{pre_release}}%{?dist}
|
||||
Summary: LemonLDAP-NG WebSSO
|
||||
License: GPLv2+
|
||||
|
|
Loading…
Reference in New Issue
Block a user