Skip to content

Commit 38ab27e

Browse files
ggoffyggoffy
committed
XoopsFormTextDateSelect: created var for isNew was not used
Class files - getValues... function: changed from {fieldname} to {tablename}Obj Class files - getForm: added field names to comment lines Creation of xoopsversion.php: config was based on last table config name for xoopseditorhandler was too long
1 parent 8e4f41e commit 38ab27e

4 files changed

Lines changed: 93 additions & 54 deletions

File tree

‎class/files/classes/ClassFiles.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ private function getValuesInObject($moduleDirname, $table, $fields)
422422
$getHandlerVar = "\${$moduleDirname}->getHandler('{$topicTableName}')";
423423
$getValues .= $xc->getXcEqualsOperator("\${$topicTableName}", $getHandlerVar, null, false, "\t\t");
424424
$getTopicTable = "\${$topicTableName}->get(\$this->getVar('{$fieldName}'))";
425-
$getValues .= $xc->getXcEqualsOperator("\${$fieldName}", $getTopicTable, null, false, "\t\t");
425+
$getValues .= $xc->getXcEqualsOperator("\${$topicTableName}Obj", $getTopicTable, null, false, "\t\t");
426426
$fMainTopic = "\${$fieldName}->getVar('{$fieldMainTopic}')";
427427
$getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}']", $fMainTopic, null, false, "\t\t");
428428
} else {

‎class/files/classes/ClassFormElements.php‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private function getXoopsFormDhtmlTextArea($language, $moduleDirname, $fieldName
128128

129129
$ret = $pc->getPhpCodeCommentLine('Form editor', $ucfFieldName, "\t\t");
130130
$ret .= $pc->getPhpCodeArray('editorConfigs', null, false, "\t\t");
131-
$getConfig = $xc->getXcGetConfig($moduleDirname, $moduleDirname.'_editor_'.$rpFieldName);
131+
$getConfig = $xc->getXcGetConfig($moduleDirname, 'editor_'.$rpFieldName);
132132
$configs = [
133133
'name' => "'{$fieldName}'", 'value' => "\$this->getVar('{$fieldName}', 'e')", 'rows' => 5, 'cols' => 40,
134134
'width' => "'100%'", 'height' => "'400px'", 'editor' => $getConfig,
@@ -228,7 +228,7 @@ private function getXoopsFormImageList($language, $moduleDirname, $tableName, $t
228228
$ucfFieldName = $tf->getCamelCase($fieldName, true);
229229
$ccFieldName = $tf->getCamelCase($fieldName, false, true);
230230
$t = "\t\t";
231-
$ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files', $t);
231+
$ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files ' . $ucfFieldName, $t);
232232
$ret .= $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
233233
$ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
234234
$ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/Frameworks/moduleclasses/icons/32'", null, false, $t);
@@ -276,7 +276,7 @@ private function getXoopsFormSelectFile($language, $moduleDirname, $fieldName, $
276276
$ccFieldName = $tf->getCamelCase($fieldName, false, true);
277277
$ucfFieldName = $tf->getCamelCase($fieldName, true);
278278
$t = "\t\t\t";
279-
$ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files', "\t\t");
279+
$ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files ' . $ucfFieldName, "\t\t");
280280
$contentIf = $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
281281
$contentIf .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
282282
$contentIf .= $xc->getXcEqualsOperator('$uploadDirectory', "'/uploads/{$moduleDirname}/images/shots'", null, false, $t);
@@ -321,11 +321,13 @@ private function getXoopsFormSelectFile($language, $moduleDirname, $fieldName, $
321321
*/
322322
private function getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, $required = 'false')
323323
{
324-
$pc = TDMCreatePhpCode::getInstance();
324+
$tf = TDMCreateFile::getInstance();
325+
$pc = TDMCreatePhpCode::getInstance();
325326
$xc = TDMCreateXoopsCode::getInstance();
326327
$cc = ClassXoopsCode::getInstance();
328+
$ucfFieldName = $tf->getCamelCase($fieldName, true);
327329
$t = "\t\t";
328-
$ret = $pc->getPhpCodeCommentLine('Form Url', 'Text File', $t);
330+
$ret = $pc->getPhpCodeCommentLine('Form Url', 'Text File ' . $ucfFieldName, $t);
329331
$ret .= $cc->getClassXoopsFormElementTray('formUrlFile', '_OPTIONS', '<br><br>', $t);
330332
$ret .= $pc->getPhpCodeTernaryOperator('formUrl', '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", $t);
331333
$ret .= $cc->getClassXoopsFormText('formText', $language, $fieldName, 75, 255, 'formUrl', false, $t);
@@ -360,7 +362,7 @@ private function getXoopsFormUploadImage($language, $moduleDirname, $tableName,
360362
$ucfFieldName = $tf->getCamelCase($fieldName, true);
361363
$ccFieldName = $tf->getCamelCase($fieldName, false, true);
362364
$t = "\t\t";
363-
$ret = $pc->getPhpCodeCommentLine('Form Upload', 'Image', $t);
365+
$ret = $pc->getPhpCodeCommentLine('Form Upload', 'Image ' . $ucfFieldName, $t);
364366
$ret .= $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
365367
$ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
366368
$ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/uploads/{$moduleDirname}/images/{$tableName}'", null, false, $t);
@@ -376,7 +378,7 @@ private function getXoopsFormUploadImage($language, $moduleDirname, $tableName,
376378
$paramLabel = "\"<br><img src='\".XOOPS_URL.\"/\".\$imageDirectory.\"/\".\${$ccFieldName}.\"' name='image1' id='image1' alt='' style='max-width:100px' />\"";
377379
$xoopsFormLabel = $cc->getClassXoopsFormLabel('', "''", $paramLabel, true, '');
378380
$ret .= $cc->getClassAddElement('imageTray', $xoopsFormLabel, $t);
379-
$ret .= $pc->getPhpCodeCommentLine('Form', 'File', $t);
381+
$ret .= $pc->getPhpCodeCommentLine('Form', 'File ' . $ucfFieldName, $t);
380382
$ret .= $cc->getClassXoopsFormElementTray('fileSelectTray', "''", '<br>', $t);
381383
$getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
382384
$xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'FORM_UPLOAD_IMAGE_'.$stuTableName, 'attachedfile', $getConfig, true, '');
@@ -402,12 +404,14 @@ private function getXoopsFormUploadImage($language, $moduleDirname, $tableName,
402404
*/
403405
private function getXoopsFormUploadFile($language, $moduleDirname, $tableName, $fieldName, $required = 'false')
404406
{
405-
$pc = TDMCreatePhpCode::getInstance();
407+
$tf = TDMCreateFile::getInstance();
408+
$pc = TDMCreatePhpCode::getInstance();
406409
$xc = TDMCreateXoopsCode::getInstance();
407410
$cc = ClassXoopsCode::getInstance();
411+
$ucfFieldName = $tf->getCamelCase($fieldName, true);
408412
$stuTableName = strtoupper($tableName);
409413
$t = "\t\t";
410-
$ret = $pc->getPhpCodeCommentLine('Form', 'File', $t);
414+
$ret = $pc->getPhpCodeCommentLine('Form', 'File ' . $ucfFieldName, $t);
411415
$getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
412416
$xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'_'.$stuTableName, $fieldName, $getConfig, true, '');
413417
$ret .= $cc->getClassAddElement('form', $xoopsFormFile, $t);
@@ -427,11 +431,13 @@ private function getXoopsFormUploadFile($language, $moduleDirname, $tableName, $
427431
*/
428432
private function getXoopsFormColorPicker($language, $moduleDirname, $fieldName, $required = 'false')
429433
{
430-
$pc = TDMCreatePhpCode::getInstance();
434+
$tf = TDMCreateFile::getInstance();
435+
$pc = TDMCreatePhpCode::getInstance();
431436
$xc = TDMCreateXoopsCode::getInstance();
432437
$cc = ClassXoopsCode::getInstance();
438+
$ucfFieldName = $tf->getCamelCase($fieldName, true);
433439
$t = "\t\t";
434-
$ret = $pc->getPhpCodeCommentLine('Form Color', 'Picker', $t);
440+
$ret = $pc->getPhpCodeCommentLine('Form Color', 'Picker ' . $ucfFieldName, $t);
435441
$getVar = $xc->getXcGetVar('', 'this', $fieldName, true);
436442
$xoopsFormFile = $cc->getClassXoopsFormColorPicker('', $language, $fieldName, $getVar, true, '');
437443
$ret .= $cc->getClassAddElement('form', $xoopsFormFile, $t);
@@ -461,7 +467,7 @@ private function getXoopsFormSelectBox($language, $moduleDirname, $tableName, $f
461467
$t = "\t\t";
462468
$ret = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t);
463469
$ret .= $xc->getXoopsHandlerLine($moduleDirname, $tableName, $t);
464-
$ret .= $pc->getPhpCodeCommentLine('Form', 'Select', $t);
470+
$ret .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ucfTableName, $t);
465471
$ret .= $cc->getClassXoopsFormSelect($ccFieldName.'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
466472
$ret .= $cc->getClassAddOption($ccFieldName.'Select', "'Empty'", $t);
467473
$ret .= $cc->getClassAddOptionArray($ccFieldName.'Select', "\${$tableName}Handler->getList()", $t);
@@ -481,11 +487,13 @@ private function getXoopsFormSelectBox($language, $moduleDirname, $tableName, $f
481487
*/
482488
private function getXoopsFormSelectUser($language, $moduleDirname, $fieldName, $required = 'false')
483489
{
484-
$pc = TDMCreatePhpCode::getInstance();
490+
$tf = TDMCreateFile::getInstance();
491+
$pc = TDMCreatePhpCode::getInstance();
485492
$xc = TDMCreateXoopsCode::getInstance();
486493
$cc = ClassXoopsCode::getInstance();
494+
$ucfFieldName = $tf->getCamelCase($fieldName, true);
487495
$t = "\t\t";
488-
$ret = $pc->getPhpCodeCommentLine('Form Select', 'User', $t);
496+
$ret = $pc->getPhpCodeCommentLine('Form Select', 'User ' . $ucfFieldName, $t);
489497
$getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
490498
$xoopsSelectUser = $cc->getClassXoopsFormSelectUser('', $language, $fieldName, 'false', $fieldName, true, $t);
491499
$ret .= $cc->getClassAddElement('form', $xoopsSelectUser.$required, $t);
@@ -508,8 +516,9 @@ private function getXoopsFormRadioYN($language, $fieldName, $required = 'false')
508516
$pc = TDMCreatePhpCode::getInstance();
509517
$cc = ClassXoopsCode::getInstance();
510518
$ccFieldName = $tf->getCamelCase($fieldName, false, true);
519+
$ucfFieldName = $tf->getCamelCase($fieldName, true);
511520
$t = "\t\t";
512-
$ret = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No', $t);
521+
$ret = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No ' . $ucfFieldName, $t);
513522
$ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
514523
$xoopsRadioYN = $cc->getClassXoopsFormRadioYN('', $language, $fieldName, $ccFieldName, true, $t);
515524
$ret .= $cc->getClassAddElement('form', $xoopsRadioYN.$required, $t);
@@ -533,9 +542,10 @@ private function getXoopsFormTextDateSelect($language, $fieldName, $required = '
533542
$cc = ClassXoopsCode::getInstance();
534543
$t = "\t\t";
535544
$ccFieldName = $tf->getCamelCase($fieldName, false, true);
536-
$ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select', $t);
545+
$ucfFieldName = $tf->getCamelCase($fieldName, true);
546+
$ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ucfFieldName, $t);
537547
$ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
538-
$xoopsTextDateSelect = $cc->getClassXoopsFormTextDateSelect('', $language, $fieldName, "''", $fieldName, true, $t);
548+
$xoopsTextDateSelect = $cc->getClassXoopsFormTextDateSelect('', $language, $fieldName, $fieldName, $ccFieldName, true, $t);
539549
$ret .= $cc->getClassAddElement('form', $xoopsTextDateSelect.$required, $t);
540550

541551
return $ret;
@@ -562,10 +572,10 @@ private function getXoopsFormTable($language, $moduleDirname, $tableName, $field
562572
$cc = ClassXoopsCode::getInstance();
563573
$ucfTableName = ucfirst($tableName);
564574
$t = "\t\t";
565-
$ret = $pc->getPhpCodeCommentLine('Form Table', $ucfTableName, $t);
566575
if ($fieldElement > 15) {
567576
$fElement = $tc->getHandler('fieldelements')->get($fieldElement);
568577
$rpFieldelementName = strtolower(str_replace('Table : ', '', $fElement->getVar('fieldelement_name')));
578+
$ret = $pc->getPhpCodeCommentLine('Form Table', $rpFieldelementName, $t);
569579
$ccFieldName = $tf->getCamelCase($fieldName, false, true);
570580
$ret .= $xc->getXoopsHandlerLine($moduleDirname, $rpFieldelementName, $t);
571581
$ret .= $cc->getClassXoopsFormSelect($ccFieldName.'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);

‎class/files/classes/ClassXoopsCode.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,11 @@ public function getClassXoopsFormSelectUser($var, $param1, $param2, $param3, $pa
458458
public function getClassXoopsFormTextDateSelect($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t")
459459
{
460460
$tdate = 'new XoopsFormTextDateSelect( ';
461-
$getVarTextDateSelect = TDMCreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param4, true);
461+
$getVarTextDateSelect = TDMCreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true);
462462
if (false === $isParam) {
463-
$ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', {$param3}, {$getVarTextDateSelect} );\n";
463+
$ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', '', {$getVarTextDateSelect} );\n";
464464
} else {
465-
$ret = "{$tdate}{$param1}, '{$param2}', {$param3}, {$getVarTextDateSelect} )";
465+
$ret = "{$tdate}{$param1}, '{$param2}', '', \${$param4} )";
466466
}
467467

468468
return $ret;

0 commit comments

Comments
 (0)