Skip to content

[FEATURE] Added FAL support #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theorak wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[FEATURE] Added FAL support #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 50 additions & 25 deletions Classes/Plugin/DirectMail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\MailUtility;
use TYPO3\CMS\Core\Resource\FileReference;
use DirectMailTeam\DirectMail\DirectMailUtility;
use TYPO3\CMS\Frontend\Plugin\AbstractPlugin;
use TYPO3\CMS\Frontend\DataProcessing\FilesProcessor;

/**
* Generating plain text rendering of content elements for inclusion as plain text content in Direct Mails
Expand Down Expand Up @@ -242,32 +244,45 @@ public function getHeader()
public function getImages()
{
$imagesArray = array();
$this->getImagesStandard($imagesArray);
$this->getImagesFal($imagesArray);
if (ExtensionManagementUtility::isLoaded('dam')) {
$this->getImagesFromDam($imagesArray);
}

$images = $this->renderImages($imagesArray, !$this->cObj->data['image_zoom']?$this->cObj->data['image_link']:'', $this->cObj->data['imagecaption']);
if (is_array($imagesArray) && !empty($imagesArray)) {
$images = $this->renderImages(
$imagesArray,
!$this->cObj->data['image_zoom'] ? $this->cObj->data['image_link'] : '',
$this->cObj->data['imagecaption']
);
}

return $images;
}

/**
* Get images from image field and store this images to $images_arr
* Get images from image field and store these images to $images_arr, loaded as FAL objects
*
* @param array $imagesArray The image array
* @param string $upload_path The upload path
*
* @return void
* @return void
*/
public function getImagesStandard(array &$imagesArray, $uploadPath='uploads/pics/')
{
$images = explode(',', $this->cObj->data['image']);
foreach ($images as $file) {
if (strlen(trim($file)) > 0) {
$imagesArray[] = $this->siteUrl . $uploadPath . $file;
}
}
public function getImagesFal(&$imagesArray) {
$filesProcessor = GeneralUtility::makeInstance(FilesProcessor::class);
$processedFiles = array();

$processedFiles = $filesProcessor->process(
$this->cObj,
$this->conf,
array(
'references.' => array(
'table' => 'tt_content',
'fieldName' => 'image'
)
),
$processedFiles
);
$imagesArray = $processedFiles['files'];
}

/**
Expand Down Expand Up @@ -619,22 +634,32 @@ public function renderImages(array $imagesArray, $links, $caption)
$imageExists = false;

foreach ($imagesArray as $k => $file) {
if (strlen(trim($file)) > 0) {
if (strlen(trim($file)) > 0) { // when loaded via dam
$lines[] = $file;
if ($links && count($linksArr) > 1) {
if (isset($linksArr[$k])) {
$ll = $linksArr[$k];
} else {
$ll = $linksArr[0];
}

$theLink = $this->getLink($ll);
if ($theLink) {
$lines[] = $this->getString($this->conf['images.']['linkPrefix']) . $theLink;
}
$imageExists = true;
} else if ($file instanceof FileReference) { // new default FAL images
$extMmg = GeneralUtility::makeInstance(ExtensionManagementUtility::class);
$domain = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != "off") ? "https" : "http") . '://' . $_SERVER['SERVER_NAME'];
if ($extMmg::isLoaded('secure_downloads')) { // optional - secure links via SecureDownloads extension
$secureDownloads = GeneralUtility::makeInstance(\Bitmotion\SecureDownloads\Service\SecureDownloadService::class);
$lines[] = $domain . $secureDownloads->makeSecure($file->getPublicUrl());
} else {
$lines[] = $domain . $file->getPublicUrl();
}
$imageExists = true;
}
if ($imageExists && $links && count($linksArr) > 1) {
if (isset($linksArr[$k])) {
$ll = $linksArr[$k];
} else {
$ll = $linksArr[0];
}

$theLink = $this->getLink($ll);
if ($theLink) {
$lines[] = $this->getString($this->conf['images.']['linkPrefix']) . $theLink;
}
}
}
if ($this->conf['images.']['header'] && $imageExists) {
array_unshift($lines, $this->getString($this->conf['images.']['header']));
Expand Down