From eacb1b3b2e399d365bab45e58e3cf184b3d42af7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 21:45:10 +0200
Subject: [PATCH] Debug modulebuilder

---
 htdocs/core/lib/files.lib.php  | 11 ++++++++++-
 htdocs/modulebuilder/index.php |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 941cb03d6c4..dbea182fb9b 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -761,8 +761,17 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 				if (is_dir($ossrcfile."/".$file))
 				{
 					if (empty($excludesubdir) || ($excludesubdir == 2 && strlen($file) == 2)) {
+						$newfile = $file;
+						// Replace destination filename with a new one
+						if (is_array($arrayreplacement))
+						{
+							foreach ($arrayreplacement as $key => $val)
+							{
+								$newfile = str_replace($key, $val, $newfile);
+							}
+						}
 						//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
+						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
 					}
 				}
 				else
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 1be2ac09971..d813c3b291b 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -180,8 +180,10 @@ if ($dirins && $action == 'initmodule' && $modulename)
 		dol_delete_file($destdir.'/sql/llx_'.strtolower($modulename).'_myobject.sql');
 		dol_delete_file($destdir.'/sql/llx_'.strtolower($modulename).'_myobject_extrafields.sql');
 		dol_delete_file($destdir.'/sql/llx_'.strtolower($modulename).'_myobject.key.sql');
+		dol_delete_file($destdir.'/sql/llx_'.strtolower($modulename).'_myobject_extrafields.key.sql');
 		dol_delete_file($destdir.'/img/object_myobject.png');
 		dol_delete_file($destdir.'/class/myobject.class.php');
+		dol_delete_dir($destdir.'/class');
 		dol_delete_dir($destdir.'/sql');
 	}