Skip to content

Add missing patches #2

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
Patta wants to merge 10 commits into
base: v13
Choose a base branch
from
Open

Add missing patches #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f4f01b0
[BUGFIX] Prevent undefined array key warnings in StatisticsController
Patta Oct 24, 2024
ef9fee1
[TASK] Set default value when array key 'sys_dmail_categories_list' i…
imminger Nov 4, 2024
dfcdc36
[BUGFIX] Call to undefined method TYPO3\CMS\Core\Site\Entity\NullSite…
nollm Nov 27, 2024
e3c113b
[BUGFIX] Send Newsletter: Undefined array key "tag"
nollm Dec 18, 2024
08bfa41
[BUGFIX] Prevent undefined array key "path" warning in StatisticsCont…
Patta Feb 24, 2025
3497e39
Merge branch 'pr-538' into v13
Patta May 26, 2025
48d2087
Merge branch 'bugfix/540' into v13
Patta May 26, 2025
f59d7ac
Merge branch 'bugfix/526' into v13
Patta May 26, 2025
58923d9
Merge branch 'pr-532' into v13
Patta May 26, 2025
2bc2dc6
Merge branch 'pr-534' into v13
Patta May 26, 2025
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
4 changes: 2 additions & 2 deletions Classes/Dmailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ public function sendAdvanced(array $recipientRow, string $tableNameChar): int
// Plain
$this->theParts['plain']['content'] = '';
if ($this->flagPlain) {
$tempContentPlain = $this->getBoundaryParts($this->dmailer['boundaryParts_plain'], $recipientRow['sys_dmail_categories_list']);
$tempContentPlain = $this->getBoundaryParts($this->dmailer['boundaryParts_plain'], $recipientRow['sys_dmail_categories_list'] ?? '');
if ($this->mailHasContent) {
$tempContentPlain = $this->replaceMailMarkers($tempContentPlain, $recipientRow, $additionalMarkers);
if (trim($this->dmailer['sys_dmail_rec']['use_rdct']) || trim($this->dmailer['sys_dmail_rec']['long_link_mode'])) {
Expand Down Expand Up @@ -844,7 +844,7 @@ protected function setContent(MailMessage $mailer): void
$this->extractMediaLinks();
foreach ($this->theParts['html']['media'] as $media) {
// TODO: why are there table related tags here?
if (in_array($media['tag'], ['img', 'table', 'tr', 'td'], true) && !$media['use_jumpurl'] && !$media['do_not_embed']) {
if (isset($media['tag']) && in_array($media['tag'], ['img', 'table', 'tr', 'td'], true) && !$media['use_jumpurl'] && !$media['do_not_embed']) {
if (ini_get('allow_url_fopen')) {
$context = GeneralUtility::makeInstance(FetchUtility::class)->getStreamContext();
if (($fp = fopen($media['absRef'], 'r', false, $context)) !== false) {
Expand Down
6 changes: 3 additions & 3 deletions Classes/Module/StatisticsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,7 @@ public function getUrlStr(array $urlParts): string
$urlstr .= ($urlParts['fragment'] ?? '') ? '#' . $urlParts['fragment'] : '';
}
} else {
$urlstr = ((isset($urlParts['host']) && $urlParts['host']) ? $urlParts['scheme'] . '://' . $urlParts['host'] : $baseUrl) . $urlParts['path'];
$urlstr = ((isset($urlParts['host']) && $urlParts['host']) ? $urlParts['scheme'] . '://' . $urlParts['host'] : $baseUrl) . ($urlParts['path'] ?? '');
$urlstr .= ($urlParts['query'] ?? '') ? '?' . $urlParts['query'] : '';
$urlstr .= ($urlParts['fragment'] ?? '') ? '#' . $urlParts['fragment'] : '';
}
Expand Down Expand Up @@ -1653,11 +1653,11 @@ public function getLinkLabel(

}

if ($this->implodedParams['showContentTitle'] == 1) {
if (isset($this->implodedParams['showContentTitle']) && $this->implodedParams['showContentTitle'] == 1) {
$label = $contentTitle;
}

if ($this->implodedParams['prependContentTitle'] == 1) {
if (isset($this->implodedParams['prependContentTitle']) && $this->implodedParams['prependContentTitle'] == 1) {
$label = $contentTitle . ' (' . $linkedWord . ')';
}

Expand Down
3 changes: 2 additions & 1 deletion Classes/SelectCategories.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

use DirectMailTeam\DirectMail\Repository\TempRepository;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Site\Entity\Site;
use TYPO3\CMS\Core\Utility\GeneralUtility;

/**
Expand All @@ -39,7 +40,7 @@ public function getLocalizedCategories(array &$params): void
$lang = $this->getLang();

$site = $params['site'];
$languages = $site->getAllLanguages();
$languages = ($site instanceof Site) ? $site->getAllLanguages() : [];
foreach($languages as $language) {
if($language->getLocale()->getLanguageCode() == $lang) {
$sysLanguageUid = $language->getLanguageId();
Expand Down