Skip to content
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

update for php 8 and contao 4.13 #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

update for php 8 and contao 4.13 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc5e5fc
Contao 4 compat
SvenMeierhans Jun 4, 2019
bd31c9b
make it compatible to php
beegegroup Aug 22, 2023
ccf5fdf
set Namespace in Case there is a conflict
beegegroup Aug 24, 2023
2e48edb
only tested on php8
beegegroup Aug 24, 2023
9942eaf
make MailFormAttachment.php compatible to Contao 4.13
beegegroup Aug 24, 2023
0afcc61
revert to original maintainer composer.json
beegegroup Aug 24, 2023
baa65ec
missing "
beegegroup Aug 24, 2023
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
5 changes: 2 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@
"source":"https://github.com/menatwork-ia/mfa"
},
"require":{
"php":">=5.3",
"contao/core":">=2.11,<4",
"contao-community-alliance/composer-installer":"*"
"php": "^8.0",
"contao/core-bundle": "^4.0"
},
"autoload":{
"classmap":["system/"]
Expand Down
78 changes: 68 additions & 10 deletions system/modules/mfa/MailFormAttachment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* @license GNU/LGPL
* @filesource
*/
use Contao\System;

/**
* Class MailFormAttachment
Expand All @@ -24,12 +25,14 @@ class MailFormAttachment extends Frontend
* @param array $arrFiles
* @param array $arrLabels
*/
public function processFormData($arrPost, $arrForm, $arrFiles, $arrLabels)
public function processFormData($arrPost, $arrForm, $arrFiles = array(), $arrLabels)
{

// Send form data via e-mail
if ($arrForm['mfa'])
{
$this->import('String');
$projectDir = System::getContainer()->getParameter('kernel.project_dir');
$fineUploaderFiles = array();

$keys = array();
$values = array();
Expand All @@ -44,15 +47,51 @@ public function processFormData($arrPost, $arrForm, $arrFiles, $arrLabels)
}

$v = deserialize($v);

if(is_string($v) && is_file($v)) {
$fineUploaderFile = array(
"fullpath" => $v,
"name" => basename($v)
);
$fineUploaderFiles[$k] = $fineUploaderFile;
} else if(is_array($v) && is_file(reset($v))) {
foreach($v as $key => $filePath) {
$fineUploaderFile = array(
"fullpath" => $filePath,
"name" => basename($filePath)
);

$fineUploaderFiles[$k][] = $fineUploaderFile;
}
}

// Skip empty fields
if ($arrForm['skipEmpty'] && !is_array($v) && !strlen($v))
{
continue;
}

// Add field to message
$message .= (isset($arrLabels[$k]) ? $arrLabels[$k] : ucfirst($k)) . ': ' . (is_array($v) ? implode(', ', $v) : $v) . "\n";
// Add field and value to message
if(is_array($fineUploaderFiles[$k])) {
$files = array();
if(array_key_exists("name", $fineUploaderFiles[$k])) {
$files[] = $fineUploaderFiles[$k];
} else {
$files = array_merge($files, $fineUploaderFiles[$k]);
}
$message .= (isset($arrLabels[$k]) ? $arrLabels[$k] : ucfirst($k)) . ": \n";
foreach($files as $file) {

$uploaded = $this->Environment->base . str_replace(TL_ROOT . '/', '', dirname($file['fullpath'])) . '/' . rawurlencode($file['name']);

$message .= $uploaded . "\n";

}
unset($files);
unset($uploaded);
} else {
$message .= (isset($arrLabels[$k]) ? $arrLabels[$k] : ucfirst($k)) . ': ' . (is_array($v) ? implode(', ', $v) : $v) . "\n";
}

// Prepare XML file
if ($arrForm['format'] == 'xml')
Expand All @@ -71,8 +110,8 @@ public function processFormData($arrPost, $arrForm, $arrFiles, $arrLabels)
$values[] = (is_array($v) ? implode(',', $v) : $v);
}
}

$recipients = $this->String->splitCsv($arrForm['recipient']);
$recipients = \Contao\StringUtil::splitCsv($arrForm['recipient']);

// Format recipients
foreach ($recipients as $k => $v)
Expand Down Expand Up @@ -134,13 +173,13 @@ public function processFormData($arrPost, $arrForm, $arrFiles, $arrLabels)
// Attach CSV file
if ($arrForm['format'] == 'csv')
{
$email->attachFileFromString($this->String->decodeEntities('"' . implode('";"', $keys) . '"' . "\n" . '"' . implode('";"', $values) . '"'), 'form.csv', 'text/comma-separated-values');
$email->attachFileFromString(\Contao\StringUtil::decodeEntities('"' . implode('";"', $keys) . '"' . "\n" . '"' . implode('";"', $values) . '"'), 'form.csv', 'text/comma-separated-values');
}

$uploaded = '';

// Attach uploaded files
if (count($arrFiles))
if (!empty($arrFiles) && count($arrFiles))
{
foreach ($arrFiles as $file)
{
Expand All @@ -161,13 +200,32 @@ public function processFormData($arrPost, $arrForm, $arrFiles, $arrLabels)
}
}
}
//TODO: Refactoring - e.g. for Fineuploader
if(count($fineUploaderFiles)) {
foreach ($fineUploaderFiles as $file)
{
switch ($arrForm['mail_attachment'])
{
case 'mail_attach':
$email->attachFileFromString(file_get_contents($file['fullpath']), $file['name'], $file['type']);
break;
case 'attach_mail_link_path':
$email->attachFileFromString(file_get_contents($file['fulltmp_name']), $file['name'], $file['type']);
case 'link_path':
// Add a link to the uploaded file
//$uploaded .= "\n" . $this->Environment->base . str_replace(TL_ROOT . '/', '', dirname($file['fullpath'])) . '/' . rawurlencode($file['name']);
break;
}
}
}

$uploaded = strlen(trim($uploaded)) ? "\n\n---\n" . $uploaded : '';

// Send e-mail
$email->text = $this->String->decodeEntities(trim($message)) . $uploaded . "\n\n";
$email->text = \Contao\StringUtil::decodeEntities(trim($message)) . $uploaded . "\n\n";
$email->sendTo($recipients);

}
}

}
}