txmodxoops / tdmcreate

admin/menu.php

Spacing +13 added lines, -13 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Txmod Xoops http://www.txmodxoops.org
  *
  */
-include dirname(__DIR__) . '/preloads/autoloader.php';
+include dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
@@ -45,62 +45,62 @@ 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU1,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/dashboard.png',
+    'icon'  => $pathIcon32.'/dashboard.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU2,
     'link'  => 'admin/settings.php',
-    'icon'  => $modPathIcon32 . '/settings.png',
+    'icon'  => $modPathIcon32.'/settings.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU3,
     'link'  => 'admin/modules.php',
-    'icon'  => $modPathIcon32 . '/addmodule.png',
+    'icon'  => $modPathIcon32.'/addmodule.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU4,
     'link'  => 'admin/tables.php',
-    'icon'  => $modPathIcon32 . '/addtable.png',
+    'icon'  => $modPathIcon32.'/addtable.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU5,
     'link'  => 'admin/fields.php',
-    'icon'  => $modPathIcon32 . '/fields.png',
+    'icon'  => $modPathIcon32.'/fields.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU6,
     'link'  => 'admin/morefiles.php',
-    'icon'  => $modPathIcon32 . '/files.png',
+    'icon'  => $modPathIcon32.'/files.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU7,
     'link'  => 'admin/building.php',
-    'icon'  => $modPathIcon32 . '/builder.png',
+    'icon'  => $modPathIcon32.'/builder.png',
 ];
 
 //Feedback
 $adminmenu[] = [
-    'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_FEEDBACK'),
+    'title' => constant('CO_'.$moduleDirNameUpper.'_'.'ADMENU_FEEDBACK'),
     'link'  => 'admin/feedback.php',
-    'icon'  => $pathIcon32 . 'mail_foward.png',
+    'icon'  => $pathIcon32.'mail_foward.png',
 ];
 
 if (is_object($helper->getModule()) && $helper->getConfig('displayDeveloperTools')) {
     $adminmenu[] = [
-        'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
+        'title' => constant('CO_'.$moduleDirNameUpper.'_'.'ADMENU_MIGRATE'),
         'link'  => 'admin/migrate.php',
-        'icon'  => $pathIcon32 . 'database_go.png',
+        'icon'  => $pathIcon32.'database_go.png',
     ];
 }
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . 'about.png',
+    'icon'  => $pathIcon32.'about.png',
 ];

testdata/index.php

Indentation +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 
     $languageFolder = __DIR__ . '/' . $language;
     if (!file_exists($languageFolder . '/')) {
-       Utility::createFolder($languageFolder . '/');
+        Utility::createFolder($languageFolder . '/');
     }
     $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
     Utility::createFolder($exportFolder);

Spacing +16 added lines, -16 removed lines

@@ -18,8 +18,8 @@ 
 use XoopsModules\Tdmcreate\Common;
 use XoopsModules\Tdmcreate\Utility;
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require dirname(__DIR__).'/preloads/autoloader.php';
 
 $op = \Xmf\Request::getCmd('op', '');
 
@@ -39,7 +39,7 @@ 
             loadSampleData();
         } else {
             xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA_OK')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA_OK')), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
             xoops_cp_footer();
         }
         break;
@@ -63,12 +63,12 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     $language = 'english/';
-    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
+    if (is_dir(__DIR__.'/'.$xoopsConfig['language'])) {
+        $language = $xoopsConfig['language'].'/';
     }
 
     foreach ($tables as $table) {
-        $tabledata = \Xmf\Yaml::readWrapped($language . $table . '.yml');
+        $tabledata = \Xmf\Yaml::readWrapped($language.$table.'.yml');
         if (is_array($tabledata)) {
         \Xmf\Database\TableLoad::truncateTable($table);
         \Xmf\Database\TableLoad::loadTableFromArray($table, $tabledata);
@@ -83,7 +83,7 @@ 
             $utility::rcopy($src, $dest);
         }
     }
-    redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+    redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS'));
 }
 
 function saveSampleData()
@@ -98,19 +98,19 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     $language = 'english/';
-    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
+    if (is_dir(__DIR__.'/'.$xoopsConfig['language'])) {
+        $language = $xoopsConfig['language'].'/';
     }
 
-    $languageFolder = __DIR__ . '/' . $language;
-    if (!file_exists($languageFolder . '/')) {
-       Utility::createFolder($languageFolder . '/');
+    $languageFolder = __DIR__.'/'.$language;
+    if (!file_exists($languageFolder.'/')) {
+       Utility::createFolder($languageFolder.'/');
     }
-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
+    $exportFolder = $languageFolder.'/Exports-'.date('Y-m-d-H-i-s').'/';
     Utility::createFolder($exportFolder);
 
     foreach ($tables as $table) {
-        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
+        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder.$table.'.yml');
     }
     
     //  ---  COPY test folder files ---------------
@@ -121,7 +121,7 @@ 
             Utility::rcopy($src, $dest);
         }
     }
-    redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+    redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS'));
 }
 
 function exportSchema()
@@ -137,7 +137,7 @@ 
         //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
     }
     catch (\Exception $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+        exit(constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR'));
     }
 
 }

class/Fields.php

Spacing +82 added lines, -82 removed lines

@@ -116,18 +116,18 @@ 
         $form->addElement(new Tdmcreate\Html\FormLabel(str_replace('%s', $prefix, _AM_TDMCREATE_FIELD_RECOMMENDED)));
         $form->addElement(new Tdmcreate\Html\FormLabel('<table style="border-spacing:5px;" class="outer width100">'));
         $form->addElement(new Tdmcreate\Html\FormLabel('<thead class="center">'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<tr class="head"><th colspan="10">' . $title . '</th></tr>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<tr class="head"><th colspan="10">'.$title.'</th></tr>'));
         $form->addElement(new Tdmcreate\Html\FormLabel('<tr class="head width5">'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_ID . '</td>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_NAME . '</td>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_ELEMENT . '</td>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_TYPE . '</td>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_VALUE . '</th>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_ATTRIBUTE . '</th>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_NULL . '</th>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_DEFAULT . '</th>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_KEY . '</th>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . _AM_TDMCREATE_FIELD_PARAMETERS . '</th>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_ID.'</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_NAME.'</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_ELEMENT.'</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_TYPE.'</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_VALUE.'</th>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_ATTRIBUTE.'</th>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_NULL.'</th>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_DEFAULT.'</th>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_KEY.'</th>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'._AM_TDMCREATE_FIELD_PARAMETERS.'</th>'));
         $form->addElement(new Tdmcreate\Html\FormLabel('</tr></thead>'));
         $form->addElement(new Tdmcreate\Html\FormLabel('<tbody>'));
 
@@ -182,20 +182,20 @@ 
         $helper = Tdmcreate\Helper::getInstance();
         $fieldElements = $helper->getHandler('Fieldelements')->getAll();
         foreach ($fieldElements as $fe) {
-            $form->addElement(new \XoopsFormHidden('fe_defaulttype[' . $fe->getVar('fieldelement_id') . ']', $fe->getVar('fieldelement_deftype')));
-            $form->addElement(new \XoopsFormHidden('fe_defaultvalue[' . $fe->getVar('fieldelement_id') . ']', $fe->getVar('fieldelement_defvalue')));
+            $form->addElement(new \XoopsFormHidden('fe_defaulttype['.$fe->getVar('fieldelement_id').']', $fe->getVar('fieldelement_deftype')));
+            $form->addElement(new \XoopsFormHidden('fe_defaultvalue['.$fe->getVar('fieldelement_id').']', $fe->getVar('fieldelement_defvalue')));
         }
-        $form->addElement(new \XoopsFormHidden('field_id[' . $i . ']', 0));
+        $form->addElement(new \XoopsFormHidden('field_id['.$i.']', 0));
         $form->addElement(new \XoopsFormHidden('field_mid', $fieldMid));
         $form->addElement(new \XoopsFormHidden('field_tid', $fieldTid));
 
-        $form->addElement(new Tdmcreate\Html\FormLabel('<tr class="' . $class . '">'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<tr class="'.$class.'">'));
         // Index ID
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $i . '</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$i.'</td>'));
         // Field Name
-        $thisFieldName = (!empty($fName) ? ((1 == $i) ? $fName . '_id' : $fName . '_') : '');
-        $fieldName     = new \XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $i . ']', 15, 255, $thisFieldName);
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldName->render() . '</td>'));
+        $thisFieldName = (!empty($fName) ? ((1 == $i) ? $fName.'_id' : $fName.'_') : '');
+        $fieldName     = new \XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $thisFieldName);
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldName->render().'</td>'));
         // Field Element
         if ((1 == $i) && (1 == $tableAutoincrement)) {
             $form->addElement(new Tdmcreate\Html\FormLabel('<td>&nbsp;</td>'));
@@ -205,41 +205,41 @@ 
             $crElement->add(new \Criteria('fieldelement_tid', 0));
             $crTable = new \CriteriaCompo();
             $crTable->add(new \Criteria('fieldelement_mid', $fieldMid));
-            $fieldElementsSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $i . ']');
+            $fieldElementsSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$i.']');
             $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getFieldElementsList($crElement));
             $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getList($crTable));
-            $fieldElementsSelect->setExtra(" onchange='presetField(". $i . ")' ");
+            $fieldElementsSelect->setExtra(" onchange='presetField(".$i.")' ");
             unset($crElement, $crTable);
-            $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldElementsSelect->render() . '</td>'));
+            $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldElementsSelect->render().'</td>'));
             unset($fieldElementsSelect);
         }
         // Field Type
         $value           = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '';
-        $fieldTypeSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $i . ']', $value);
+        $fieldTypeSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$i.']', $value);
         $fieldTypeSelect->addOptionArray($helper->getHandler('Fieldtype')->getList());
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldTypeSelect->render() . '</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldTypeSelect->render().'</td>'));
         // Field Value
         $value      = (1 == $i) && (1 == $tableAutoincrement) ? '8' : '';
-        $fieldValue = new \XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $i . ']', 10, 200, $value);
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldValue->render() . '</td>'));
+        $fieldValue = new \XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$i.']', 10, 200, $value);
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldValue->render().'</td>'));
         // Field Attributes
         $value                 = (1 == $i) && (1 == $tableAutoincrement) ? '3' : '';
-        $fieldAttributesSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $i . ']', $value);
+        $fieldAttributesSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute['.$i.']', $value);
         $fieldAttributesSelect->addOptionArray($helper->getHandler('Fieldattributes')->getList());
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldAttributesSelect->render().'</td>'));
         // Field Null
         $value           = (1 == $i && 1 == $tableAutoincrement) ? '2' : '2';
-        $fieldNullSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value);
+        $fieldNullSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null['.$i.']', $value);
         $fieldNullSelect->addOptionArray($helper->getHandler('Fieldnull')->getList());
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldNullSelect->render().'</td>'));
         // Field Default
-        $fieldDefault = new \XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $i . ']', 15, 25);
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldDefault->render() . '</td>'));
+        $fieldDefault = new \XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default['.$i.']', 15, 25);
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldDefault->render().'</td>'));
         // Field Key
         $value          = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '';
-        $fieldKeySelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $i . ']', $value);
+        $fieldKeySelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key['.$i.']', $value);
         $fieldKeySelect->addOptionArray($helper->getHandler('Fieldkey')->getList());
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldKeySelect->render() . '</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldKeySelect->render().'</td>'));
         // Field Void
         if ((1 == $i) && (1 == $tableAutoincrement)) {
             $form->addElement(new Tdmcreate\Html\FormLabel('<td>&nbsp;</td></tr>'));
@@ -248,57 +248,57 @@ 
             $parametersTray = new \XoopsFormElementTray('', '<br>');
 
             $field_parent     = 0;
-            $checkFieldParent = new \XoopsFormCheckBox(' ', 'field_parent[' . $i . ']', $field_parent);
+            $checkFieldParent = new \XoopsFormCheckBox(' ', 'field_parent['.$i.']', $field_parent);
             $checkFieldParent->addOption(1, _AM_TDMCREATE_FIELD_PARENT);
             $parametersTray->addElement($checkFieldParent);
 
             $field_admin     = 0;
-            $checkFieldAdmin = new \XoopsFormCheckBox(' ', 'field_admin[' . $i . ']', $field_admin);
+            $checkFieldAdmin = new \XoopsFormCheckBox(' ', 'field_admin['.$i.']', $field_admin);
             $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
             $parametersTray->addElement($checkFieldAdmin);
 
             $field_inlist     = 0;
-            $checkFieldInList = new \XoopsFormCheckBox(' ', 'field_inlist[' . $i . ']', $field_inlist);
+            $checkFieldInList = new \XoopsFormCheckBox(' ', 'field_inlist['.$i.']', $field_inlist);
             $checkFieldInList->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
             $parametersTray->addElement($checkFieldInList);
 
             $field_inform     = 0;
-            $checkFieldInForm = new \XoopsFormCheckBox(' ', 'field_inform[' . $i . ']', $field_inform);
+            $checkFieldInForm = new \XoopsFormCheckBox(' ', 'field_inform['.$i.']', $field_inform);
             $checkFieldInForm->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
             $parametersTray->addElement($checkFieldInForm);
 
             $field_user     = 0;
-            $checkFieldUser = new \XoopsFormCheckBox(' ', 'field_user[' . $i . ']', $field_user);
+            $checkFieldUser = new \XoopsFormCheckBox(' ', 'field_user['.$i.']', $field_user);
             $checkFieldUser->addOption(1, _AM_TDMCREATE_FIELD_USER);
             $parametersTray->addElement($checkFieldUser);
 
             $field_thead     = 0;
-            $checkFieldThead = new \XoopsFormCheckBox(' ', 'field_thead[' . $i . ']', $field_thead);
+            $checkFieldThead = new \XoopsFormCheckBox(' ', 'field_thead['.$i.']', $field_thead);
             $checkFieldThead->addOption(1, _AM_TDMCREATE_FIELD_THEAD);
             $parametersTray->addElement($checkFieldThead);
 
             $field_tbody     = 0;
-            $checkFieldTbody = new \XoopsFormCheckBox(' ', 'field_tbody[' . $i . ']', $field_tbody);
+            $checkFieldTbody = new \XoopsFormCheckBox(' ', 'field_tbody['.$i.']', $field_tbody);
             $checkFieldTbody->addOption(1, _AM_TDMCREATE_FIELD_TBODY);
             $parametersTray->addElement($checkFieldTbody);
 
             $field_tfoot     = 0;
-            $checkFieldTfoot = new \XoopsFormCheckBox(' ', 'field_tfoot[' . $i . ']', $field_tfoot);
+            $checkFieldTfoot = new \XoopsFormCheckBox(' ', 'field_tfoot['.$i.']', $field_tfoot);
             $checkFieldTfoot->addOption(1, _AM_TDMCREATE_FIELD_TFOOT);
             $parametersTray->addElement($checkFieldTfoot);
 
             $field_block     = 0;
-            $checkFieldBlock = new \XoopsFormCheckBox('', 'field_block[' . $i . ']', $field_block);
+            $checkFieldBlock = new \XoopsFormCheckBox('', 'field_block['.$i.']', $field_block);
             $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
             $parametersTray->addElement($checkFieldBlock);
 
             $field_search       = 0;
-            $check_field_search = new \XoopsFormCheckBox(' ', 'field_search[' . $i . ']', $field_search);
+            $check_field_search = new \XoopsFormCheckBox(' ', 'field_search['.$i.']', $field_search);
             $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
             $parametersTray->addElement($check_field_search);
 
             $field_required     = 0;
-            $checkFieldRequired = new \XoopsFormCheckBox(' ', 'field_required[' . $i . ']', $field_required);
+            $checkFieldRequired = new \XoopsFormCheckBox(' ', 'field_required['.$i.']', $field_required);
             $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
             $parametersTray->addElement($checkFieldRequired);
 
@@ -307,7 +307,7 @@ 
             $checkFieldMain->addOption($i, _AM_TDMCREATE_FIELD_MAIN);
             $parametersTray->addElement($checkFieldMain);
 
-            $form->addElement(new Tdmcreate\Html\FormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parametersTray->render() . '</div></div></td></tr>'));
+            $form->addElement(new Tdmcreate\Html\FormLabel('<td><div class="portlet"><div class="portlet-header">'._AM_TDMCREATE_FIELD_PARAMETERS_LIST.'</div><div class="portlet-content">'.$parametersTray->render().'</div></div></td></tr>'));
         }
     }
 
@@ -343,8 +343,8 @@ 
         unset($cr);
         $fieldElements = $helper->getHandler('Fieldelements')->getAll();
         foreach ($fieldElements as $fe) {
-            $form->addElement(new \XoopsFormHidden('fe_defaulttype[' . $fe->getVar('fieldelement_id') . ']', $fe->getVar('fieldelement_deftype')));
-            $form->addElement(new \XoopsFormHidden('fe_defaultvalue[' . $fe->getVar('fieldelement_id') . ']', $fe->getVar('fieldelement_defvalue')));
+            $form->addElement(new \XoopsFormHidden('fe_defaulttype['.$fe->getVar('fieldelement_id').']', $fe->getVar('fieldelement_deftype')));
+            $form->addElement(new \XoopsFormHidden('fe_defaultvalue['.$fe->getVar('fieldelement_id').']', $fe->getVar('fieldelement_defvalue')));
         }
         $id = 1;
         foreach ($fields as $field) {
@@ -355,14 +355,14 @@ 
                 $helper->getHandler('Fields')->delete($fieldsObj, true);
             } else {
                 // show field with settings
-                $form->addElement(new \XoopsFormHidden('field_id[' . $id . ']', $fieldId));
+                $form->addElement(new \XoopsFormHidden('field_id['.$id.']', $fieldId));
 
-                $form->addElement(new Tdmcreate\Html\FormLabel('<tr class="' . $class . '">'));
+                $form->addElement(new Tdmcreate\Html\FormLabel('<tr class="'.$class.'">'));
                 // Index ID
-                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $id . '</td>'));
+                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$id.'</td>'));
                 // Field Name
-                $fieldName = new \XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $id . ']', 15, 255, $field->getVar('field_name'));
-                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldName->render() . '</td>'));
+                $fieldName = new \XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$id.']', 15, 255, $field->getVar('field_name'));
+                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldName->render().'</td>'));
                 // Field Element
                 if ((1 == $id) && (1 == $tableAutoincrement)) {
                     $form->addElement(new Tdmcreate\Html\FormLabel('<td>&nbsp;</td>'));
@@ -372,36 +372,36 @@ 
                     $crElement->add(new \Criteria('fieldelement_tid', 0));
                     $crTable = new \CriteriaCompo();
                     $crTable->add(new \Criteria('fieldelement_mid', $fieldMid));
-                    $fieldElementsSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $id . ']', $field->getVar('field_element'));
+                    $fieldElementsSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$id.']', $field->getVar('field_element'));
                     $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getFieldElementsList($crElement));
                     $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getList($crTable));
-                    $fieldElementsSelect->setExtra(" onchange='presetField(". $id . ")' ");
+                    $fieldElementsSelect->setExtra(" onchange='presetField(".$id.")' ");
                     unset($crElement, $crTable);
-                    $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldElementsSelect->render() . '</td>'));
+                    $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldElementsSelect->render().'</td>'));
                     unset($fieldElementsSelect);
                 }
                 // Field Type
-                $fieldTypeSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $id . ']', $field->getVar('field_type'));
+                $fieldTypeSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$id.']', $field->getVar('field_type'));
                 $fieldTypeSelect->addOptionArray($helper->getHandler('Fieldtype')->getList());
-                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldTypeSelect->render() . '</td>'));
+                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldTypeSelect->render().'</td>'));
                 // Field Value
-                $fieldValue = new \XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $id . ']', 10, 200, $field->getVar('field_value'));
-                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldValue->render() . '</td>'));
+                $fieldValue = new \XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$id.']', 10, 200, $field->getVar('field_value'));
+                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldValue->render().'</td>'));
                 // Field Attributes
-                $fieldAttributesSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $id . ']', $field->getVar('field_attribute'));
+                $fieldAttributesSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute['.$id.']', $field->getVar('field_attribute'));
                 $fieldAttributesSelect->addOptionArray($helper->getHandler('Fieldattributes')->getList());
-                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>'));
+                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldAttributesSelect->render().'</td>'));
                 // Field Null
-                $fieldNullSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $id . ']', $field->getVar('field_null'));
+                $fieldNullSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null['.$id.']', $field->getVar('field_null'));
                 $fieldNullSelect->addOptionArray($helper->getHandler('Fieldnull')->getList());
-                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>'));
+                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldNullSelect->render().'</td>'));
                 // Field Default
-                $fieldDefault = new \XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $id . ']', 15, 25, $field->getVar('field_default'));
-                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldDefault->render() . '</td>'));
+                $fieldDefault = new \XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default['.$id.']', 15, 25, $field->getVar('field_default'));
+                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldDefault->render().'</td>'));
                 // Field Key
-                $fieldKeySelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $id . ']', $field->getVar('field_key'));
+                $fieldKeySelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key['.$id.']', $field->getVar('field_key'));
                 $fieldKeySelect->addOptionArray($helper->getHandler('Fieldkey')->getList());
-                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldKeySelect->render() . '</td>'));
+                $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">'.$fieldKeySelect->render().'</td>'));
                 // Field Void
                 if ((1 == $id) && (1 == $tableAutoincrement)) {
                     $form->addElement(new Tdmcreate\Html\FormLabel('<td>&nbsp;</td></tr>'));
@@ -409,47 +409,47 @@ 
                     // Box header row
                     $parametersTray = new \XoopsFormElementTray('', '<br>');
 
-                    $checkFieldParent = new \XoopsFormCheckBox(' ', 'field_parent[' . $id . ']', $field->getVar('field_parent'));
+                    $checkFieldParent = new \XoopsFormCheckBox(' ', 'field_parent['.$id.']', $field->getVar('field_parent'));
                     $checkFieldParent->addOption(1, _AM_TDMCREATE_FIELD_PARENT);
                     $parametersTray->addElement($checkFieldParent);
 
-                    $checkFieldAdmin = new \XoopsFormCheckBox(' ', 'field_admin[' . $id . ']', $field->getVar('field_admin'));
+                    $checkFieldAdmin = new \XoopsFormCheckBox(' ', 'field_admin['.$id.']', $field->getVar('field_admin'));
                     $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
                     $parametersTray->addElement($checkFieldAdmin);
 
-                    $checkFieldInList = new \XoopsFormCheckBox(' ', 'field_inlist[' . $id . ']', $field->getVar('field_inlist'));
+                    $checkFieldInList = new \XoopsFormCheckBox(' ', 'field_inlist['.$id.']', $field->getVar('field_inlist'));
                     $checkFieldInList->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
                     $parametersTray->addElement($checkFieldInList);
 
-                    $checkFieldInForm = new \XoopsFormCheckBox(' ', 'field_inform[' . $id . ']', $field->getVar('field_inform'));
+                    $checkFieldInForm = new \XoopsFormCheckBox(' ', 'field_inform['.$id.']', $field->getVar('field_inform'));
                     $checkFieldInForm->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
                     $parametersTray->addElement($checkFieldInForm);
 
-                    $checkFieldUser = new \XoopsFormCheckBox(' ', 'field_user[' . $id . ']', $field->getVar('field_user'));
+                    $checkFieldUser = new \XoopsFormCheckBox(' ', 'field_user['.$id.']', $field->getVar('field_user'));
                     $checkFieldUser->addOption(1, _AM_TDMCREATE_FIELD_USER);
                     $parametersTray->addElement($checkFieldUser);
 
-                    $checkFieldThead = new \XoopsFormCheckBox(' ', 'field_thead[' . $id . ']', $field->getVar('field_thead'));
+                    $checkFieldThead = new \XoopsFormCheckBox(' ', 'field_thead['.$id.']', $field->getVar('field_thead'));
                     $checkFieldThead->addOption(1, _AM_TDMCREATE_FIELD_THEAD);
                     $parametersTray->addElement($checkFieldThead);
 
-                    $checkFieldTbody = new \XoopsFormCheckBox(' ', 'field_tbody[' . $id . ']', $field->getVar('field_tbody'));
+                    $checkFieldTbody = new \XoopsFormCheckBox(' ', 'field_tbody['.$id.']', $field->getVar('field_tbody'));
                     $checkFieldTbody->addOption(1, _AM_TDMCREATE_FIELD_TBODY);
                     $parametersTray->addElement($checkFieldTbody);
 
-                    $checkFieldTfoot = new \XoopsFormCheckBox(' ', 'field_tfoot[' . $id . ']', $field->getVar('field_tfoot'));
+                    $checkFieldTfoot = new \XoopsFormCheckBox(' ', 'field_tfoot['.$id.']', $field->getVar('field_tfoot'));
                     $checkFieldTfoot->addOption(1, _AM_TDMCREATE_FIELD_TFOOT);
                     $parametersTray->addElement($checkFieldTfoot);
 
-                    $checkFieldBlock = new \XoopsFormCheckBox('', 'field_block[' . $id . ']', $field->getVar('field_block'));
+                    $checkFieldBlock = new \XoopsFormCheckBox('', 'field_block['.$id.']', $field->getVar('field_block'));
                     $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
                     $parametersTray->addElement($checkFieldBlock);
 
-                    $check_field_search = new \XoopsFormCheckBox(' ', 'field_search[' . $id . ']', $field->getVar('field_search'));
+                    $check_field_search = new \XoopsFormCheckBox(' ', 'field_search['.$id.']', $field->getVar('field_search'));
                     $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
                     $parametersTray->addElement($check_field_search);
 
-                    $checkFieldRequired = new \XoopsFormCheckBox(' ', 'field_required[' . $id . ']', $field->getVar('field_required'));
+                    $checkFieldRequired = new \XoopsFormCheckBox(' ', 'field_required['.$id.']', $field->getVar('field_required'));
                     $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
                     $parametersTray->addElement($checkFieldRequired);
 
@@ -458,7 +458,7 @@ 
                     $checkFieldMain->addOption($id, _AM_TDMCREATE_FIELD_MAIN);
                     $parametersTray->addElement($checkFieldMain);
 
-                    $form->addElement(new Tdmcreate\Html\FormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parametersTray->render() . '</div></div></td></tr>'));
+                    $form->addElement(new Tdmcreate\Html\FormLabel('<td><div class="portlet"><div class="portlet-header">'._AM_TDMCREATE_FIELD_PARAMETERS_LIST.'</div><div class="portlet-content">'.$parametersTray->render().'</div></div></td></tr>'));
                 }
             }
             ++$id;
@@ -490,8 +490,8 @@ 
         $form->addElement(new Tdmcreate\Html\FormLabel('<tfoot><tr>'));
         $formHidden = new \XoopsFormHidden('op', 'save');
         $formButton = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td colspan="8">' . $formHidden->render() . '</td>'));
-        $form->addElement(new Tdmcreate\Html\FormLabel('<td>' . $formButton->render() . '</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td colspan="8">'.$formHidden->render().'</td>'));
+        $form->addElement(new Tdmcreate\Html\FormLabel('<td>'.$formButton->render().'</td>'));
         $form->addElement(new Tdmcreate\Html\FormLabel('</tr></tfoot></table>'));
 
         return $form;