Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ef0199c authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

significant change

parent a4c368c8
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlug
RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch
RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch
RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch
RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch
RUN rm -rf ${TMP_PATCH_DIR}

# Custom theme
+18 −34
Original line number Diff line number Diff line
--- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php	2022-10-26 11:45:19.589156800 +0530
+++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php	2022-10-26 15:28:50.269156800 +0530
@@ -151,15 +151,6 @@
 	 */
 	public function schedule(Message $iTipMessage) {
 
-		// Not sending any emails if the system considers the update
-		// insignificant.
-		if (!$iTipMessage->significantChange) {
-			if (!$iTipMessage->scheduleStatus) {
-				$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			}
-			return;
-		}
-
 		$summary = $iTipMessage->message->VEVENT->SUMMARY;
 
 		if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') {
@@ -252,7 +243,21 @@
--- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php	2022-11-10 10:39:19.134653000 +0530
+++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php	2022-11-11 12:28:15.829119700 +0530
@@ -252,7 +252,21 @@

 		$summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event');

@@ -39,7 +23,7 @@
 		$this->addBulletList($template, $l10n, $vevent);

 		// Only add response buttons to invitation requests: Fix Issue #11230
@@ -516,6 +521,7 @@
@@ -516,6 +530,7 @@
 		return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
 	}

@@ -47,7 +31,7 @@
 	/**
 	 * @param IEMailTemplate $template
 	 * @param IL10N $l10n
@@ -542,24 +548,86 @@
@@ -542,24 +557,86 @@
 	/**
 	 * @param IEMailTemplate $template
 	 * @param IL10N $l10n
@@ -89,7 +73,8 @@
+				$lastmodified=$dtstampTime;
+				$selectedEvent = $currentevent;
+			}
+		}
 		}
-		$meetingWhen = $this->generateWhenString($l10n, $vevent);
+		if ($selectedEvent->SUMMARY) {
+			if (trim($selectedEvent->SUMMARY) == trim($parentevent->SUMMARY)) {
+				$template->addBodyListItem($selectedEvent->SUMMARY, $l10n->t('Title:'),
@@ -98,8 +83,7 @@
+				$template->addBodyListItemModified($selectedEvent->SUMMARY, $l10n->t('Updated Title:'),
+					$this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT);
+			}
 		}
-		$meetingWhen = $this->generateWhenString($l10n, $vevent);
+		}
+		$meetingWhen = $this->generateWhenString($l10n, $selectedEvent);
 		if ($meetingWhen) {
-			$template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
@@ -145,7 +129,7 @@
 			$template->addBodyListItem(sprintf('<a href="%s">%s</a>',
 					htmlspecialchars($url),
 					htmlspecialchars($url)),
@@ -567,13 +635,16 @@
@@ -567,13 +644,16 @@
 				$this->getAbsoluteImagePath('caldav/link.png'),
 				$url,'',self::IMIP_INDENT);
 		}
@@ -168,7 +152,7 @@
 		}
 	}

@@ -662,7 +733,7 @@
@@ -662,7 +742,7 @@
 										Message $iTipMessage, $lastOccurrence) {
 		$token = $this->createInvitationToken($iTipMessage, $lastOccurrence);

@@ -177,7 +161,7 @@
 			$l10n->t('Accept'),
 			$this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [
 				'token' => $token,
@@ -670,18 +741,10 @@
@@ -670,18 +750,10 @@
 			$l10n->t('Decline'),
 			$this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [
 				'token' => $token,
+11 −0
Original line number Diff line number Diff line
--- ./3rdparty/sabre/vobject/lib/ITip/Broker.php	2022-09-06 21:39:42.985827300 +0530
+++ ./3rdparty/sabre/vobject/lib/ITip/Broker-New.php	2022-11-11 12:45:53.449119700 +0530
@@ -75,6 +75,8 @@
         'RDATE',
         'EXDATE',
         'STATUS',
+        'SUMMARY',
+        'DESCRIPTION',
     ];
 
     /**