txmodxoops / tdmcreate

class/Settings.php

Spacing +8 added lines, -8 removed lines

@@ -146,7 +146,7 @@ 
         $isNew = $this->isNew();
         $title = $isNew ? sprintf(_AM_TDMCREATE_SETTING_NEW) : sprintf(_AM_TDMCREATE_SETTING_EDIT);
 
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         $form = new \XoopsThemeForm($title, 'settingform', $action, 'post', true);
         $form->setExtra('enctype="multipart/form-data"');
@@ -175,7 +175,7 @@ 
         $checkbox      = new \XoopsFormCheckbox(' ', 'setting_option', $settingOption, '<br>');
         $checkbox->setDescription(_AM_TDMCREATE_OPTIONS_DESC);
         foreach ($this->options as $option) {
-            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_SETTING_' . mb_strtoupper($option)));
+            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_SETTING_'.mb_strtoupper($option)));
         }
         $optionsTray->addElement($checkbox);
 
@@ -184,17 +184,17 @@ 
         $modImage = $this->getVar('set_image');
         //$modImage = $modImage ?: $set['image'];
 
-        $uploadDirectory = 'uploads/' . $GLOBALS['xoopsModule']->dirname() . '/images/modules';
+        $uploadDirectory = 'uploads/'.$GLOBALS['xoopsModule']->dirname().'/images/modules';
         $imgtray         = new \XoopsFormElementTray(_AM_TDMCREATE_SETTING_IMAGE, '<br>');
-        $imgpath         = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './' . mb_strtolower($uploadDirectory) . '/');
+        $imgpath         = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './'.mb_strtolower($uploadDirectory).'/');
         $imageSelect     = new \XoopsFormSelect($imgpath, 'set_image', $modImage);
         $modImage_array  = \XoopsLists::getImgListAsArray(TDMC_UPLOAD_IMGMOD_PATH);
         foreach ($modImage_array as $image) {
             $imageSelect->addOption($image, $image);
         }
-        $imageSelect->setExtra("onchange='showImgSelected(\"image3\", \"set_image\", \"" . $uploadDirectory . '", "", "' . XOOPS_URL . "\")'");
+        $imageSelect->setExtra("onchange='showImgSelected(\"image3\", \"set_image\", \"".$uploadDirectory.'", "", "'.XOOPS_URL."\")'");
         $imgtray->addElement($imageSelect);
-        $imgtray->addElement(new \XoopsFormLabel('', "<br><img src='" . TDMC_UPLOAD_IMGMOD_URL . '/' . $modImage . "' id='image3' alt='' /><br>"));
+        $imgtray->addElement(new \XoopsFormLabel('', "<br><img src='".TDMC_UPLOAD_IMGMOD_URL.'/'.$modImage."' id='image3' alt='' /><br>"));
 
         $fileseltray = new \XoopsFormElementTray('', '<br>');
         $fileseltray->addElement(new \XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $helper->getConfig('maxsize_image')));
@@ -222,7 +222,7 @@ 
         $form->addElement(new \XoopsFormText(_AM_TDMCREATE_SETTING_PAYPAL_BUTTON, 'set_donations', 50, 255, $this->getVar('set_donations')));
         $form->addElement(new \XoopsFormText(_AM_TDMCREATE_SETTING_SUBVERSION, 'set_subversion', 50, 255, $this->getVar('set_subversion')));
 
-        $buttonTray = new \XoopsFormElementTray(_REQUIRED . ' <sup class="red bold">*</sup>', '');
+        $buttonTray = new \XoopsFormElementTray(_REQUIRED.' <sup class="red bold">*</sup>', '');
         $buttonTray->addElement(new \XoopsFormHidden('op', 'save'));
         $buttonTray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $form->addElement($buttonTray);
@@ -262,7 +262,7 @@ 
     {
         $retSet = [];
         foreach ($this->options as $option) {
-            if (1 == $this->getVar('set_' . $option)) {
+            if (1 == $this->getVar('set_'.$option)) {
                 $retSet[] = $option;
             }
         }

class/SplClassLoader.php

Spacing +4 added lines, -4 removed lines

@@ -139,17 +139,17 @@
      */
     public function loadClass($className)
     {
-        if (null === $this->_namespace || $this->_namespace . $this->_namespaceSeparator === mb_substr($className, 0, mb_strlen($this->_namespace . $this->_namespaceSeparator))) {
+        if (null === $this->_namespace || $this->_namespace.$this->_namespaceSeparator === mb_substr($className, 0, mb_strlen($this->_namespace.$this->_namespaceSeparator))) {
             $fileName  = '';
             $namespace = '';
             if (false !== ($lastNsPos = mb_strrpos($className, $this->_namespaceSeparator))) {
                 $namespace .= mb_substr($className, 0, $lastNsPos);
                 $className = mb_substr($className, $lastNsPos + 1);
-                $fileName  = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+                $fileName  = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
             }
-            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
+            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className).$this->_fileExtension;
 
-            require (null !== $this->_includePath ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
+            require (null !== $this->_includePath ? $this->_includePath.DIRECTORY_SEPARATOR : '').$fileName;
         }
     }
 }

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;

class/Tables.php

Spacing +7 added lines, -7 removed lines

@@ -182,18 +182,18 @@ 
         $tableImage       = $getTableImage ?: 'blank.gif';
         $icons32Directory = '/Frameworks/moduleclasses/icons/32';
         $uploadsDirectory = '/uploads/tdmcreate/images/tables';
-        $iconsDirectory   = is_dir(XOOPS_ROOT_PATH . $icons32Directory) ? $icons32Directory : $uploadsDirectory;
+        $iconsDirectory   = is_dir(XOOPS_ROOT_PATH.$icons32Directory) ? $icons32Directory : $uploadsDirectory;
 
         $imgtray1     = new \XoopsFormElementTray(_AM_TDMCREATE_TABLE_IMAGE, '<br>');
         $imgpath1     = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, ".{$iconsDirectory}/");
         $imageSelect1 = new \XoopsFormSelect($imgpath1, 'table_image', $tableImage, 10);
-        $imageArray1  = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . $iconsDirectory);
+        $imageArray1  = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH.$iconsDirectory);
         foreach ($imageArray1 as $image1) {
             $imageSelect1->addOption($image1, $image1);
         }
-        $imageSelect1->setExtra("onchange='showImgSelected(\"image1\", \"table_image\", \"" . $iconsDirectory . '", "", "' . XOOPS_URL . "\")'");
+        $imageSelect1->setExtra("onchange='showImgSelected(\"image1\", \"table_image\", \"".$iconsDirectory.'", "", "'.XOOPS_URL."\")'");
         $imgtray1->addElement($imageSelect1, false);
-        $imgtray1->addElement(new \XoopsFormLabel('', "<br><img src='" . XOOPS_URL . '/' . $iconsDirectory . '/' . $tableImage . "' id='image1' alt='' />"));
+        $imgtray1->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL.'/'.$iconsDirectory.'/'.$tableImage."' id='image1' alt='' />"));
         $fileseltray1 = new \XoopsFormElementTray('', '<br>');
         $fileseltray1->addElement(new \XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $helper->getConfig('maxsize_image')));
         $fileseltray1->addElement(new \XoopsFormLabel(''));
@@ -217,7 +217,7 @@ 
         $checkbox = new \XoopsFormCheckbox(' ', 'table_option', $this->getOptionsTables(), '<br>');
         $checkbox->setDescription(_AM_TDMCREATE_OPTIONS_DESC);
         foreach ($this->options as $option) {
-            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_TABLE_' . mb_strtoupper($option)));
+            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_TABLE_'.mb_strtoupper($option)));
         }
         $optionsTray->addElement($checkbox);
 
@@ -225,7 +225,7 @@ 
 
         $form->addElement($optionsTray);
 
-        $buttonTray = new \XoopsFormElementTray(_REQUIRED . ' <sup class="red bold">*</sup>', '');
+        $buttonTray = new \XoopsFormElementTray(_REQUIRED.' <sup class="red bold">*</sup>', '');
         $buttonTray->addElement(new \XoopsFormHidden('op', 'save'));
         $buttonTray->addElement(new \XoopsFormHidden('table_id', ($isNew ? 0 : $this->getVar('table_id'))));
         $buttonTray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
@@ -274,7 +274,7 @@ 
     {
         $retTable = [];
         foreach ($this->options as $option) {
-            if (1 == $this->getVar('table_' . $option)) {
+            if (1 == $this->getVar('table_'.$option)) {
                 $retTable[] = $option;
             }
         }

class/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
     public function getHandler($name)
     {
 
-        $class = '\\XoopsModules\\' . ucfirst(mb_strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler';
+        $class = '\\XoopsModules\\'.ucfirst(mb_strtolower(basename(dirname(__DIR__)))).'\\'.$name.'Handler';
         if (!class_exists($class)) {
             throw new \RuntimeException("Class '$class' not found");
         }

class/Files/Assets/Css/Admin/CssAdminStyles.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         $filename      = $this->getFileName();
         $moduleDirname = $module->getVar('mod_dirname');
         $content       = $this->getHeaderFilesComments($module, '@charset "UTF-8";');
-        $content       .= <<<'EOT'
+        $content .= <<<'EOT'
 img {
 	max-width: 200px;
 }

class/Files/Assets/Css/CssStyles.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         $filename      = $this->getFileName();
         $moduleDirname = $module->getVar('mod_dirname');
         $content       = $this->getHeaderFilesComments($module, '@charset "UTF-8";');
-        $content       .= <<<EOT
+        $content .= <<<EOT
 ul.menu {
 	list-style: none;
 	background-color: #f5f5f5;

class/Files/Assets/Js/JavascriptJQuery.php

Spacing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
         $moduleDirname = $module->getVar('mod_dirname');
         $content       = $this->getHeaderFilesComments($module);
         $content       = $this->getJavascriptJQueryButtons();
-        $content       .= $this->getJavascriptJQueryPrint();
+        $content .= $this->getJavascriptJQueryPrint();
 
         $this->create($moduleDirname, 'assets/js', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 

class/Files/Assets/Js/JsJquery.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
         $filename      = $this->getFileName();
         $moduleDirname = $module->getVar('mod_dirname');
         $content       = $this->getHeaderFilesComments($module, 0);
-        $content       .= <<<'EOT'
+        $content .= <<<'EOT'
 $(document).ready(function(){
     $( "button, input:button, input:submit, input:file, input:reset" ).css("color","inherit").button();
     $( ".check" ).css("color","#fff").button();