txmodxoops / tdmcreate

class/files/sql/SqlFile.php

Spacing +11 added lines, -11 removed lines

@@ -197,7 +197,7 @@ 
                     case 3:
                     case 4:
                     case 5:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         if (empty($fieldDefault)) {
                             $default = "DEFAULT '0'";
                         } else {
@@ -207,7 +207,7 @@ 
                     case 6:
                     case 7:
                     case 8:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         if (empty($fieldDefault)) {
                             $default = "DEFAULT '0.00'"; // From MySQL 5.7 Manual
                         } else {
@@ -217,11 +217,11 @@ 
                     case 9:
                     case 10:
                         $fValues = implode("', '", explode(',', str_replace(' ', '', $fieldValue)));
-                        $type = $fieldTypeName . '(\'' . $fValues . '\')'; // Used with comma separator
+                        $type = $fieldTypeName.'(\''.$fValues.'\')'; // Used with comma separator
                         $default = "DEFAULT '{$fieldDefault}'";
                         break;
                     case 11:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         if (empty($fieldDefault)) {
                             $default = "DEFAULT 'my@email.com'";
                         } else {
@@ -229,7 +229,7 @@ 
                         }
                         break;
                     case 12:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         if (empty($fieldDefault)) {
                             $default = "DEFAULT 'http:\\'";
                         } else {
@@ -238,7 +238,7 @@ 
                         break;
                     case 13:
                     case 14:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         $default = "DEFAULT '{$fieldDefault}'";
                         break;
                     case 15:
@@ -252,7 +252,7 @@ 
                     case 20:
                     case 21:
                     case 22:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         $default = "DEFAULT '{$fieldDefault}'";
                         break;
                     case 23:
@@ -264,7 +264,7 @@ 
                         }
                         break;
                     default:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         $default = "DEFAULT '{$fieldDefault}'";
                         break;
                 }
@@ -309,7 +309,7 @@ 
         // ================= COMMA ================= //
         for ($i = 0; $i < $j; ++$i) {
             if ($i != $j - 1) {
-                $row[] = $comma[$i] . ',';
+                $row[] = $comma[$i].',';
             } else {
                 $row[] = $comma[$i];
             }
@@ -423,9 +423,9 @@ 
         // Comma issue
         for ($i = 1; $i <= $index; ++$i) {
             if ($i != $index - 1) {
-                $ret = $this->getComma(isset($comma[$i]), ',') . "\n";
+                $ret = $this->getComma(isset($comma[$i]), ',')."\n";
             } else {
-                $ret = $this->getComma(isset($comma[$i])) . "\n";
+                $ret = $this->getComma(isset($comma[$i]))."\n";
             }
         }
 

class/files/classes/ClassFiles.php

Spacing +32 added lines, -32 removed lines

@@ -169,7 +169,7 @@ 
         $ucfModuleDirname = ucfirst($moduleDirname);
         $ucfTableName = ucfirst($tableName);
         $ret = $pc->getPhpCodeDefined();
-        $ret .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfModuleDirname . $ucfTableName]);
+        $ret .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfModuleDirname.$ucfTableName]);
         $cCl = '';
 
         $fieldInForm = [];
@@ -184,9 +184,9 @@ 
             $rpFieldName = $this->getRightString($fieldName);
             if (in_array(5, $fieldElementId, true)) {
                 if (count($rpFieldName) % 5) {
-                    $optionsFieldName[] = "'" . $rpFieldName . "'";
+                    $optionsFieldName[] = "'".$rpFieldName."'";
                 } else {
-                    $optionsFieldName[] = "'" . $rpFieldName . "'\n";
+                    $optionsFieldName[] = "'".$rpFieldName."'\n";
                 }
             }
             if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) {
@@ -221,7 +221,7 @@ 
         }
         unset($fieldElementId);
 
-        $ret .= $pc->getPhpCodeClass($ucfModuleDirname . $ucfTableName, $cCl, 'XoopsObject');
+        $ret .= $pc->getPhpCodeClass($ucfModuleDirname.$ucfTableName, $cCl, 'XoopsObject');
 
         return $ret;
     }
@@ -243,7 +243,7 @@ 
         $getInsertedId = $xc->getXcEqualsOperator('$newInsertedId', "\$GLOBALS['xoopsDB']->getInsertId()", null, false, "\t\t");
         $getInsertedId .= $this->getSimpleString('return $newInsertedId;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('getNewInsertedId' . $ucfTableName, '', $getInsertedId, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getNewInsertedId'.$ucfTableName, '', $getInsertedId, 'public ', false, "\t");
 
         return $ret;
     }
@@ -284,12 +284,12 @@ 
         if (1 != $tableCategory/* && (1 == $tablePermissions)*/) {
             $getForm .= $pc->getPhpCodeCommentLine('Permissions for', 'uploader', "\t\t");
             $getForm .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_getHandler('groupperm')", null, true, "\t\t");
-            $getForm .= $pc->getPhpCodeTernaryOperator('groups', 'is_object(' . $xUser . ')', $xUser . '->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t");
-            $checkRight = $xc->getXcCheckRight('$gpermHandler', $permString = '', 32, '$groups', $xModule . '->getVar(\'mid\')', true);
+            $getForm .= $pc->getPhpCodeTernaryOperator('groups', 'is_object('.$xUser.')', $xUser.'->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t");
+            $checkRight = $xc->getXcCheckRight('$gpermHandler', $permString = '', 32, '$groups', $xModule.'->getVar(\'mid\')', true);
             $ternaryOperator = $pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t\t\t");
             $permissionUpload = $xc->getXcEqualsOperator('$permissionUpload', 'true', null, false, "\t\t\t\t");
             $ternOperator = $pc->getPhpCodeRemoveCarriageReturn($ternaryOperator, '', "\r");
-            $if = $pc->getPhpCodeConditions('!' . $xUser . '->isAdmin(' . $xModule . '->mid())', '', '', $ternaryOperator, $permissionUpload, "\t\t\t");
+            $if = $pc->getPhpCodeConditions('!'.$xUser.'->isAdmin('.$xModule.'->mid())', '', '', $ternaryOperator, $permissionUpload, "\t\t\t");
             $getForm .= $pc->getPhpCodeConditions($xUser, '', '', $if, $ternOperator, "\t\t");
         }
         $getForm .= $pc->getPhpCodeCommentLine('Title', '', "\t\t");
@@ -312,7 +312,7 @@ 
         $getForm .= $cc->getClassAddElement('form', "new XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)");
         $getForm .= $this->getSimpleString('return $form;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('getForm' . $ucfTableName, '$action = false', $getForm, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getForm'.$ucfTableName, '$action = false', $getForm, 'public ', false, "\t");
 
         return $ret;
     }
@@ -433,7 +433,7 @@ 
         }
         $getValues .= $this->getSimpleString('return $ret;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('getValues' . $ucfTableName, '$keys = null, $format = null, $maxDepth = null', $getValues, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getValues'.$ucfTableName, '$keys = null, $format = null, $maxDepth = null', $getValues, 'public ', false, "\t");
 
         return $ret;
     }
@@ -460,7 +460,7 @@ 
         $getToArray .= $pc->getPhpCodeForeach('vars', true, false, 'var', $foreach, "\t\t");
         $getToArray .= $this->getSimpleString('return $ret;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('toArray' . $ucfTableName, '', $getToArray, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('toArray'.$ucfTableName, '', $getToArray, 'public ', false, "\t");
 
         return $ret;
     }
@@ -497,7 +497,7 @@ 
 
         $getOptions .= $this->getSimpleString('return $ret;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('getOptions' . $ucfTableName, '', $getOptions, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getOptions'.$ucfTableName, '', $getOptions, 'public ', false, "\t");
 
         return $ret;
     }
@@ -526,8 +526,8 @@ 
         $ucfModuleDirname = ucfirst($moduleDirname);
         $ucfTableName = ucfirst($tableName);
         $ucfTableSoleName = ucfirst($tableSoleName);
-        $ucfModuleTable = $ucfModuleDirname . $ucfTableName;
-        $multiLineCom = ['Class Object Handler' => $ucfModuleDirname . $ucfTableName];
+        $ucfModuleTable = $ucfModuleDirname.$ucfTableName;
+        $multiLineCom = ['Class Object Handler' => $ucfModuleDirname.$ucfTableName];
         $ret = $pc->getPhpCodeCommentMultiLine($multiLineCom);
 
         $cClh = $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => 'null|XoopsDatabase $db'], "\t");
@@ -613,15 +613,15 @@ 
         $xc = TDMCreateXoopsCode::getInstance();
         $cc = ClassXoopsCode::getInstance();
         $ucfTableName = ucfirst($tableName);
-        $ret = $pc->getPhpCodeCommentMultiLine(['Get Count ' . $ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
+        $ret = $pc->getPhpCodeCommentMultiLine(['Get Count '.$ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
 
-        $critCount = $cc->getClassCriteriaCompo('crCount' . $ucfTableName, "\t\t");
+        $critCount = $cc->getClassCriteriaCompo('crCount'.$ucfTableName, "\t\t");
         $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crCount{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
-        $critCount .= $xc->getXcEqualsOperator('$crCount' . $ucfTableName, $paramsCrit, null, false, "\t\t");
+        $critCount .= $xc->getXcEqualsOperator('$crCount'.$ucfTableName, $paramsCrit, null, false, "\t\t");
         $critCount .= $this->getSimpleString("return parent::getCount(\$crCount{$ucfTableName});", "\t\t");
         $params = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
 
-        $ret .= $pc->getPhpCodeFunction('getCount' . $ucfTableName, $params, $critCount, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getCount'.$ucfTableName, $params, $critCount, 'public ', false, "\t");
 
         return $ret;
     }
@@ -641,15 +641,15 @@ 
         $xc = TDMCreateXoopsCode::getInstance();
         $cc = ClassXoopsCode::getInstance();
         $ucfTableName = ucfirst($tableName);
-        $ret = $pc->getPhpCodeCommentMultiLine(['Get All ' . $ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t");
+        $ret = $pc->getPhpCodeCommentMultiLine(['Get All '.$ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t");
 
-        $critAll = $cc->getClassCriteriaCompo('crAll' . $ucfTableName, "\t\t");
+        $critAll = $cc->getClassCriteriaCompo('crAll'.$ucfTableName, "\t\t");
         $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
-        $critAll .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCrit, null, false, "\t\t");
+        $critAll .= $xc->getXcEqualsOperator('$crAll'.$ucfTableName, $paramsCrit, null, false, "\t\t");
         $critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t");
         $params = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
 
-        $ret .= $pc->getPhpCodeFunction('getAll' . $ucfTableName, $params, $critAll, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getAll'.$ucfTableName, $params, $critAll, 'public ', false, "\t");
 
         return $ret;
     }
@@ -690,19 +690,19 @@ 
         $param2 = "\$GLOBALS['xoopsUser']->getGroups()";
         $param3 = "\$GLOBALS['xoopsModule']->getVar('mid')";
         $critAll .= $xc->getXcGetItemIds($lcfTopicTableName, 'gpermHandler', $param1, $param2, $param3, "\t\t");
-        $critAll .= $cc->getClassCriteriaCompo('crAll' . $ucfTableName, "\t\t");
+        $critAll .= $cc->getClassCriteriaCompo('crAll'.$ucfTableName, "\t\t");
 
         if (false !== mb_strpos($fieldName, 'status')) {
             $crit = $cc->getClassCriteria('', "'{$fieldName}'", '0', "'!='", true);
-            $critAll .= $cc->getClassAdd('crAll' . $ucfTableName, $crit, "\t\t");
+            $critAll .= $cc->getClassAdd('crAll'.$ucfTableName, $crit, "\t\t");
         }
         $paramsCritAll = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
-        $critAll .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCritAll, null, false, "\t\t");
+        $critAll .= $xc->getXcEqualsOperator('$crAll'.$ucfTableName, $paramsCritAll, null, false, "\t\t");
 
         $critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t");
         $params = "\${$tableFieldName}Id, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
 
-        $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id" . $ucfTableName, $params, $critAll, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id".$ucfTableName, $params, $critAll, 'public ', false, "\t");
 
         return $ret;
     }
@@ -718,14 +718,14 @@ 
         $pc = TDMCreatePhpCode::getInstance();
         $cc = ClassXoopsCode::getInstance();
         $ucfTableName = ucfirst($tableName);
-        $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria ' . $ucfTableName, '@param       ' => "\$cr{$ucfTableName}", '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
+        $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria '.$ucfTableName, '@param       ' => "\$cr{$ucfTableName}", '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
 
         $paramsAllCriteria = "\$cr{$ucfTableName}, \$start, \$limit, \$sort, \$order";
 
-        $critSets = $cc->getClassSetStart('cr' . $ucfTableName, 'start', "\t\t");
-        $critSets .= $cc->getClassSetLimit('cr' . $ucfTableName, 'limit', "\t\t");
-        $critSets .= $cc->getClassSetSort('cr' . $ucfTableName, 'sort', "\t\t");
-        $critSets .= $cc->getClassSetOrder('cr' . $ucfTableName, 'order', "\t\t");
+        $critSets = $cc->getClassSetStart('cr'.$ucfTableName, 'start', "\t\t");
+        $critSets .= $cc->getClassSetLimit('cr'.$ucfTableName, 'limit', "\t\t");
+        $critSets .= $cc->getClassSetSort('cr'.$ucfTableName, 'sort', "\t\t");
+        $critSets .= $cc->getClassSetOrder('cr'.$ucfTableName, 'order', "\t\t");
         $critSets .= $this->getSimpleString("return \$cr{$ucfTableName};", "\t\t");
 
         $ret .= $pc->getPhpCodeFunction("get{$ucfTableName}Criteria", $paramsAllCriteria, $critSets, 'private ', false, "\t");
@@ -750,7 +750,7 @@ 
         $tableSoleName = $table->getVar('table_solename');
         $ucfTableSoleName = ucfirst($tableSoleName);
         $ccTableSoleName = $this->getCamelCase($tableSoleName, true);
-        $ret = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName . ' from id', '' => '', '@return' => 'string'], "\t");
+        $ret = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName.' from id', '' => '', '@return' => 'string'], "\t");
         $soleName = $xc->getXcEqualsOperator("\${$tableSoleName}Id", "(int)( \${$tableSoleName}Id )", null, false, "\t\t");
         $soleName .= $xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, false, "\t\t");
 

class/files/classes/ClassFormElements.php

Spacing +61 added lines, -61 removed lines

@@ -75,11 +75,11 @@ 
             $ret = $pc->getPhpCodeCommentLine('Form Text', $ucfFieldName, "\t\t");
             $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", "\t\t");
             $formText = $cc->getClassXoopsFormText('', $language, $fieldName, 20, 150, "{$ccFieldName}", true);
-            $ret .= $cc->getClassAddElement('form', $formText . $required);
+            $ret .= $cc->getClassAddElement('form', $formText.$required);
         } else {
             $ret = $pc->getPhpCodeCommentLine('Form Text', $ucfFieldName, "\t\t");
             $formText = $cc->getClassXoopsFormText('', $language, $fieldName, 50, 255, "this->getVar('{$fieldName}')", true);
-            $ret .= $cc->getClassAddElement('form', $formText . $required);
+            $ret .= $cc->getClassAddElement('form', $formText.$required);
         }
 
         return $ret;
@@ -102,7 +102,7 @@ 
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $ret = $pc->getPhpCodeCommentLine('Form Text Area', $ucfFieldName, "\t\t");
         $formTextArea = $cc->getClassXoopsFormTextArea('', $language, $fieldName, 4, 47, true);
-        $ret .= $cc->getClassAddElement('form', $formTextArea . $required);
+        $ret .= $cc->getClassAddElement('form', $formTextArea.$required);
 
         return $ret;
     }
@@ -128,7 +128,7 @@ 
 
         $ret = $pc->getPhpCodeCommentLine('Form editor', $ucfFieldName, "\t\t");
         $ret .= $pc->getPhpCodeArray('editorConfigs', null, false, "\t\t");
-        $getConfig = $xc->getXcGetConfig($moduleDirname, 'editor_' . $rpFieldName);
+        $getConfig = $xc->getXcGetConfig($moduleDirname, 'editor_'.$rpFieldName);
         $configs = [
             'name' => "'{$fieldName}'", 'value' => "\$this->getVar('{$fieldName}', 'e')", 'rows' => 5, 'cols' => 40,
             'width' => "'100%'", 'height' => "'400px'", 'editor' => $getConfig,
@@ -137,7 +137,7 @@ 
             $ret .= $xc->getXcEqualsOperator("\$editorConfigs['{$c}']", $d, null, false, "\t\t");
         }
         $formEditor = $cc->getClassXoopsFormEditor('', $language, $fieldName, 'editorConfigs', true);
-        $ret .= $cc->getClassAddElement('form', $formEditor . $required);
+        $ret .= $cc->getClassAddElement('form', $formEditor.$required);
 
         return $ret;
     }
@@ -163,20 +163,20 @@ 
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
         $t = "\t\t";
         if (in_array(5, $fieldElementId, true) > 1) {
-            $ret = $pc->getPhpCodeCommentLine('Form Check Box', 'List Options ' . $ucfFieldName, $t);
+            $ret = $pc->getPhpCodeCommentLine('Form Check Box', 'List Options '.$ucfFieldName, $t);
             $ret .= $xc->getXcEqualsOperator('$checkOption', '$this->getOptions()');
-            $foreach = $cc->getClassXoopsFormCheckBox('check' . $ucfFieldName, '<hr />', $tableSoleName . '_option', '$checkOption', false, $t);
-            $foreach .= $cc->getClassSetDescription('check' . $ucfFieldName, "{$language}{$stuTableSoleName}_OPTIONS_DESC", $t);
-            $foreach .= $cc->getClassAddOption('check' . $ucfFieldName, "\$option, {$language}{$stuTableSoleName}_ . strtoupper(\$option)", $t . "\t");
+            $foreach = $cc->getClassXoopsFormCheckBox('check'.$ucfFieldName, '<hr />', $tableSoleName.'_option', '$checkOption', false, $t);
+            $foreach .= $cc->getClassSetDescription('check'.$ucfFieldName, "{$language}{$stuTableSoleName}_OPTIONS_DESC", $t);
+            $foreach .= $cc->getClassAddOption('check'.$ucfFieldName, "\$option, {$language}{$stuTableSoleName}_ . strtoupper(\$option)", $t."\t");
             $ret .= $pc->getPhpCodeForeach("{$tableName}All", false, false, 'option', $foreach, $t);
             $intElem = "\$check{$ucfFieldName}{$required}";
             $ret .= $cc->getClassAddElement('form', $intElem, $t);
         } else {
             $ret = $pc->getPhpCodeCommentLine('Form Check Box', $ucfFieldName, $t);
             $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
-            $ret .= $cc->getClassXoopsFormCheckBox('check' . $ucfFieldName, "{$language}", $fieldName, "\${$ccFieldName}", false, $t);
+            $ret .= $cc->getClassXoopsFormCheckBox('check'.$ucfFieldName, "{$language}", $fieldName, "\${$ccFieldName}", false, $t);
             $option = "1, {$language}";
-            $ret .= $cc->getClassAddOption('check' . $ucfFieldName, $option, $t);
+            $ret .= $cc->getClassAddOption('check'.$ucfFieldName, $option, $t);
             $intElem = "\$check{$ucfFieldName}{$required}";
             $ret .= $cc->getClassAddElement('form', $intElem, $t);
         }
@@ -224,16 +224,16 @@ 
         $cc = ClassXoopsCode::getInstance();
         $stuTableName = mb_strtoupper($tableName);
         $rpFieldName = $tf->getRightString($fieldName);
-        $stuSoleName = mb_strtoupper($tableSoleName . '_' . $rpFieldName);
+        $stuSoleName = mb_strtoupper($tableSoleName.'_'.$rpFieldName);
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files ' . $ucfFieldName, $t);
-        $ret .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
-        $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files '.$ucfFieldName, $t);
+        $ret .= $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
+        $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
         $ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/Frameworks/moduleclasses/icons/32'", null, false, $t);
-        $ret .= $cc->getClassXoopsFormElementTray('imageTray', $language . $stuSoleName, '<br>', $t);
-        $sprintf = $pc->getPhpCodeSprintf($language . 'FORM_IMAGE_PATH', '".{$imageDirectory}/"');
+        $ret .= $cc->getClassXoopsFormElementTray('imageTray', $language.$stuSoleName, '<br>', $t);
+        $sprintf = $pc->getPhpCodeSprintf($language.'FORM_IMAGE_PATH', '".{$imageDirectory}/"');
         $ret .= $cc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t);
         $ret .= $xc->getXcXoopsImgListArray('imageArray', 'XOOPS_ROOT_PATH . $imageDirectory', $t);
         $contForeach = $cc->getClassAddOption('imageSelect', '"{$image1}", $image1', "\t");
@@ -247,7 +247,7 @@ 
         $ret .= $pc->getPhpCodeCommentLine('Form', 'File', $t);
         $ret .= $cc->getClassXoopsFormElementTray('fileSelectTray', "''", '<br>', $t);
         $getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
-        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language . 'FORM_IMAGE_LIST_' . $stuTableName, 'attachedfile', $getConfig, true, '');
+        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'FORM_IMAGE_LIST_'.$stuTableName, 'attachedfile', $getConfig, true, '');
         $ret .= $cc->getClassAddElement('fileSelectTray', $xoopsFormFile, $t);
         $xoopsFormLabel1 = $cc->getClassXoopsFormLabel('', "''", null, true, $t);
         $ret .= $cc->getClassAddElement('fileSelectTray', $xoopsFormLabel1, $t);
@@ -276,12 +276,12 @@ 
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files ' . $ucfFieldName, "\t\t");
-        $contentIf = $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
-        $contentIf .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files '.$ucfFieldName, "\t\t");
+        $contentIf = $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
+        $contentIf .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
         $contentIf .= $xc->getXcEqualsOperator('$uploadDirectory', "'/uploads/{$moduleDirname}/images/shots'", null, false, $t);
-        $contentIf .= $cc->getClassXoopsFormElementTray('imageTray', $language . 'FORM_IMAGE', '<br>', $t);
-        $sprintf = $pc->getPhpCodeSprintf($language . 'FORM_PATH', '".{$uploadDirectory}/"');
+        $contentIf .= $cc->getClassXoopsFormElementTray('imageTray', $language.'FORM_IMAGE', '<br>', $t);
+        $sprintf = $pc->getPhpCodeSprintf($language.'FORM_PATH', '".{$uploadDirectory}/"');
         $contentIf .= $cc->getClassXoopsFormSelect('imageSelect', $sprintf, 'selected_image', "\${$moduleDirname}ShotImage", 5, 'false', false, $t);
         $contentIf .= $xc->getXcXoopsImgListArray('imageArray', 'XOOPS_ROOT_PATH . $uploadDirectory', $t);
         $contForeach = $cc->getClassAddOption('imageSelect', '"{$image1}", $image1', "\t");
@@ -295,8 +295,8 @@ 
         $contentIf .= $pc->getPhpCodeCommentLine('Form', 'File', "\t\t");
         $contentIf .= $cc->getClassXoopsFormElementTray('fileSelectTray', "''", '<br>', $t);
         $getConfigFile = $xc->getXcGetConfig($moduleDirname, 'maxuploadsize');
-        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language . '_FORM_UPLOAD', 'attachedimage', $getConfigFile, true, '');
-        $contentIf1 = $cc->getClassAddElement('fileSelectTray', $xoopsFormFile . $required, $t . "\t");
+        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'_FORM_UPLOAD', 'attachedimage', $getConfigFile, true, '');
+        $contentIf1 = $cc->getClassAddElement('fileSelectTray', $xoopsFormFile.$required, $t."\t");
 
         $contentIf .= $cc->getClassAddElement('imageTray', '$fileSelectTray', $t);
         $contentIf .= $cc->getClassAddElement('form', "\$imageTray{$required}", $t);
@@ -327,14 +327,14 @@ 
         $cc = ClassXoopsCode::getInstance();
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Url', 'Text File ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Url', 'Text File '.$ucfFieldName, $t);
         $ret .= $cc->getClassXoopsFormElementTray('formUrlFile', '_OPTIONS', '<br><br>', $t);
         $ret .= $pc->getPhpCodeTernaryOperator('formUrl', '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", $t);
         $ret .= $cc->getClassXoopsFormText('formText', $language, $fieldName, 75, 255, 'formUrl', false, $t);
-        $ret .= $cc->getClassAddElement('formUrlFile', '$formText' . $required, $t);
+        $ret .= $cc->getClassAddElement('formUrlFile', '$formText'.$required, $t);
         $getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
-        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language . 'UPLOAD', 'attachedfile', $getConfig, true, '');
-        $ret .= $cc->getClassAddElement('formUrlFile', $xoopsFormFile . $required, $t);
+        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'UPLOAD', 'attachedfile', $getConfig, true, '');
+        $ret .= $cc->getClassAddElement('formUrlFile', $xoopsFormFile.$required, $t);
         $ret .= $cc->getClassAddElement('form', '$formUrlFile', $t);
 
         return $ret;
@@ -362,12 +362,12 @@ 
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Upload', 'Image ' . $ucfFieldName, $t);
-        $ret .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
-        $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Upload', 'Image '.$ucfFieldName, $t);
+        $ret .= $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
+        $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
         $ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/uploads/{$moduleDirname}/images/{$tableName}'", null, false, $t);
         $ret .= $cc->getClassXoopsFormElementTray('imageTray', '_OPTIONS', '<br>', $t);
-        $sprintf = $pc->getPhpCodeSprintf($language . 'FORM_IMAGE_PATH', '".{$imageDirectory}/"');
+        $sprintf = $pc->getPhpCodeSprintf($language.'FORM_IMAGE_PATH', '".{$imageDirectory}/"');
         $ret .= $cc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t);
         $ret .= $xc->getXcXoopsImgListArray('imageArray', 'XOOPS_ROOT_PATH . $imageDirectory', $t);
         $contForeach = $cc->getClassAddOption('imageSelect', '"{$image1}", $image1', "\t");
@@ -378,10 +378,10 @@ 
         $paramLabel = "\"<br><img src='\".XOOPS_URL.\"/\".\$imageDirectory.\"/\".\${$ccFieldName}.\"' name='image1' id='image1' alt='' style='max-width:100px' />\"";
         $xoopsFormLabel = $cc->getClassXoopsFormLabel('', "''", $paramLabel, true, '');
         $ret .= $cc->getClassAddElement('imageTray', $xoopsFormLabel, $t);
-        $ret .= $pc->getPhpCodeCommentLine('Form', 'File ' . $ucfFieldName, $t);
+        $ret .= $pc->getPhpCodeCommentLine('Form', 'File '.$ucfFieldName, $t);
         $ret .= $cc->getClassXoopsFormElementTray('fileSelectTray', "''", '<br>', $t);
         $getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
-        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language . 'FORM_UPLOAD_IMAGE_' . $stuTableName, 'attachedfile', $getConfig, true, '');
+        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'FORM_UPLOAD_IMAGE_'.$stuTableName, 'attachedfile', $getConfig, true, '');
         $ret .= $cc->getClassAddElement('fileSelectTray', $xoopsFormFile, $t);
         $xoopsFormLabel1 = $cc->getClassXoopsFormLabel('', "''", null, true);
         $ret .= $cc->getClassAddElement('fileSelectTray', $xoopsFormLabel1, $t);
@@ -411,9 +411,9 @@ 
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $stuTableName = mb_strtoupper($tableName);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form', 'File ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form', 'File '.$ucfFieldName, $t);
         $getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
-        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language . '_' . $stuTableName, $fieldName, $getConfig, true, '');
+        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'_'.$stuTableName, $fieldName, $getConfig, true, '');
         $ret .= $cc->getClassAddElement('form', $xoopsFormFile, $t);
 
         return $ret;
@@ -437,7 +437,7 @@ 
         $cc = ClassXoopsCode::getInstance();
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Color', 'Picker ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Color', 'Picker '.$ucfFieldName, $t);
         $getVar = $xc->getXcGetVar('', 'this', $fieldName, true);
         $xoopsFormFile = $cc->getClassXoopsFormColorPicker('', $language, $fieldName, $getVar, true, '');
         $ret .= $cc->getClassAddElement('form', $xoopsFormFile, $t);
@@ -467,10 +467,10 @@ 
         $t = "\t\t";
         $ret = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t);
         $ret .= $xc->getXoopsHandlerLine($moduleDirname, $tableName, $t);
-        $ret .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ucfTableName, $t);
-        $ret .= $cc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
-        $ret .= $cc->getClassAddOption($ccFieldName . 'Select', "'Empty'", $t);
-        $ret .= $cc->getClassAddOptionArray($ccFieldName . 'Select', "\${$tableName}Handler->getList()", $t);
+        $ret .= $pc->getPhpCodeCommentLine('Form', 'Select '.$ucfTableName, $t);
+        $ret .= $cc->getClassXoopsFormSelect($ccFieldName.'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
+        $ret .= $cc->getClassAddOption($ccFieldName.'Select', "'Empty'", $t);
+        $ret .= $cc->getClassAddOptionArray($ccFieldName.'Select', "\${$tableName}Handler->getList()", $t);
         $ret .= $cc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t);
 
         return $ret;
@@ -493,10 +493,10 @@ 
         $cc = ClassXoopsCode::getInstance();
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Select', 'User ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Select', 'User '.$ucfFieldName, $t);
         $getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
         $xoopsSelectUser = $cc->getClassXoopsFormSelectUser('', $language, $fieldName, 'false', $fieldName, true, $t);
-        $ret .= $cc->getClassAddElement('form', $xoopsSelectUser . $required, $t);
+        $ret .= $cc->getClassAddElement('form', $xoopsSelectUser.$required, $t);
 
         return $ret;
     }
@@ -518,10 +518,10 @@ 
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No '.$ucfFieldName, $t);
         $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
         $xoopsRadioYN = $cc->getClassXoopsFormRadioYN('', $language, $fieldName, $ccFieldName, true, $t);
-        $ret .= $cc->getClassAddElement('form', $xoopsRadioYN . $required, $t);
+        $ret .= $cc->getClassAddElement('form', $xoopsRadioYN.$required, $t);
 
         return $ret;
     }
@@ -543,10 +543,10 @@ 
         $t = "\t\t";
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
-        $ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select '.$ucfFieldName, $t);
         $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
         $xoopsTextDateSelect = $cc->getClassXoopsFormTextDateSelect('', $language, $fieldName, $fieldName, $ccFieldName, true, $t);
-        $ret .= $cc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t);
+        $ret .= $cc->getClassAddElement('form', $xoopsTextDateSelect.$required, $t);
 
         return $ret;
     }
@@ -578,8 +578,8 @@ 
             $ret = $pc->getPhpCodeCommentLine('Form Table', $rpFieldelementName, $t);
             $ccFieldName = $tf->getCamelCase($fieldName, false, true);
             $ret .= $xc->getXoopsHandlerLine($moduleDirname, $rpFieldelementName, $t);
-            $ret .= $cc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
-            $ret .= $cc->getClassAddOptionArray($ccFieldName . 'Select', "\${$rpFieldelementName}Handler->getList()", $t);
+            $ret .= $cc->getClassXoopsFormSelect($ccFieldName.'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
+            $ret .= $cc->getClassAddOptionArray($ccFieldName.'Select', "\${$rpFieldelementName}Handler->getList()", $t);
             $ret .= $cc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t);
         }
 
@@ -611,13 +611,13 @@ 
         $ret = $pc->getPhpCodeCommentLine('Form Table', $ucfTopicTableName, $t);
         $ret .= $xc->getXoopsHandlerLine($moduleDirname, $stlTopicTableName, $t);
         $ret .= $cc->getClassCriteriaCompo('criteria', $t);
-        $ret .= $xc->getXcClearHandlerCount($stlTopicTableName . 'Count', $stlTopicTableName, '$criteria', $t);
-        $contIf = $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'include', $t . "\t");
-        $contIf .= $xc->getXcClearHandlerAll($stlTopicTableName . 'All', $stlTopicTableName, '$criteria', $t . "\t");
-        $contIf .= $cc->getClassXoopsObjectTree($stlTopicTableName . 'Tree', $stlTopicTableName . 'All', $fieldId, $fieldPid, $t . "\t");
-        $contIf .= $cc->getClassXoopsMakeSelBox($ccFieldPid, $stlTopicTableName . 'Tree', $fieldPid, $fieldMain, '--', $fieldPid, $t . "\t");
+        $ret .= $xc->getXcClearHandlerCount($stlTopicTableName.'Count', $stlTopicTableName, '$criteria', $t);
+        $contIf = $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'include', $t."\t");
+        $contIf .= $xc->getXcClearHandlerAll($stlTopicTableName.'All', $stlTopicTableName, '$criteria', $t."\t");
+        $contIf .= $cc->getClassXoopsObjectTree($stlTopicTableName.'Tree', $stlTopicTableName.'All', $fieldId, $fieldPid, $t."\t");
+        $contIf .= $cc->getClassXoopsMakeSelBox($ccFieldPid, $stlTopicTableName.'Tree', $fieldPid, $fieldMain, '--', $fieldPid, $t."\t");
         $formLabel = $cc->getClassXoopsFormLabel('', $language, "\${$ccFieldPid}", true, '');
-        $contIf .= $cc->getClassAddElement('form', $formLabel, $t . "\t");
+        $contIf .= $cc->getClassAddElement('form', $formLabel, $t."\t");
         $ret .= $pc->getPhpCodeConditions("\${$stlTopicTableName}Count", null, null, $contIf, false, $t);
         $ret .= $pc->getPhpCodeUnset('criteria', $t);
 
@@ -642,11 +642,11 @@ 
         $ret = $pc->getPhpCodeCommentLine('Use tag', 'module', $t);
         $isDir = $pc->getPhpCodeIsDir("XOOPS_ROOT_PATH . '/modules/tag'");
         $ret .= $pc->getPhpCodeTernaryOperator('dirTag', $isDir, 'true', 'false', $t);
-        $paramIf = '(' . $xc->getXcGetConfig($moduleDirname, 'usetag') . ' == 1)';
-        $condIf = $pc->getPhpCodeTernaryOperator('tagId', '$this->isNew()', '0', "\$this->getVar('{$fieldId}')", $t . "\t");
-        $condIf .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'modules/tag/include/formtag', true, false, $type = 'include', $t . "\t");
+        $paramIf = '('.$xc->getXcGetConfig($moduleDirname, 'usetag').' == 1)';
+        $condIf = $pc->getPhpCodeTernaryOperator('tagId', '$this->isNew()', '0', "\$this->getVar('{$fieldId}')", $t."\t");
+        $condIf .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'modules/tag/include/formtag', true, false, $type = 'include', $t."\t");
         $paramElem = $cc->getClassXoopsFormTag('', 'tag', 60, 255, 'tagId', 0, true, '');
-        $condIf .= $cc->getClassAddElement('form', $paramElem . $required, $t . "\t");
+        $condIf .= $cc->getClassAddElement('form', $paramElem.$required, $t."\t");
         $ret .= $pc->getPhpCodeConditions($paramIf, ' && ', '$dirTag', $condIf, false, $t);
 
         return $ret;
@@ -686,7 +686,7 @@ 
                 $fieldId = $fieldName;
             }
             $rpFieldName = $tf->getRightString($fieldName);
-            $language = $languageFunct . mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName);
+            $language = $languageFunct.mb_strtoupper($tableSoleName).'_'.mb_strtoupper($rpFieldName);
             $required = (1 == $fields[$f]->getVar('field_required')) ? ', true' : '';
 
             $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement);

class/files/templates/admin/TemplatesAdminPages.php

Spacing +13 added lines, -13 removed lines

@@ -72,7 +72,7 @@ 
     private function getTemplatesAdminPagesHeader($moduleDirname)
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
-        $ret = $hc->getHtmlComment('Header') . PHP_EOL;
+        $ret = $hc->getHtmlComment('Header').PHP_EOL;
         $ret .= $hc->getSmartyIncludeFile($moduleDirname, 'header', true);
 
         return $ret;
@@ -90,7 +90,7 @@ 
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
         $th = '';
-        $langHeadId = mb_strtoupper($tableSoleName) . '_ID';
+        $langHeadId = mb_strtoupper($tableSoleName).'_ID';
         if (1 == $tableAutoincrement) {
             $lang = $hc->getSmartyConst($language, $langHeadId);
             $th .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, false, "\t\t\t");
@@ -98,7 +98,7 @@ 
         foreach (array_keys($fields) as $f) {
             $fieldName = $fields[$f]->getVar('field_name');
             $rpFieldName = $this->getRightString($fieldName);
-            $langFieldName = mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName);
+            $langFieldName = mb_strtoupper($tableSoleName).'_'.mb_strtoupper($rpFieldName);
             if (1 == $fields[$f]->getVar('field_inlist')) {
                 $lang = $hc->getSmartyConst($language, $langFieldName);
                 $th .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, false, "\t\t\t");
@@ -107,7 +107,7 @@ 
 
         $lang = $hc->getSmartyConst($language, 'FORM_ACTION');
         $th .= $hc->getHtmlTag('th', ['class' => 'center width5'], $lang, false, false, "\t\t\t");
-        $tr = $hc->getHtmlTag('tr', ['class' => 'head'], $th) . PHP_EOL;
+        $tr = $hc->getHtmlTag('tr', ['class' => 'head'], $th).PHP_EOL;
         $ret = $hc->getHtmlTag('thead', [], $tr);
 
         return $ret;
@@ -155,12 +155,12 @@ 
                         $src = $hc->getSmartyNoSimbol('xoModuleIcons32');
                         $src .= $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
                         $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, false);
-                        $td .= $hc->getHtmlTag('td', ['class' => 'center'], "\n\t" . $img);
+                        $td .= $hc->getHtmlTag('td', ['class' => 'center'], "\n\t".$img);
                         break;
                     case 13:
-                        $single = $hc->getSmartySingleVar($moduleDirname . '_upload_url');
+                        $single = $hc->getSmartySingleVar($moduleDirname.'_upload_url');
                         $double = $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                        $img = $hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName, 'style' => 'max-width:100px'], '', true, false);
+                        $img = $hc->getHtmlTag('img', ['src' => $single."/images/{$tableName}/".$double, 'alt' => $tableName, 'style' => 'max-width:100px'], '', true, false);
                         $td .= $hc->getHtmlTag('td', ['class' => 'center'], $img, false, false, "\t\t");
                         break;
                     default:
@@ -176,19 +176,19 @@ 
         $double = $hc->getSmartyDoubleVar($tableSoleName, 'id');
         $src = $hc->getSmartyNoSimbol('xoModuleIcons16 edit.png');
         $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, false);
-        $anchor = $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double, 'title' => $lang], "\n\t" . $img);
+        $anchor = $hc->getHtmlTag('a', ['href' => $tableName.".php?op=edit&{$fieldId}=".$double, 'title' => $lang], "\n\t".$img);
         $lang = $hc->getSmartyConst('', '_DELETE');
         $double = $hc->getSmartyDoubleVar($tableSoleName, 'id');
         $src = $hc->getSmartyNoSimbol('xoModuleIcons16 delete.png');
         $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, false);
-        $anchor .= $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], "\n\t" . $img);
-        $td .= $hc->getHtmlTag('td', ['class' => 'center  width5'], "\n" . $anchor);
+        $anchor .= $hc->getHtmlTag('a', ['href' => $tableName.".php?op=delete&{$fieldId}=".$double, 'title' => $lang], "\n\t".$img);
+        $td .= $hc->getHtmlTag('td', ['class' => 'center  width5'], "\n".$anchor);
         $cycle = $hc->getSmartyNoSimbol('cycle values=\'odd, even\'');
         $tr = $hc->getHtmlTag('tr', ['class' => $cycle], $td);
-        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr);
+        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName.'_list', $tr);
         $tbody = $hc->getHtmlTag('tbody', [], $foreach);
 
-        return $hc->getSmartyConditions($tableName . '_count', '', '', $tbody);
+        return $hc->getSmartyConditions($tableName.'_count', '', '', $tbody);
     }
 
     /**
@@ -229,7 +229,7 @@ 
         $div = $hc->getHtmlTag('div', ['class' => 'xo-pagenav floatright'], $single);
         $div .= $hc->getHtmlTag('div', ['class' => 'clear spacer'], '');
         $htmlTable .= $hc->getSmartyConditions('pagenav', '', '', $div);
-        $ifList = $hc->getSmartyConditions($tableName . '_list', '', '', $htmlTable);
+        $ifList = $hc->getSmartyConditions($tableName.'_list', '', '', $htmlTable);
         $single = $hc->getSmartySingleVar('form');
         $divComm = $hc->getHtmlComment('Display navigation');
         //$divComm .= $hc->getHtmlTag('div', array('class' => 'errorMsg'), $single);

class/files/templates/blocks/TemplatesBlocks.php

Spacing +22 added lines, -22 removed lines

@@ -80,11 +80,11 @@ 
             $fieldName = $fields[$f]->getVar('field_name');
             $stuFieldName = mb_strtoupper($fieldName);
             $lang = $hc->getSmartyConst($language, $stuFieldName);
-            $th .= $hc->getHtmlTableHead($lang, 'center') . PHP_EOL;
+            $th .= $hc->getHtmlTableHead($lang, 'center').PHP_EOL;
         }
-        $tr = $hc->getHtmlTableRow($th, 'head') . PHP_EOL;
+        $tr = $hc->getHtmlTableRow($th, 'head').PHP_EOL;
 
-        return $hc->getHtmlTableThead($tr) . PHP_EOL;
+        return $hc->getHtmlTableThead($tr).PHP_EOL;
     }
 
     /**
@@ -104,7 +104,7 @@ 
         $td = '';
         if (1 == $tableAutoincrement) {
             $double = $hc->getSmartyDoubleVar($tableSoleName, 'id');
-            $td .= $hc->getHtmlTag('td', ['class' => 'center'], $double) . PHP_EOL;
+            $td .= $hc->getHtmlTag('td', ['class' => 'center'], $double).PHP_EOL;
         }
         $fields = $this->getTableFields($tableMid, $tableId);
         foreach (array_keys($fields) as $f) {
@@ -122,7 +122,7 @@ 
                         // Old code was <span style="background-color: #<{\$list.{$rpFieldName}}>;">...
                         $double = $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
                         $span = $hc->getHtmlTag('span', [], $double);
-                        $td .= $hc->getHtmlTag('td', ['class' => 'center'], $span) . PHP_EOL;
+                        $td .= $hc->getHtmlTag('td', ['class' => 'center'], $span).PHP_EOL;
                         /*$ret .= <<<EOT
                     <td class="center"><span style="background-color: #<{\$list.{$rpFieldName}}>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td>\n
 EOT;*/
@@ -131,18 +131,18 @@ 
                         $src = $hc->getSmartyNoSimbol('xoModuleIcons32');
                         $src .= $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
                         $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true);
-                        $td .= $hc->getHtmlTag('td', ['class' => 'center'], $img) . PHP_EOL;
+                        $td .= $hc->getHtmlTag('td', ['class' => 'center'], $img).PHP_EOL;
                         break;
                     case 13:
-                        $single = $hc->getSmartySingleVar($moduleDirname . '_upload_url');
+                        $single = $hc->getSmartySingleVar($moduleDirname.'_upload_url');
                         $double = $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                        $img = $hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName], '', true);
-                        $td .= $hc->getHtmlTag('td', ['class' => 'center'], $img) . PHP_EOL;
+                        $img = $hc->getHtmlTag('img', ['src' => $single."/images/{$tableName}/".$double, 'alt' => $tableName], '', true);
+                        $td .= $hc->getHtmlTag('td', ['class' => 'center'], $img).PHP_EOL;
                         break;
                     default:
                         if (0 != $f) {
                             $double = $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $td .= $hc->getHtmlTag('td', ['class' => 'center'], $double) . PHP_EOL;
+                            $td .= $hc->getHtmlTag('td', ['class' => 'center'], $double).PHP_EOL;
                         }
                         break;
                 }
@@ -152,19 +152,19 @@ 
         $double = $hc->getSmartyDoubleVar($tableSoleName, 'id');
         $src = $hc->getSmartyNoSimbol('xoModuleIcons32 edit.png');
         $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true);
-        $anchor = $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&amp;{$fieldId}=" . $double, 'title' => $lang], $img) . PHP_EOL;
+        $anchor = $hc->getHtmlTag('a', ['href' => $tableName.".php?op=edit&amp;{$fieldId}=".$double, 'title' => $lang], $img).PHP_EOL;
         $lang = $hc->getSmartyConst('', '_DELETE');
         $double = $hc->getSmartyDoubleVar($tableSoleName, 'id');
         $src = $hc->getSmartyNoSimbol('xoModuleIcons32 delete.png');
-        $img = $hc->getHtmlTag('img', ['src' => $src . $double, 'alt' => $tableName], '', true);
-        $anchor .= $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&amp;{$fieldId}=" . $double, 'title' => $lang], $img) . PHP_EOL;
-        $td .= $hc->getHtmlTag('td', ['class' => 'center'], "\n" . $anchor) . PHP_EOL;
+        $img = $hc->getHtmlTag('img', ['src' => $src.$double, 'alt' => $tableName], '', true);
+        $anchor .= $hc->getHtmlTag('a', ['href' => $tableName.".php?op=delete&amp;{$fieldId}=".$double, 'title' => $lang], $img).PHP_EOL;
+        $td .= $hc->getHtmlTag('td', ['class' => 'center'], "\n".$anchor).PHP_EOL;
         $cycle = $hc->getSmartyNoSimbol('cycle values="odd, even"');
-        $tr = $hc->getHtmlTag('tr', ['class' => $cycle], $td) . PHP_EOL;
-        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr) . PHP_EOL;
-        $tbody = $hc->getHtmlTag('tbody', [], $foreach) . PHP_EOL;
+        $tr = $hc->getHtmlTag('tr', ['class' => $cycle], $td).PHP_EOL;
+        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName.'_list', $tr).PHP_EOL;
+        $tbody = $hc->getHtmlTag('tbody', [], $foreach).PHP_EOL;
 
-        return $hc->getSmartyConditions($tableName . '_count', '', '', $tbody) . PHP_EOL;
+        return $hc->getSmartyConditions($tableName.'_count', '', '', $tbody).PHP_EOL;
     }
 
     /**
@@ -174,10 +174,10 @@ 
     private function getTemplatesBlocksTableTfoot()
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
-        $td = $hc->getHtmlTag('td', [], '&nbsp;') . PHP_EOL;
-        $tr = $hc->getHtmlTag('tr', [], $td) . PHP_EOL;
+        $td = $hc->getHtmlTag('td', [], '&nbsp;').PHP_EOL;
+        $tr = $hc->getHtmlTag('tr', [], $td).PHP_EOL;
 
-        return $hc->getHtmlTag('tfoot', [], $tr) . PHP_EOL;
+        return $hc->getHtmlTag('tfoot', [], $tr).PHP_EOL;
     }
 
     /**
@@ -199,7 +199,7 @@ 
         $tbody .= $this->getTemplatesBlocksTableTfoot();
         $single = $hc->getSmartySingleVar('table_type');
 
-        return $hc->getHtmlTable($tbody, 'table table-' . $single) . PHP_EOL;
+        return $hc->getHtmlTable($tbody, 'table table-'.$single).PHP_EOL;
     }
 
     /**

class/files/templates/user/TemplatesUserPages.php

Spacing +20 added lines, -20 removed lines

@@ -73,7 +73,7 @@ 
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
 
-        return $hc->getSmartyIncludeFile($moduleDirname, 'header') . PHP_EOL;
+        return $hc->getSmartyIncludeFile($moduleDirname, 'header').PHP_EOL;
     }
 
     /**
@@ -92,7 +92,7 @@ 
         $tbody .= $this->getTemplatesUserPagesTableTfoot();
         $single = $hc->getSmartySingleVar('table_type');
 
-        return $hc->getHtmlTable($tbody, 'table table-' . $single) . PHP_EOL;
+        return $hc->getHtmlTable($tbody, 'table table-'.$single).PHP_EOL;
     }
 
     /**
@@ -106,11 +106,11 @@ 
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
         $stuTableName = mb_strtoupper($tableName);
         $single = $hc->getSmartySingleVar('divideby');
-        $lang = $hc->getSmartyConst($language, $stuTableName . '_TITLE');
-        $th = $hc->getHtmlTableHead($lang, '', $single) . PHP_EOL;
-        $tr = $hc->getHtmlTableRow($th, 'head') . PHP_EOL;
+        $lang = $hc->getSmartyConst($language, $stuTableName.'_TITLE');
+        $th = $hc->getHtmlTableHead($lang, '', $single).PHP_EOL;
+        $tr = $hc->getHtmlTableRow($th, 'head').PHP_EOL;
 
-        return $hc->getHtmlTableThead($tr) . PHP_EOL;
+        return $hc->getHtmlTableThead($tr).PHP_EOL;
     }
 
     /**
@@ -126,14 +126,14 @@ 
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
         $single = $hc->getSmartySingleVar('panel_type');
         $include = $hc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName);
-        $div = $hc->getHtmlDiv($include, 'panel panel-' . $single);
-        $cont = $hc->getHtmlTableData($div) . PHP_EOL;
-        $html = $hc->getHtmlEmpty('</tr><tr>') . PHP_EOL;
-        $cont .= $hc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$divideby', $html) . PHP_EOL;
-        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL;
-        $tr = $hc->getHtmlTableRow($foreach) . PHP_EOL;
-
-        return $hc->getHtmlTableTbody($tr) . PHP_EOL;
+        $div = $hc->getHtmlDiv($include, 'panel panel-'.$single);
+        $cont = $hc->getHtmlTableData($div).PHP_EOL;
+        $html = $hc->getHtmlEmpty('</tr><tr>').PHP_EOL;
+        $cont .= $hc->getSmartyConditions($tableSoleName.'.count', ' is div by ', '$divideby', $html).PHP_EOL;
+        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName, $cont).PHP_EOL;
+        $tr = $hc->getHtmlTableRow($foreach).PHP_EOL;
+
+        return $hc->getHtmlTableTbody($tr).PHP_EOL;
     }
 
     /**
@@ -144,10 +144,10 @@ 
     private function getTemplatesUserPagesTableTfoot()
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
-        $td = $hc->getHtmlTableData('&nbsp;') . PHP_EOL;
-        $tr = $hc->getHtmlTableRow($td) . PHP_EOL;
+        $td = $hc->getHtmlTableData('&nbsp;').PHP_EOL;
+        $tr = $hc->getHtmlTableRow($td).PHP_EOL;
 
-        return $hc->getHtmlTableTfoot($tr) . PHP_EOL;
+        return $hc->getHtmlTableTfoot($tr).PHP_EOL;
     }
 
     /**
@@ -161,10 +161,10 @@ 
     private function getTemplatesUserPages($moduleDirname, $tableName, $tableSoleName, $language)
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
-        $table = $this->getTemplatesUserPagesTable($moduleDirname, $tableName, $tableSoleName, $language) . PHP_EOL;
-        $div = $hc->getHtmlDiv($table, 'table-responsive') . PHP_EOL;
+        $table = $this->getTemplatesUserPagesTable($moduleDirname, $tableName, $tableSoleName, $language).PHP_EOL;
+        $div = $hc->getHtmlDiv($table, 'table-responsive').PHP_EOL;
 
-        return $hc->getSmartyConditions($tableName, ' > ', '0', $div, false, true, true) . PHP_EOL;
+        return $hc->getSmartyConditions($tableName, ' > ', '0', $div, false, true, true).PHP_EOL;
     }
 
     /**

class/files/templates/user/TemplatesUserCategoriesList.php

Spacing +8 added lines, -8 removed lines

@@ -243,35 +243,35 @@
                         case 2:
                             $rpFieldName = $this->getRightString($fieldName);
                             $doubleVar = $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $retElem .= $hc->getHtmlSpan($doubleVar, 'col-sm-2') . PHP_EOL;
+                            $retElem .= $hc->getHtmlSpan($doubleVar, 'col-sm-2').PHP_EOL;
                             break;
                         case 3:
                         case 4:
                             $rpFieldName = $this->getRightString($fieldName);
                             $doubleVar = $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $retElem .= $hc->getHtmlSpan($doubleVar, 'col-sm-3 justify') . PHP_EOL;
+                            $retElem .= $hc->getHtmlSpan($doubleVar, 'col-sm-3 justify').PHP_EOL;
                             break;
                         case 10:
                             $rpFieldName = $this->getRightString($fieldName);
                             $singleVar = $hc->getSmartySingleVar('xoops_icons32_url');
                             $doubleVar = $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $img = $hc->getHtmlImage($singleVar . '/' . $doubleVar, "{$tableName}");
-                            $retElem .= $hc->getHtmlSpan($img, 'col-sm-3') . PHP_EOL;
+                            $img = $hc->getHtmlImage($singleVar.'/'.$doubleVar, "{$tableName}");
+                            $retElem .= $hc->getHtmlSpan($img, 'col-sm-3').PHP_EOL;
                             unset($img);
                             break;
                         case 13:
                             $rpFieldName = $this->getRightString($fieldName);
-                            $singleVar = $hc->getSmartySingleVar($moduleDirname . '_upload_url');
+                            $singleVar = $hc->getSmartySingleVar($moduleDirname.'_upload_url');
                             $doubleVar = $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $img = $hc->getHtmlImage($singleVar . "/images/{$tableName}/" . $doubleVar, "{$tableName}");
-                            $retElem .= $hc->getHtmlSpan($img, 'col-sm-3') . PHP_EOL;
+                            $img = $hc->getHtmlImage($singleVar."/images/{$tableName}/".$doubleVar, "{$tableName}");
+                            $retElem .= $hc->getHtmlSpan($img, 'col-sm-3').PHP_EOL;
                             unset($img);
                             break;
                     }
                 }
             }
         }
-        $ret .= $hc->getHtmlDiv($retElem, 'panel-body') . PHP_EOL;
+        $ret .= $hc->getHtmlDiv($retElem, 'panel-body').PHP_EOL;
 
         return $ret;
     }

class/files/templates/user/TemplatesUserCategories.php

Spacing +28 added lines, -28 removed lines

@@ -73,7 +73,7 @@ 
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
 
-        return $hc->getSmartyIncludeFile($moduleDirname, 'header') . PHP_EOL;
+        return $hc->getSmartyIncludeFile($moduleDirname, 'header').PHP_EOL;
     }
 
     /**
@@ -91,7 +91,7 @@ 
         $table = $this->getTemplatesAdminPagesTableThead($tableName, $language);
         $table .= $this->getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $tableSoleName, $language);
 
-        return $hc->getHtmlTable($table, 'table table-' . $single) . PHP_EOL;
+        return $hc->getHtmlTable($table, 'table table-'.$single).PHP_EOL;
     }
 
     /**
@@ -104,12 +104,12 @@ 
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
         $stuTableName = mb_strtoupper($tableName);
-        $lang = $hc->getSmartyConst($language, $stuTableName . '_TITLE');
+        $lang = $hc->getSmartyConst($language, $stuTableName.'_TITLE');
         $single = $hc->getSmartySingleVar('numb_col');
-        $th = $hc->getHtmlTableHead($lang, '', $single) . PHP_EOL;
-        $tr = $hc->getHtmlTableRow($th, 'head') . PHP_EOL;
+        $th = $hc->getHtmlTableHead($lang, '', $single).PHP_EOL;
+        $tr = $hc->getHtmlTableRow($th, 'head').PHP_EOL;
 
-        return $hc->getHtmlTableThead($tr) . PHP_EOL;
+        return $hc->getHtmlTableThead($tr).PHP_EOL;
     }
 
     /**
@@ -125,14 +125,14 @@ 
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
         $single = $hc->getSmartySingleVar('panel_type');
         $include = $hc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName);
-        $div = $hc->getHtmlDiv($include, 'panel panel-' . $single);
-        $cont = $hc->getHtmlTableData($div) . PHP_EOL;
-        $html = $hc->getHtmlEmpty('</tr><tr>') . PHP_EOL;
-        $cont .= $hc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$divideby', $html) . PHP_EOL;
-        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL;
-        $tr = $hc->getHtmlTableRow($foreach) . PHP_EOL;
-
-        return $hc->getHtmlTableTbody($tr) . PHP_EOL;
+        $div = $hc->getHtmlDiv($include, 'panel panel-'.$single);
+        $cont = $hc->getHtmlTableData($div).PHP_EOL;
+        $html = $hc->getHtmlEmpty('</tr><tr>').PHP_EOL;
+        $cont .= $hc->getSmartyConditions($tableSoleName.'.count', ' is div by ', '$divideby', $html).PHP_EOL;
+        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName, $cont).PHP_EOL;
+        $tr = $hc->getHtmlTableRow($foreach).PHP_EOL;
+
+        return $hc->getHtmlTableTbody($tr).PHP_EOL;
     }
 
     /**
@@ -142,10 +142,10 @@ 
     private function getTemplatesUserCategoriesTfoot()
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
-        $td = $hc->getHtmlTableData('&nbsp;') . PHP_EOL;
-        $tr = $hc->getHtmlTableRow($td) . PHP_EOL;
+        $td = $hc->getHtmlTableData('&nbsp;').PHP_EOL;
+        $tr = $hc->getHtmlTableRow($td).PHP_EOL;
 
-        return $hc->getHtmlTableTfoot($tr) . PHP_EOL;
+        return $hc->getHtmlTableTfoot($tr).PHP_EOL;
     }
 
     /**
@@ -159,10 +159,10 @@ 
     private function getTemplatesUserCategories($moduleDirname, $tableName, $tableSoleName, $language)
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
-        $tab = $this->getTemplatesUserCategoriesTable($moduleDirname, $tableName, $tableSoleName, $language) . PHP_EOL;
-        $div = $hc->getHtmlDiv($tab, 'table-responsive') . PHP_EOL;
+        $tab = $this->getTemplatesUserCategoriesTable($moduleDirname, $tableName, $tableSoleName, $language).PHP_EOL;
+        $div = $hc->getHtmlDiv($tab, 'table-responsive').PHP_EOL;
 
-        return $hc->getSmartyConditions($tableName, ' gt ', '0', $div, false, true) . PHP_EOL;
+        return $hc->getSmartyConditions($tableName, ' gt ', '0', $div, false, true).PHP_EOL;
     }
 
     /**
@@ -190,16 +190,16 @@ 
 </div>\n
 EOT;*/
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
-        $incl = $hc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName) . PHP_EOL;
-        $html = $hc->getHtmlEmpty('<br>') . PHP_EOL;
-        $incl .= $hc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$numb_col', $html) . PHP_EOL;
-        $const = $hc->getSmartyConst($language, $stuTableName . '_TITLE');
-        $div = $hc->getHtmlDiv($const, 'panel-heading') . PHP_EOL;
-        $cont = $hc->getHtmlDiv($incl, 'panel panel-body') . PHP_EOL;
-        $div .= $hc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL;
+        $incl = $hc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName).PHP_EOL;
+        $html = $hc->getHtmlEmpty('<br>').PHP_EOL;
+        $incl .= $hc->getSmartyConditions($tableSoleName.'.count', ' is div by ', '$numb_col', $html).PHP_EOL;
+        $const = $hc->getSmartyConst($language, $stuTableName.'_TITLE');
+        $div = $hc->getHtmlDiv($const, 'panel-heading').PHP_EOL;
+        $cont = $hc->getHtmlDiv($incl, 'panel panel-body').PHP_EOL;
+        $div .= $hc->getSmartyForeach($tableSoleName, $tableName, $cont).PHP_EOL;
         $panelType = $hc->getSmartySingleVar('panel_type');
 
-        return $hc->getHtmlDiv($div, 'panel panel-' . $panelType) . PHP_EOL;
+        return $hc->getHtmlDiv($div, 'panel panel-'.$panelType).PHP_EOL;
     }
 
     /**

class/files/templates/user/TemplatesUserBroken.php

Spacing +13 added lines, -13 removed lines

@@ -95,12 +95,12 @@ 
             $stuFieldName = mb_strtoupper($fieldName);
             if ((1 == $tableAutoincrement) || (1 == $fields[$f]->getVar('field_user'))) {
                 $const = $hc->getSmartyConst($language, $stuFieldName);
-                $th .= $hc->getHtmlTag('th', ['class' => 'center'], $const) . PHP_EOL;
+                $th .= $hc->getHtmlTag('th', ['class' => 'center'], $const).PHP_EOL;
             }
         }
-        $tr = $hc->getHtmlTag('tr', ['class' => 'head'], $th) . PHP_EOL;
+        $tr = $hc->getHtmlTag('tr', ['class' => 'head'], $th).PHP_EOL;
 
-        return $hc->getHtmlTag('thead', ['class' => 'outer'], $tr) . PHP_EOL;
+        return $hc->getHtmlTag('thead', ['class' => 'outer'], $tr).PHP_EOL;
     }
 
     /**
@@ -126,27 +126,27 @@ 
             if ((1 == $tableAutoincrement) || (1 == $fields[$f]->getVar('field_user'))) {
                 switch ($fieldElement) {
                     case 9:
-                        $span = $hc->getHtmlSpan("<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\${$tableSoleName}.{$rpFieldName}}>", "#<{\${$tableSoleName}.{$rpFieldName}}>") . PHP_EOL;
-                        $ret .= $hc->getHtmlTableData($span, 'center') . PHP_EOL;
+                        $span = $hc->getHtmlSpan("<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\${$tableSoleName}.{$rpFieldName}}>", "#<{\${$tableSoleName}.{$rpFieldName}}>").PHP_EOL;
+                        $ret .= $hc->getHtmlTableData($span, 'center').PHP_EOL;
                         break;
                     case 10:
                         $img = $hc->getHtmlImage("<{xoModuleIcons32}><{\${$tableSoleName}.{$rpFieldName}}>", $tableName);
-                        $ret .= $hc->getHtmlTableData($img, 'center') . PHP_EOL;
+                        $ret .= $hc->getHtmlTableData($img, 'center').PHP_EOL;
                         break;
                     case 13:
                         $img = $hc->getHtmlImage("<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\${$tableSoleName}.{$rpFieldName}}>", $tableName);
-                        $ret .= $hc->getHtmlTableData($img, 'center') . PHP_EOL;
+                        $ret .= $hc->getHtmlTableData($img, 'center').PHP_EOL;
                         break;
                     default:
-                        $ret .= $hc->getHtmlTableData("<{\${$tableSoleName}.{$rpFieldName}}>", 'center') . PHP_EOL;
+                        $ret .= $hc->getHtmlTableData("<{\${$tableSoleName}.{$rpFieldName}}>", 'center').PHP_EOL;
                         break;
                 }
             }
         }
-        $row = $hc->getHtmlTableRow($ret, '<{cycle values="odd, even"}>') . PHP_EOL;
-        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName, $row) . PHP_EOL;
+        $row = $hc->getHtmlTableRow($ret, '<{cycle values="odd, even"}>').PHP_EOL;
+        $foreach = $hc->getSmartyForeach($tableSoleName, $tableName, $row).PHP_EOL;
 
-        return $hc->getHtmlTableTbody($foreach) . PHP_EOL;
+        return $hc->getHtmlTableTbody($foreach).PHP_EOL;
     }
 
     /**
@@ -179,10 +179,10 @@ 
         $tableSoleName = $table->getVar('table_solename');
         $tableAutoincrement = $table->getVar('table_autoincrement');
         $language = $this->getLanguage($moduleDirname, 'MA');
-        $content = $this->getTemplatesUserBrokenFileHeader($moduleDirname) . PHP_EOL;
+        $content = $this->getTemplatesUserBrokenFileHeader($moduleDirname).PHP_EOL;
         $contentTable = $this->getTemplatesUserBrokenTableHead($tableMid, $tableId, $tableAutoincrement, $language);
         $contentTable .= $this->getTemplatesUserBrokenBody($moduleDirname, $tableMid, $tableId, $tableName, $tableSoleName, $tableAutoincrement, $language);
-        $content .= $hc->getHtmlTable($contentTable, 'table table-bordered') . PHP_EOL;
+        $content .= $hc->getHtmlTable($contentTable, 'table table-bordered').PHP_EOL;
         $content .= $this->getTemplatesUserBrokenFileFooter($moduleDirname);
 
         $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);