From 1e2d74157cc18ad89f85a30ec7f1db30297d9ff4 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Wed, 17 Jan 2007 20:00:54 +0000
Subject: [PATCH] Correction issued from the first test in real life:  * Close
 #306573 / forge.objectweb.org  * Close #306574 / forge.objectweb.org

---
 modules/lemonldap-ng-manager/Changes                        | 5 +++++
 modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm    | 2 +-
 .../lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm   | 6 +++---
 .../lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm  | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/lemonldap-ng-manager/Changes b/modules/lemonldap-ng-manager/Changes
index 94134fffe..491e47cb0 100644
--- a/modules/lemonldap-ng-manager/Changes
+++ b/modules/lemonldap-ng-manager/Changes
@@ -1,5 +1,10 @@
 Revision history for Perl extension Lemonldap::NG::Manager.
 
+0.42  Wed Jan 17 20:35:43 2007
+	- Correction issued from the first test in real life:
+	  * Close #306573 / forge.objectweb.org
+	  * Close #306574 / forge.objectweb.org
+
 0.41  Sun Jan 14 14:04:05 2007
 	- I18n in javascripts (close #306564 / forge.objectweb.org)
 	- Increase number of help chapter (General Parameters)
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
index 7b958078f..715fc696d 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
@@ -12,7 +12,7 @@ require Lemonldap::NG::Manager::Help;
 
 our @ISA = qw(Lemonldap::NG::Manager::Base);
 
-our $VERSION = '0.41';
+our $VERSION = '0.42';
 
 sub new {
     my ( $class, $args ) = @_;
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
index 542bb7a24..14ecd1c61 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
@@ -4,7 +4,7 @@ use strict;
 use Storable qw(thaw freeze);
 use MIME::Base64;
 
-our $VERSION = 0.4;
+our $VERSION = 0.41;
 our @ISA;
 
 sub new {
@@ -65,9 +65,9 @@ sub getConf {
     my $conf;
     while ( my ( $k, $v ) = each(%$fields) ) {
         my $tmp;
-        eval "\$tmp = thaw(decode_base64($v))";
+        $v =~ s/^'(.*)'$/$1/m;
+        eval "\$tmp = thaw(decode_base64('$v'))";
         if ( $@ or not($tmp) ) {
-            $v =~ s/^'(.*)'$/$1/m;
             $conf->{$k} = $v;
         }
         else {
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm
index 4a644f7bf..b00550038 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm
@@ -6,7 +6,7 @@ package Lemonldap::NG::Manager::_HTML;
 
 use AutoLoader qw(AUTOLOAD);
 require Lemonldap::NG::Manager::_i18n;
-our $VERSION = '0.11';
+our $VERSION = '0.12';
 
 1;
 __END__
@@ -294,6 +294,7 @@ function saveConf(){
 function tree2txt(id){
   var s=tree.getSubItems(id);
   var c=s.split(',');
+  id = id.replace(/[0-9]*_/,'');
   var r='<'+id+"><text>"+ec(tree.getItemText(id))+"</text>\\n";
   if((!s) || s=='' || c.length==0){
     r+= '<value>'+ec(tree.getUserData(id,'value'))+"</value>\\n";