From fa21b27cedc3c67a5097932bae90114156820fa8 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 22 Oct 2021 15:27:16 +0200
Subject: [PATCH 1/2] Validate Holiday : keep files

---
 htdocs/holiday/card.php                |  1 +
 htdocs/holiday/class/holiday.class.php | 39 ++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 150a9c0754b..93e748a51d2 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -266,6 +266,7 @@ if (empty($reshook)) {
 
 	// If update and we are an approver, we can update with another approver
 	if ($action == 'update' && GETPOSTISSET('savevalidator') && !empty($user->rights->holiday->approve)) {
+
 		$object->fetch($id);
 
 		$object->oldcopy = dol_clone($object);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 5ecc4d7325a..665e43c6ffd 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -701,6 +701,7 @@ class Holiday extends CommonObject
 	public function validate($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$error = 0;
 
 		// Define new ref
@@ -740,6 +741,44 @@ class Holiday extends CommonObject
 			}
 		}
 
+		if (!$error) {
+			$this->oldref = $this->ref;
+
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
+				// Now we rename also files into index
+				$sql = 'UPDATE ' . MAIN_DB_PREFIX . "ecm_files set filename = CONCAT('" . $this->db->escape($this->newref) . "', SUBSTR(filename, " . (strlen($this->ref) + 1) . ")), filepath = 'holiday/" . $this->db->escape($this->newref) . "'";
+				$sql .= " WHERE filename LIKE '" . $this->db->escape($this->ref) . "%' AND filepath = 'holiday/" . $this->db->escape($this->ref) . "' and entity = " . ((int)$conf->entity);
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++;
+					$this->error = $this->db->lasterror();
+				}
+
+				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
+				$oldref = dol_sanitizeFileName($this->ref);
+				$newref = dol_sanitizeFileName($num);
+				$dirsource = $conf->holiday->multidir_output[$this->entity] . '/' . $oldref;
+				$dirdest = $conf->holiday->multidir_output[$this->entity] . '/' . $newref;
+				if (!$error && file_exists($dirsource)) {
+					dol_syslog(get_class($this) . "::validate rename dir " . $dirsource . " into " . $dirdest);
+					if (@rename($dirsource, $dirdest)) {
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles = dol_dir_list($dirdest, 'files', 1, '^' . preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry) {
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^' . preg_quote($oldref, '/') . '/', $newref, $dirsource);
+							$dirsource = $fileentry['path'] . '/' . $dirsource;
+							$dirdest = $fileentry['path'] . '/' . $dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
+
+
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {

From 87b4805bc041237a87ab3da8788020a1306e40cf Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 22 Oct 2021 13:35:30 +0000
Subject: [PATCH 2/2] Fixing style errors.

---
 htdocs/holiday/card.php                | 1 -
 htdocs/holiday/class/holiday.class.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 93e748a51d2..150a9c0754b 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -266,7 +266,6 @@ if (empty($reshook)) {
 
 	// If update and we are an approver, we can update with another approver
 	if ($action == 'update' && GETPOSTISSET('savevalidator') && !empty($user->rights->holiday->approve)) {
-
 		$object->fetch($id);
 
 		$object->oldcopy = dol_clone($object);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 665e43c6ffd..6271f1d43e8 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -748,7 +748,7 @@ class Holiday extends CommonObject
 			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 				// Now we rename also files into index
 				$sql = 'UPDATE ' . MAIN_DB_PREFIX . "ecm_files set filename = CONCAT('" . $this->db->escape($this->newref) . "', SUBSTR(filename, " . (strlen($this->ref) + 1) . ")), filepath = 'holiday/" . $this->db->escape($this->newref) . "'";
-				$sql .= " WHERE filename LIKE '" . $this->db->escape($this->ref) . "%' AND filepath = 'holiday/" . $this->db->escape($this->ref) . "' and entity = " . ((int)$conf->entity);
+				$sql .= " WHERE filename LIKE '" . $this->db->escape($this->ref) . "%' AND filepath = 'holiday/" . $this->db->escape($this->ref) . "' and entity = " . ((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;