From a15f9462633b9187cb5cd0819a7ceef8e028b1a5 Mon Sep 17 00:00:00 2001
From: Jonathan Boivin <djon2003@hotmail.com>
Date: Thu, 9 Nov 2023 21:46:36 -0500
Subject: [PATCH] Ensure no description changes are lot

Signed-off-by: Jonathan Boivin <djon2003@hotmail.com>
---
 apps/dav/lib/CalDAV/Schedule/Plugin.php | 39 +++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/apps/dav/lib/CalDAV/Schedule/Plugin.php b/apps/dav/lib/CalDAV/Schedule/Plugin.php
index 16acc72d9886c..6f08cbb485903 100644
--- a/apps/dav/lib/CalDAV/Schedule/Plugin.php
+++ b/apps/dav/lib/CalDAV/Schedule/Plugin.php
@@ -162,6 +162,11 @@ public function calendarObjectChange(RequestInterface $request, ResponseInterfac
 		if (!$this->pathOfCalendarObjectChange) {
 			$this->pathOfCalendarObjectChange = $request->getPath();
 		}
+		
+		// Ensure description consistency
+		if (!$isNew) {
+		    $this->ensureDescriptionConsistency($request, $vCal, $modified);
+		}
 
 		parent::calendarObjectChange($request, $response, $vCal, $calendarPath, $modified, $isNew);
 	}
@@ -632,4 +637,38 @@ private function createCalendar(CalendarHome $calendarHome, string $principalUri
 			'{DAV:}displayname' => $displayName,
 		]);
 	}
+	
+	private function ensureDescriptionConsistency(RequestInterface $request, VCalendar $vCal, &$modified) {
+	    $xAltDescPropName = "X-ALT-DESC";
+	    
+	    // Obtain previous version
+	    $node = $this->server->tree->getNodeForPath($request->getPath());
+	    $oldObj = Reader::read($node->get());
+	    
+	    // Get presence of description fields
+	    $hasOldDescription = isset($oldObj->VTODO) && isset($oldObj->VTODO->DESCRIPTION);
+	    $hasNewDescription = isset($vCal->VTODO) && isset($vCal->VTODO->DESCRIPTION);
+	    $hasOldXAltDesc = isset($oldObj->VTODO) && isset($oldObj->VTODO->{$xAltDescPropName});
+	    $hasNewXAltDesc = isset($vCal->VTODO) && isset($vCal->VTODO->{$xAltDescPropName});
+	    $hasAllDesc = $hasOldDescription && $hasNewDescription && $hasOldXAltDesc && $hasNewXAltDesc;
+	    
+	    // If all description fields are present, then verify consistency
+	    if ($hasAllDesc) {
+	        // Get descriptions
+	        $oldDescription = (string) $oldObj->VTODO->DESCRIPTION;
+	        $newDescription = (string) $vCal->VTODO->DESCRIPTION;
+	        $oldXAltDesc = (string) $oldObj->VTODO->{$xAltDescPropName};
+	        $newXAltDesc = (string) $vCal->VTODO->{$xAltDescPropName};
+	        
+	        // Compare descriptions
+	        $isSameDescription = $oldDescription === $newDescription;
+	        $isSameXAltDesc = $oldXAltDesc === $newXAltDesc;
+	        
+	        // If the description changed, but not the alternate one, then delete the latest
+	        if (!$isSameDescription && $isSameXAltDesc) {
+	            unset($vCal->VTODO->{$xAltDescPropName});
+	            $modified = true;
+	        }
+	    }
+	}
 }