Cron: CSV import: Add support for interval in days, in event import - refs BT#20405 (#4480)

pull/4481/head
Yannick Warnier 3 years ago committed by GitHub
parent 2e30b6a4ad
commit 328f959a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      main/cron/import_csv.php

@ -1263,13 +1263,19 @@ class ImportCsv
// Check session dates. // Check session dates.
if ($sessionInfo && !empty($sessionInfo['access_start_date'])) { if ($sessionInfo && !empty($sessionInfo['access_start_date'])) {
$date = new \DateTime($sessionInfo['access_start_date']); $date = new \DateTime($sessionInfo['access_start_date']);
$interval = new \DateInterval('P7D'); $intervalInput = '7';
if (!empty($sessionInfo['dateinterval'])) {
if ((int) $sessionInfo['dateinterval'] >= 0) {
$intervalInput = (int) $sessionInfo['dateinterval'];
}
}
$interval = new \DateInterval('P'.$intervalInput.'D');
$date->sub($interval); $date->sub($interval);
if ($date->getTimestamp() > time()) { if ($date->getTimestamp() > time()) {
$this->logger->addInfo( $this->logger->addInfo(
"Calendar event # ".$row['external_calendar_itemID']." "Calendar event # ".$row['external_calendar_itemID']."
in session [$externalSessionId] was not added in session [$externalSessionId] was not added
because the startdate is more than 7 days in the future: ".$sessionInfo['access_start_date'] because the startdate is more than $intervalInput days in the future: ".$sessionInfo['access_start_date']
); );
$errorFound = true; $errorFound = true;
} }

Loading…
Cancel
Save