Skip to content

Commit 9dbca1f

Browse files
committed
adapted editor handling 2
1 parent 59b573e commit 9dbca1f

1 file changed

Lines changed: 18 additions & 4 deletions

File tree

class/Files/Classes/ClassFiles.php

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,21 +389,32 @@ private function getValuesInObject($moduleDirname, $table, $fields)
389389
$helper = 0;
390390
$utility = 0;
391391
$header = '';
392+
$configMaxchar = 0;
392393
foreach (array_keys($fields) as $f) {
393394
$fieldName = $fields[$f]->getVar('field_name');
394395
$fieldElement = $fields[$f]->getVar('field_element');
395396
$rpFieldName = $this->getRightString($fieldName);
396397
switch ($fieldElement) {
397398
case 3:
398399
$getValues .= $pc->getPhpCodeStripTags("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}', 'e')", false, "\t\t");
399-
$getValues .= $pc->getPhpCodeStripTags("ret['{$rpFieldName}_short']", "\$this->getVar('{$fieldName}', 'e')", false, "\t\t");
400+
if ($configMaxchar == 0) {
401+
$getValues .= $xc->getXcEqualsOperator('$editorMaxchar', $xc->getXcGetConfig('editor_maxchar'), false, "\t\t");
402+
$configMaxchar = 1;
403+
}
404+
$truncate = "\$utility::truncateHtml(\$ret['{$rpFieldName}'], \$editorMaxchar)";
405+
$getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}_short']", $truncate, false, "\t\t");
406+
$helper = 1;
400407
$utility = 1;
401408
break;
402409
case 4:
403410
$getValues .= $xc->getXcGetVar("ret['{$rpFieldName}']", 'this', $fieldName, false, "\t\t", ", 'e'");
404-
$getValues .= $xc->getXcEqualsOperator('$editorMaxchar', $xc->getXcGetConfig('editor_maxchar'), false, "\t\t");
405-
$truncate = $ucfModuleDirname . "\Utility::truncateHtml(\$ret['{$rpFieldName}'], \$editorMaxchar)";
411+
if ($configMaxchar == 0) {
412+
$getValues .= $xc->getXcEqualsOperator('$editorMaxchar', $xc->getXcGetConfig('editor_maxchar'), false, "\t\t");
413+
$configMaxchar = 1;
414+
}
415+
$truncate = "\$utility::truncateHtml(\$ret['{$rpFieldName}'], \$editorMaxchar)";
406416
$getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}_short']", $truncate, false, "\t\t");
417+
$helper = 1;
407418
$utility = 1;
408419
break;
409420
case 6:
@@ -446,7 +457,10 @@ private function getValuesInObject($moduleDirname, $table, $fields)
446457
}
447458
}
448459
if ($helper > 0) {
449-
$header .= $xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t");
460+
$header .= $xc->getXcGetInstance('helper ', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t");
461+
}
462+
if ($utility > 0) {
463+
$header .= $xc->getXcEqualsOperator('$utility', "new \XoopsModules\\{$ucfModuleDirname}\Utility()", '',"\t\t");
450464
}
451465
$getValues .= $this->getSimpleString('return $ret;', "\t\t");
452466

0 commit comments

Comments
 (0)