|
|
|
@ -43,7 +43,7 @@ BEGIN { |
|
|
|
|
sub init($$) { |
|
|
|
|
my ( $class, $args ) = @_; |
|
|
|
|
$reloadTime = $args->{reloadTime} || 600; |
|
|
|
|
$localConfig->{$class} = $args; |
|
|
|
|
$localConfig = $args; |
|
|
|
|
$class->localInit($args); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -51,11 +51,11 @@ sub init($$) { |
|
|
|
|
sub defaultValuesInit { |
|
|
|
|
my ( $class, $args ) = @_; |
|
|
|
|
# Local configuration overrides global configuration |
|
|
|
|
$cookieName = $localConfig->{$class}->{cookieName} || $args->{cookieName} || 'lemonldap'; |
|
|
|
|
$cookieSecured = $localConfig->{$class}->{cookieSecured} || $args->{cookieSecured} || 0; |
|
|
|
|
$whatToTrace = $localConfig->{$class}->{whatToTrace} || $args->{whatToTrace} || '$uid'; |
|
|
|
|
$cookieName = $localConfig->{cookieName} || $args->{cookieName} || 'lemonldap'; |
|
|
|
|
$cookieSecured = $localConfig->{cookieSecured} || $args->{cookieSecured} || 0; |
|
|
|
|
$whatToTrace = $localConfig->{whatToTrace} || $args->{whatToTrace} || '$uid'; |
|
|
|
|
$whatToTrace =~ s/\$//g; |
|
|
|
|
$https = $localConfig->{$class}->{https} unless defined($https); |
|
|
|
|
$https = $localConfig->{https} unless defined($https); |
|
|
|
|
$https = $args->{https} unless defined($https); |
|
|
|
|
$https = 1 unless defined($https); |
|
|
|
|
1; |
|
|
|
@ -136,7 +136,7 @@ sub globalConfUpdate { |
|
|
|
|
return $tmp unless ( ref($tmp) ); |
|
|
|
|
# Local arguments have a best precedence |
|
|
|
|
foreach ( keys %$tmp ) { |
|
|
|
|
$tmp->{$_} = $localConfig->{$class}->{$_} if ( $localConfig->{$class}->{$_} ); |
|
|
|
|
$tmp->{$_} = $localConfig->{$_} if ( $localConfig->{$_} ); |
|
|
|
|
} |
|
|
|
|
$class->setConf($tmp); |
|
|
|
|
OK; |
|
|
|
|