Skip to content

Commit f76470a

Browse files
ggoffyggoffy
authored
Merge pull request #1 from ggoffy/master
adapted editor handling preparation for new tpl styles
2 parents 1c38250 + c2d2e03 commit f76470a

38 files changed

Lines changed: 488 additions & 276 deletions

‎class/Fields.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private function getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fName,
228228
$fieldAttributesSelect->addOptionArray($helper->getHandler('Fieldattributes')->getList());
229229
$form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>'));
230230
// Field Null
231-
$value = (1 == $i && 1 == $tableAutoincrement) ? '2' : '2';
231+
$value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '2';
232232
$fieldNullSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value);
233233
$fieldNullSelect->addOptionArray($helper->getHandler('Fieldnull')->getList());
234234
$form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>'));

‎class/Files/Classes/ClassFiles.php‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,11 @@ private function getInitVars($fields)
134134
case 16:
135135
case 17:
136136
case 18:
137-
$ret .= $this->getInitVar($fieldName, 'TXTAREA');
137+
if ((int)$fields[$f]->getVar('field_element') == 4) {
138+
$ret .= $this->getInitVar($fieldName, 'OTHER');
139+
} else {
140+
$ret .= $this->getInitVar($fieldName, 'TXTAREA');
141+
}
138142
break;
139143
case 19:
140144
case 20:
@@ -380,17 +384,38 @@ private function getValuesInObject($moduleDirname, $table, $fields)
380384
$ucfTableName = ucfirst($table->getVar('table_name'));
381385
$ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Values', '@param null $keys' => '', '@param null $format' => '', '@param null$maxDepth' => '', '@return' => 'array'], "\t");
382386
$ucfModuleDirname = ucfirst($moduleDirname);
383-
$getValues = $xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t");
384-
$getValues .= $xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, "\t\t");
387+
$getValues = $xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, "\t\t");
385388
$fieldMainTopic = null;
389+
$helper = 0;
390+
$utility = 0;
391+
$header = '';
392+
$configMaxchar = 0;
386393
foreach (array_keys($fields) as $f) {
387394
$fieldName = $fields[$f]->getVar('field_name');
388395
$fieldElement = $fields[$f]->getVar('field_element');
389396
$rpFieldName = $this->getRightString($fieldName);
390397
switch ($fieldElement) {
391398
case 3:
399+
$getValues .= $pc->getPhpCodeStripTags("ret['{$rpFieldName}']", "\$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;
407+
$utility = 1;
408+
break;
392409
case 4:
393-
$getValues .= $pc->getPhpCodeStripTags("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", false, "\t\t");
410+
$getValues .= $xc->getXcGetVar("ret['{$rpFieldName}']", 'this', $fieldName, false, "\t\t", ", 'e'");
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)";
416+
$getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}_short']", $truncate, false, "\t\t");
417+
$helper = 1;
418+
$utility = 1;
394419
break;
395420
case 6:
396421
$getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}']", "(int)\$this->getVar('{$fieldName}') > 0 ? _YES : _NO", false, "\t\t");
@@ -424,16 +449,22 @@ private function getValuesInObject($moduleDirname, $table, $fields)
424449
$getValues .= $xc->getXcEqualsOperator("\${$topicTableName}Obj", $getTopicTable, null, "\t\t");
425450
$fMainTopic = "\${$topicTableName}Obj->getVar('{$fieldMainTopic}')";
426451
$getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}']", $fMainTopic, null, "\t\t");
427-
452+
$helper = 1;
428453
} else {
429454
$getValues .= $xc->getXcGetVar("ret['{$rpFieldName}']", 'this', $fieldName, false, "\t\t");
430455
}
431456
break;
432457
}
433458
}
459+
if ($helper > 0) {
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");
464+
}
434465
$getValues .= $this->getSimpleString('return $ret;', "\t\t");
435466

436-
$ret .= $pc->getPhpCodeFunction('getValues' . $ucfTableName, '$keys = null, $format = null, $maxDepth = null', $getValues, 'public ', false, "\t");
467+
$ret .= $pc->getPhpCodeFunction('getValues' . $ucfTableName, '$keys = null, $format = null, $maxDepth = null', $header . $getValues, 'public ', false, "\t");
437468

438469
return $ret;
439470
}

‎class/Files/Classes/ClassXoopsCode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public function getClassXoopsFormText($var, $param1, $param2, $param3, $param4,
287287
public function getClassXoopsFormTextArea($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t")
288288
{
289289
$area = 'new \XoopsFormTextArea( ';
290-
$getVarTextArea = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true);
290+
$getVarTextArea = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true, '', ", 'e'");
291291
if (false === $isParam) {
292292
$ret = "{$t}\${$var} = {$area}{$param1}, '{$param2}', {$getVarTextArea}, {$param3}, {$param4} );\n";
293293
} else {

‎class/Files/CreateArchitecture.php‎

Lines changed: 71 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ public function setFilesToBuilding($module)
202202
$tables = $tf->getTableTables($modId);
203203
$files = $tf->getTableMoreFiles($modId);
204204
$ret = [];
205+
$templateType = 'defstyle';
205206

206207
$table = null;
207208
$tableCategory = [];
@@ -271,7 +272,11 @@ public function setFilesToBuilding($module)
271272
$blocksFiles->write($module, $table, $tableName . '.php');
272273
$ret[] = $blocksFiles->render();
273274
// Templates Blocks Files
274-
$templatesBlocks = Tdmcreate\Files\Templates\Blocks\TemplatesBlocks::getInstance();
275+
if ($templateType == 'bootstrap') {
276+
$templatesBlocks = Tdmcreate\Files\Templates\Blocks\Bootstrap\TemplatesBlocks::getInstance();
277+
} else {
278+
$templatesBlocks = Tdmcreate\Files\Templates\Blocks\Defstyle\TemplatesBlocks::getInstance();
279+
}
275280
$templatesBlocks->write($module, $table, $moduleDirname . '_block_' . $tableName . '.tpl');
276281
$ret[] = $templatesBlocks->render();
277282
}
@@ -296,11 +301,19 @@ public function setFilesToBuilding($module)
296301
$userPages->write($module, $table, $tableName . '.php');
297302
$ret[] = $userPages->render();
298303
// User Templates File
299-
$userTemplatesPages = Tdmcreate\Files\Templates\User\Pages::getInstance();
304+
if ($templateType == 'bootstrap') {
305+
$userTemplatesPages = Tdmcreate\Files\Templates\User\Bootstrap\Pages::getInstance();
306+
} else {
307+
$userTemplatesPages = Tdmcreate\Files\Templates\User\Defstyle\Pages::getInstance();
308+
}
300309
$userTemplatesPages->write($module, $table, $moduleDirname . '_' . $tableName . '.tpl');
301310
$ret[] = $userTemplatesPages->render();
302311
// User List Templates File
303-
$userTemplatesPagesList = Tdmcreate\Files\Templates\User\PagesList::getInstance();
312+
if ($templateType == 'bootstrap') {
313+
$userTemplatesPagesList = Tdmcreate\Files\Templates\User\Bootstrap\PagesList::getInstance();
314+
} else {
315+
$userTemplatesPagesList = Tdmcreate\Files\Templates\User\Defstyle\PagesList::getInstance();
316+
}
304317
$userTemplatesPagesList->write($module, $table, $tables, $moduleDirname . '_' . $tableName . '_list' . '.tpl');
305318
$ret[] = $userTemplatesPagesList->render();
306319
if (1 === (int)$tables[$t]->getVar('table_category')) {
@@ -488,15 +501,27 @@ public function setFilesToBuilding($module)
488501
if ((1 == $module->getVar('mod_user')) && in_array(1, $tableUser)) {
489502
// Creation of user template files
490503
// Templates Index File
491-
$userTemplatesIndex = Tdmcreate\Files\Templates\User\Index::getInstance();
504+
if ($templateType == 'bootstrap') {
505+
$userTemplatesIndex = Tdmcreate\Files\Templates\User\Bootstrap\Index::getInstance();
506+
} else {
507+
$userTemplatesIndex = Tdmcreate\Files\Templates\User\Defstyle\Index::getInstance();
508+
}
492509
$userTemplatesIndex->write($module, $table, $tables, $moduleDirname . '_index.tpl');
493510
$ret[] = $userTemplatesIndex->render();
494511
// Templates Footer File
495-
$userTemplatesFooter = Tdmcreate\Files\Templates\User\Footer::getInstance();
512+
if ($templateType == 'bootstrap') {
513+
$userTemplatesFooter = Tdmcreate\Files\Templates\User\Bootstrap\Footer::getInstance();
514+
} else {
515+
$userTemplatesFooter = Tdmcreate\Files\Templates\User\Defstyle\Footer::getInstance();
516+
}
496517
$userTemplatesFooter->write($module, $table, $moduleDirname . '_footer.tpl');
497518
$ret[] = $userTemplatesFooter->render();
498519
// Templates Header File
499-
$userTemplatesHeader = Tdmcreate\Files\Templates\User\Header::getInstance();
520+
if ($templateType == 'bootstrap') {
521+
$userTemplatesHeader = Tdmcreate\Files\Templates\User\Bootstrap\Header::getInstance();
522+
} else {
523+
$userTemplatesHeader = Tdmcreate\Files\Templates\User\Defstyle\Header::getInstance();
524+
}
500525
$userTemplatesHeader->write($module, $moduleDirname . '_header.tpl');
501526
$ret[] = $userTemplatesHeader->render();
502527

@@ -521,7 +546,11 @@ public function setFilesToBuilding($module)
521546
$userBroken->write($module, $table, 'broken.php');
522547
$ret[] = $userBroken->render();
523548
// User Templates Broken File
524-
$userTemplatesBroken = Templates\User\Broken::getInstance();
549+
if ($templateType == 'bootstrap') {
550+
$userTemplatesBroken = Tdmcreate\Files\Templates\User\Bootstrap\Broken::getInstance();
551+
} else {
552+
$userTemplatesBroken = Tdmcreate\Files\Templates\User\Defstyle\Broken::getInstance();
553+
}
525554
$userTemplatesBroken->write($module, $table, $moduleDirname . '_broken.tpl');
526555
$ret[] = $userTemplatesBroken->render();
527556
}
@@ -531,7 +560,11 @@ public function setFilesToBuilding($module)
531560
$userPdf->write($module, $table, 'pdf.php');
532561
$ret[] = $userPdf->render();
533562
// User Templates Pdf File
534-
$userTemplatesPdf = Tdmcreate\Files\Templates\User\Pdf::getInstance();
563+
if ($templateType == 'bootstrap') {
564+
$userTemplatesPdf = Tdmcreate\Files\Templates\User\Bootstrap\Pdf::getInstance();
565+
} else {
566+
$userTemplatesPdf = Tdmcreate\Files\Templates\User\Defstyle\Pdf::getInstance();
567+
}
535568
$userTemplatesPdf->write($module, $moduleDirname . '_pdf.tpl');
536569
$ret[] = $userTemplatesPdf->render();
537570
}
@@ -541,7 +574,11 @@ public function setFilesToBuilding($module)
541574
$userPrint->write($module, $table, 'print.php');
542575
$ret[] = $userPrint->render();
543576
// User Templates Print File
544-
$userTemplatesPrint = Tdmcreate\Files\Templates\User\UserPrint::getInstance();
577+
if ($templateType == 'bootstrap') {
578+
$userTemplatesPrint = Tdmcreate\Files\Templates\User\Bootstrap\UserPrint::getInstance();
579+
} else {
580+
$userTemplatesPrint = Tdmcreate\Files\Templates\User\Defstyle\UserPrint::getInstance();
581+
}
545582
$userTemplatesPrint->write($module, $table, $moduleDirname . '_print.tpl');
546583
$ret[] = $userTemplatesPrint->render();
547584
}
@@ -552,7 +589,11 @@ public function setFilesToBuilding($module)
552589
$userRate->write($module, $table, 'rate.php');
553590
$ret[] = $userRate->render();
554591
// User Templates Rate File
555-
$userTemplatesRate = Tdmcreate\Files\Templates\User\Rate::getInstance();
592+
if ($templateType == 'bootstrap') {
593+
$userTemplatesRate = Tdmcreate\Files\Templates\User\Bootstrap\Rate::getInstance();
594+
} else {
595+
$userTemplatesRate = Tdmcreate\Files\Templates\User\Defstyle\Rate::getInstance();
596+
}
556597
$userTemplatesRate->write($module, $table, $moduleDirname . '_rate.tpl');
557598
$ret[] = $userTemplatesRate->render();
558599
}
@@ -563,7 +604,11 @@ public function setFilesToBuilding($module)
563604
$userRss->write($module, $table, 'rss.php');
564605
$ret[] = $userRss->render();
565606
// User Templates Rss File
566-
$userTemplatesRss = Tdmcreate\Files\Templates\User\Rss::getInstance();
607+
if ($templateType == 'bootstrap') {
608+
$userTemplatesRss = Tdmcreate\Files\Templates\User\Bootstrap\Rss::getInstance();
609+
} else {
610+
$userTemplatesRss = Tdmcreate\Files\Templates\User\Defstyle\Rss::getInstance();
611+
}
567612
$userTemplatesRss->write($module, $moduleDirname . '_rss.tpl');
568613
$ret[] = $userTemplatesRss->render();
569614
}
@@ -573,7 +618,11 @@ public function setFilesToBuilding($module)
573618
$userSingle->write($module, $table, 'single.php');
574619
$ret[] = $userSingle->render();
575620
// User Templates Single File
576-
$userTemplatesSingle = Tdmcreate\Files\Templates\User\Single::getInstance();
621+
if ($templateType == 'bootstrap') {
622+
$userTemplatesSingle = Tdmcreate\Files\Templates\User\Bootstrap\Single::getInstance();
623+
} else {
624+
$userTemplatesSingle = Tdmcreate\Files\Templates\User\Defstyle\Single::getInstance();
625+
}
577626
$userTemplatesSingle->write($module, $table, $moduleDirname . '_single.tpl');
578627
$ret[] = $userTemplatesSingle->render();
579628
}
@@ -584,7 +633,11 @@ public function setFilesToBuilding($module)
584633
$userSubmit->write($module, $table, 'submit.php');
585634
$ret[] = $userSubmit->render();
586635
// User Templates Submit File
587-
$userTemplatesSubmit = Tdmcreate\Files\Templates\User\Submit::getInstance();
636+
if ($templateType == 'bootstrap') {
637+
$userTemplatesSubmit = Tdmcreate\Files\Templates\User\Bootstrap\Submit::getInstance();
638+
} else {
639+
$userTemplatesSubmit = Tdmcreate\Files\Templates\User\Defstyle\Submit::getInstance();
640+
}
588641
$userTemplatesSubmit->write($module, $table, $moduleDirname . '_submit.tpl');
589642
$ret[] = $userTemplatesSubmit->render();
590643
}
@@ -613,7 +666,11 @@ public function setFilesToBuilding($module)
613666
$languageMain->write($module, $tables, 'main.php');
614667
$ret[] = $languageMain->render();
615668
// User Templates Submit File
616-
$userTemplatesUserBreadcrumbs = Templates\User\Breadcrumbs::getInstance();
669+
if ($templateType == 'bootstrap') {
670+
$userTemplatesUserBreadcrumbs = Tdmcreate\Files\Templates\User\Bootstrap\Breadcrumbs::getInstance();
671+
} else {
672+
$userTemplatesUserBreadcrumbs = Tdmcreate\Files\Templates\User\Defstyle\Breadcrumbs::getInstance();
673+
}
617674
$userTemplatesUserBreadcrumbs->write($module, $moduleDirname . '_breadcrumbs.tpl');
618675
$ret[] = $userTemplatesUserBreadcrumbs->render();
619676
}

‎class/Files/CreateXoopsCode.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ public function getXcSetVarObj($tableName, $fieldName, $var, $t = '')
119119
*
120120
* @return string
121121
*/
122-
public function getXcGetVar($varLeft = '', $handle = '', $var = '', $isParam = false, $t = '')
122+
public function getXcGetVar($varLeft = '', $handle = '', $var = '', $isParam = false, $t = '', $format = '')
123123
{
124124
if (!$isParam) {
125-
$ret = "{$t}\${$varLeft} = \${$handle}->getVar('{$var}');\n";
125+
$ret = "{$t}\${$varLeft} = \${$handle}->getVar('{$var}'{$format});\n";
126126
} else {
127-
$ret = "\${$handle}->getVar('{$var}')";
127+
$ret = "\${$handle}->getVar('{$var}'{$format})";
128128
}
129129

130130
return $ret;
@@ -1192,7 +1192,7 @@ public function getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $f
11921192
$ret .= $this->getXcSetVarDateTime($tableName, $tableSoleName, $fieldName, $t);
11931193
break;
11941194
default:
1195-
$ret .= $axc->getAxcSetVarMisc($tableName, $fieldName, $fieldType, $t);
1195+
$ret .= $axc->getAxcSetVarMisc($tableName, $fieldName, $fieldType, $fieldElement, $t);
11961196
break;
11971197
}
11981198
}

0 commit comments

Comments
 (0)