9770_v2.patch
| Classes/Generator/Tx_Formhandler_Generator_TCPDF.php (working copy) | ||
|---|---|---|
| 126 | 126 |
if (is_array($value)) {
|
| 127 | 127 |
$this->pdf->Cell($feedWidth); |
| 128 | 128 |
$this->pdf->Cell($nameWidth, '6', $key, 0, 0, 'L', $fill); |
| 129 |
$this->pdf->Cell($valueWidth, '6', array_shift($value), 0, 0, 'L', $fill); |
|
| 129 |
$arraryValue = array_shift($value); |
|
| 130 |
if(strpos($arraryValue, "\n") === FALSE && strpos($arraryValue, "\r") === FALSE) {
|
|
| 131 |
$this->pdf->Cell($valueWidth, '6', array_shift($value), 0, 0, 'L', $fill); |
|
| 132 |
} else {
|
|
| 133 |
$this->pdf->MultiCell($valueWidth, '6', array_shift($value), 0, 0, 'L', $fill); |
|
| 134 |
} |
|
| 130 | 135 |
$this->pdf->Ln(); |
| 131 | 136 |
foreach ($value as $v) {
|
| 132 | 137 |
$this->pdf->Cell($feedWidth); |
| 133 | 138 |
$this->pdf->Cell($nameWidth, '6', '', 0, 0, 'L', $fill); |
| 134 |
$this->pdf->Cell($valueWidth, '6', $v, 0, 0, 'L', $fill); |
|
| 139 |
if(strpos($v, "\n") === FALSE && strpos($v, "\r") === FALSE) {
|
|
| 140 |
$this->pdf->Cell($valueWidth, '6', $v, 0, 0, 'L', $fill); |
|
| 141 |
} else {
|
|
| 142 |
$this->pdf->MultiCell($valueWidth, '6', $v, 0, 0, 'L', $fill); |
|
| 143 |
} |
|
| 135 | 144 |
$this->pdf->Ln(); |
| 136 | 145 |
} |
| 137 | 146 |
$fill = !$fill; |
| 138 | 147 |
} else {
|
| 139 | 148 |
$this->pdf->Cell($feedWidth); |
| 140 | 149 |
$this->pdf->Cell($nameWidth, '6', $key, 0, 0, 'L', $fill); |
| 141 |
$this->pdf->Cell($valueWidth, '6', $value, 0, 0, 'L', $fill); |
|
| 150 |
if(strpos($value, "\n") === FALSE && strpos($value, "\r") === FALSE) {
|
|
| 151 |
$this->pdf->Cell($valueWidth, '6', $value, 0, 0, 'L', $fill); |
|
| 152 |
} else {
|
|
| 153 |
$this->pdf->MultiCell($valueWidth, '6', $value, 0, 0, 'L', $fill); |
|
| 154 |
} |
|
| 142 | 155 |
$this->pdf->Ln(); |
| 143 | 156 |
$fill = !$fill; |
| 144 | 157 |
} |
| Classes/Controller/Module/Tx_Formhandler_Controller_Backend.php (working copy) | ||
|---|---|---|
| 360 | 360 |
$tsconfig['properties']['config.']['csv.']['encoding'] = '"'; |
| 361 | 361 |
} |
| 362 | 362 | |
| 363 |
$className = 'Tx_Formhandler_Generator_CSV'; |
|
| 364 |
if($tsconfig['properties']['config.']['generators.']['csv']) {
|
|
| 365 |
$className = $this->utilityFuncs->prepareClassName($tsconfig['properties']['config.']['generators.']['csv']); |
|
| 366 |
} |
|
| 367 |
$generator = $this->componentManager->getComponent($className); |
|
| 368 | ||
| 363 | 369 |
// check if TSconfig filter is set |
| 364 | 370 |
if ($tsconfig['properties']['config.']['csv'] != "") {
|
| 365 | 371 |
$configParams = t3lib_div::trimExplode(',', $tsconfig['properties']['config.']['csv'], 1);
|
| 366 |
$generator = $this->componentManager->getComponent('Tx_Formhandler_Generator_CSV');
|
|
| 367 | 372 |
$generator->generateModuleCSV( |
| 368 | 373 |
$records, |
| 369 | 374 |
$configParams, |
| ... | ... | |
| 374 | 379 |
} elseif (isset($params['exportParams'])) {
|
| 375 | 380 |
|
| 376 | 381 |
//if fields were chosen in the selection view, perform the export |
| 377 |
$generator = $this->componentManager->getComponent('Tx_Formhandler_Generator_CSV');
|
|
| 378 | 382 |
$generator->generateModuleCSV( |
| 379 | 383 |
$records, |
| 380 | 384 |
$params['exportParams'], |
| ... | ... | |
| 413 | 417 |
// check if TSconfig filter is set |
| 414 | 418 |
if ($tsconfig['properties']['config.']['csv'] != "") {
|
| 415 | 419 |
$configParams = t3lib_div::trimExplode(',', $tsconfig['properties']['config.']['csv'], 1);
|
| 416 |
$generator = $this->componentManager->getComponent('Tx_Formhandler_Generator_CSV');
|
|
| 417 | 420 |
$generator->generateModuleCSV($renderRecords, $configParams); |
| 418 | 421 |
} elseif (isset($params['exportParams'])) {
|
| 419 | 422 |
|
| 420 | 423 |
//if fields were chosen in the selection view, perform the export |
| 421 |
|
|
| 422 |
$generator = $this->componentManager->getComponent('Tx_Formhandler_Generator_CSV');
|
|
| 423 | 424 |
$generator->generateModuleCSV($renderRecords, $params['exportParams']); |
| 424 | 425 | |
| 425 | 426 |
//no fields chosen, show selection view. |
| Classes/Component/Tx_Formhandler_Component_Manager.php (working copy) | ||
|---|---|---|
| 93 | 93 |
$overrideSettings['settings.']['additionalIncludePaths.'] = $this->getParsedIncludePaths($overrideSettings['settings.']['additionalIncludePaths.']); |
| 94 | 94 |
$conf = $overrideSettings['settings.']['additionalIncludePaths.']; |
| 95 | 95 |
} |
| 96 |
if(TYPO3_MODE === 'BE') {
|
|
| 97 |
$tsconfig = t3lib_BEfunc::getModTSconfig(intval($_GET['id']), 'tx_formhandler_mod1'); |
|
| 98 |
if (is_array($tsconfig['properties']['config.']['additionalIncludePaths.'])) {
|
|
| 99 |
$conf = $tsconfig['properties']['config.']['additionalIncludePaths.']; |
|
| 100 |
$conf = $this->getParsedIncludePaths($conf); |
|
| 101 |
} |
|
| 102 |
} |
|
| 96 | 103 |
$this->additionalIncludePaths = $conf; |
| 97 | 104 |
} |
| 98 | 105 |
} |