Commit f737150d authored by Yadd's avatar Yadd

LEMONLDAP::NG : Bug corrections with XML encoding


git-svn-id: svn://svn.forge.objectweb.org/svnroot/lemonldap/branches/lemonldap-ng_version_0_8-bugfixes@177 1dbb9719-a921-0410-b57f-c3a383c2c641
parent 29efc920
......@@ -68,7 +68,7 @@ sub getConf {
my $fields = $self->load( $args->{cfgNum}, $args->{fields} );
my $conf;
while ( my ( $k, $v ) = each(%$fields) ) {
$v =~ s/^'(.*)'$/$1/m;
$v =~ s/^'(.*)'$/$1/s;
if( $k =~ /^(?:exportedVars|locationRules|groups|exportedHeaders|macros|globalStorageOptions)$/ ) {
$conf->{$k} = thaw(decode_base64($v));
}
......
......@@ -352,7 +352,7 @@ function applyConf(){
function ec(s){
if((!s) || s=='') return s;
return s.replace(/&/g,'&amp;').replace(/>/g,'&gt;').replace(/</g,'&lt;');
return s.replace(/&(?!\#)/g,'&amp;').replace(/>/g,'&gt;').replace(/</g,'&lt;');
}
#;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment