Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Xavier Bachelot
lemonldap-ng
Commits
65387cae
Commit
65387cae
authored
Dec 04, 2009
by
Clément OUDOT
Browse files
Do not use allowempty flag in Config::IniFiles (close bug #314539)
parent
71fce1ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
View file @
65387cae
...
...
@@ -193,7 +193,6 @@ sub getLocalConf {
# Parse ini file
my
$cfg
=
Config::
IniFiles
->
new
(
-
file
=>
$file
,
-
allowempty
=>
1
,
);
unless
(
defined
$cfg
)
{
...
...
modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm
View file @
65387cae
...
...
@@ -92,7 +92,9 @@ sub localInit {
# Get local configuration parameters
my
$localconf
=
$lmConf
->
getLocalConf
(
HANDLERSECTION
);
$args
->
{
$_
}
||=
$localconf
->
{
$_
}
foreach
(
keys
%$localconf
);
if
(
$localconf
)
{
$args
->
{
$_
}
||=
$localconf
->
{
$_
}
foreach
(
keys
%$localconf
);
}
# Store in localConfig global variable
$localConfig
=
$args
;
...
...
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
View file @
65387cae
...
...
@@ -65,7 +65,9 @@ sub new {
# Try to load local configuration parameters to get 'protection'
my
$localconf
=
$self
->
config
->
getLocalConf
(
MANAGERSECTION
);
$args
->
{
protection
}
||=
$localconf
->
{
protection
};
if
(
$localconf
)
{
$args
->
{
protection
}
||=
$localconf
->
{
protection
};
}
if
(
$args
->
{
protection
}
)
{
require
Lemonldap::NG::Handler::
CGI
;
...
...
@@ -74,7 +76,9 @@ sub new {
}
# Now push all local configuration parameters
$self
->
{
$_
}
=
$args
->
{
$_
}
||
$localconf
->
{
$_
}
foreach
(
keys
%$localconf
);
if
(
$localconf
)
{
$self
->
{
$_
}
=
$args
->
{
$_
}
||
$localconf
->
{
$_
}
foreach
(
keys
%$localconf
);
}
foreach
(
qw(dhtmlXTreeImageLocation)
)
{
unless
(
$self
->
{
$_
}
)
{
...
...
modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/SharedConf.pm
View file @
65387cae
...
...
@@ -49,7 +49,9 @@ sub getConf {
# 2/ Local file configuration
# 3/ Script embedded configuration
$self
->
{
$_
}
=
$args
{
$_
}
||
$globalconf
->
{
$_
}
foreach
(
keys
%$globalconf
);
$self
->
{
$_
}
=
$args
{
$_
}
||
$localconf
->
{
$_
}
foreach
(
keys
%$localconf
);
if
(
$localconf
)
{
$self
->
{
$_
}
=
$args
{
$_
}
||
$localconf
->
{
$_
}
foreach
(
keys
%$localconf
);
}
1
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment