txmodxoops / tdmcreate

class/LogoGenerator.php

Spacing +10 added lines, -10 removed lines

@@ -23,11 +23,11 @@ 
  *
  * @version         $Id: LogoGenerator.php 12258 2014-01-02 09:33:29Z timgno $
  */
-include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+include_once dirname(dirname(dirname(__DIR__))).'/mainfile.php';
 //include_once XOOPS_ROOT_PATH . '/modules/TDMCreate/include/common.php';
 
 if (function_exists($_GET['f'])) { // get function name and parameter  $_GET['f']($_GET["p"]);
-    include_once __DIR__ . '/LogoGenerator.php';
+    include_once __DIR__.'/LogoGenerator.php';
     $ret = LogoGenerator::createLogo($_GET['iconName'], $_GET['caption']);
     phpFunction($ret);
 } else {
@@ -66,15 +66,15 @@ 
         }
 
         $dirname = 'tdmcreate';
-        $iconFileName = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32/' . basename($logoIcon);
+        $iconFileName = XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/icons/32/'.basename($logoIcon);
 
         //$dirFonts = TDMC_PATH . "/assets/fonts";
         //$dirLogos = TDMC_PATH . "/assets/images/logos";
-        $dirFonts = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/assets/fonts';
-        $dirLogos = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/assets/images/logos';
+        $dirFonts = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/assets/fonts';
+        $dirLogos = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/assets/images/logos';
 
-        if (!file_exists($imageBase = $dirLogos . '/empty.png') ||
-            !file_exists($font = $dirFonts . '/VeraBd.ttf') ||
+        if (!file_exists($imageBase = $dirLogos.'/empty.png') ||
+            !file_exists($font = $dirFonts.'/VeraBd.ttf') ||
             !file_exists($iconFile = $iconFileName)) {
             return false;
         }
@@ -90,13 +90,13 @@ 
         imagecopy($imageModule, $imageIcon, 29, 2, 0, 0, 32, 32);
 
         //$targetImage = TDMC_UPLOAD_IMGMOD_URL . "/" . $moduleName . "_logo.png";
-        $targetImage = '/uploads/' . $dirname . '/images/modules/' . $moduleName . '_logo.png';
+        $targetImage = '/uploads/'.$dirname.'/images/modules/'.$moduleName.'_logo.png';
 
-        imagepng($imageModule, XOOPS_ROOT_PATH . $targetImage);
+        imagepng($imageModule, XOOPS_ROOT_PATH.$targetImage);
 
         imagedestroy($imageModule);
         imagedestroy($imageIcon);
 
-        return XOOPS_URL . $targetImage;
+        return XOOPS_URL.$targetImage;
     }
 }

class/Building.php

Spacing +5 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
         $form->addElement($mod_select, true);
 
         $form->addElement(new \XoopsFormHidden('op', 'build'));
-        $form->addElement(new \XoopsFormButton(_REQUIRED . ' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit'));
+        $form->addElement(new \XoopsFormButton(_REQUIRED.' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit'));
 
         return $form;
     }
@@ -82,7 +82,7 @@ 
     public function clearDir($dir, $pattern = '*')
     {
         // Find all files and folders matching pattern
-        $files = glob($dir . "/$pattern");
+        $files = glob($dir."/$pattern");
         // Interate thorugh the files and folders
         foreach ($files as $file) {
             // if it's a directory then re-call clearDir function to delete files inside this directory
@@ -109,12 +109,12 @@ 
         }
         while (false !== ($file = readdir($dir))) {
             if (('.' !== $file) && ('..' !== $file)) {
-                if (is_dir($src . '/' . $file)) {
+                if (is_dir($src.'/'.$file)) {
                     // Copy the directory itself
-                    $this->copyDir($src . '/' . $file, $dst . '/' . $file);
+                    $this->copyDir($src.'/'.$file, $dst.'/'.$file);
                 } else {
                     // Make sure you copy the current script
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }

class/Tables.php

Spacing +7 added lines, -7 removed lines

@@ -181,18 +181,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 . "' name='image1' id='image1' alt='' />"));
+        $imgtray1->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL.'/'.$iconsDirectory.'/'.$tableImage."' name='image1' id='image1' alt='' />"));
         $fileseltray1 = new \XoopsFormElementTray('', '<br>');
         $fileseltray1->addElement(new \XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $helper->getConfig('maxsize')));
         $fileseltray1->addElement(new \XoopsFormLabel(''));
@@ -216,7 +216,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);
 
@@ -224,7 +224,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'));
@@ -273,7 +273,7 @@ 
     {
         $retTable = [];
         foreach ($this->options as $option) {
-            if (1 == $this->getVar('table_' . $option)) {
+            if (1 == $this->getVar('table_'.$option)) {
                 $retTable[] = $option;
             }
         }

class/Files/Sql/SqlFile.php

Spacing +11 added lines, -11 removed lines

@@ -200,7 +200,7 @@ 
                     case 3:
                     case 4:
                     case 5:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         if (empty($fieldDefault)) {
                             $default = "DEFAULT '0'";
                         } else {
@@ -210,7 +210,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 {
@@ -220,11 +220,11 @@ 
                     case 9:
                     case 10:
                         $fValues = str_replace(',', "', '", 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 {
@@ -232,7 +232,7 @@ 
                         }
                         break;
                     case 12:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         if (empty($fieldDefault)) {
                             $default = "DEFAULT 'http:\\'";
                         } else {
@@ -241,7 +241,7 @@ 
                         break;
                     case 13:
                     case 14:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         $default = "DEFAULT '{$fieldDefault}'";
                         break;
                     case 15:
@@ -255,7 +255,7 @@ 
                     case 20:
                     case 21:
                     case 22:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         $default = "DEFAULT '{$fieldDefault}'";
                         break;
                     case 23:
@@ -267,7 +267,7 @@ 
                         }
                         break;
                     default:
-                        $type = $fieldTypeName . '(' . $fieldValue . ')';
+                        $type = $fieldTypeName.'('.$fieldValue.')';
                         $default = "DEFAULT '{$fieldDefault}'";
                         break;
                 }
@@ -312,7 +312,7 @@ 
         // ================= COMMA ================= //
         for ($i = 0; $i < $j; ++$i) {
             if ($i != $j - 1) {
-                $row[] = $comma[$i] . ',';
+                $row[] = $comma[$i].',';
             } else {
                 $row[] = $comma[$i];
             }
@@ -426,9 +426,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/User/UserXoopsCode.php

Spacing +7 added lines, -7 removed lines

@@ -74,7 +74,7 @@ 
     {
         $pCodeAddMeta = Tdmcreate\Files\CreatePhpCode::getInstance();
         $stuTableName = mb_strtoupper($tableName);
-        $stripTags = $pCodeAddMeta->getPhpCodeStripTags('', $language . $stuTableName, true);
+        $stripTags = $pCodeAddMeta->getPhpCodeStripTags('', $language.$stuTableName, true);
 
         return "{$t}\$GLOBALS['xoTheme']->addMeta( 'meta', '{$type}', {$stripTags});\n";
     }
@@ -141,7 +141,7 @@ 
         $stuModuleDirname = mb_strtoupper($moduleDirname);
         $ret = $pCodeHeaderFile->getPhpCodeCommentLine('Breadcrumbs');
         $ret .= $pCodeHeaderFile->getPhpCodeArray('xoBreadcrumbs', null, false, '');
-        $titleLink = ["'title'" => $language . 'TITLE', "'link'" => "{$stuModuleDirname}_URL . '/'"];
+        $titleLink = ["'title'" => $language.'TITLE', "'link'" => "{$stuModuleDirname}_URL . '/'"];
         $ret .= $pCodeHeaderFile->getPhpCodeArray('xoBreadcrumbs[]', $titleLink, false, '');
 
         return $ret;
@@ -177,7 +177,7 @@ 
     public function getUserModVersion($eleArray, $descriptions, $name = null, $index = null, $num = false, $t = '')
     {
         $ret = '';
-        $mv = $t . '$modversion';
+        $mv = $t.'$modversion';
         if (!is_array($descriptions)) {
             $descs = [$descriptions];
         } else {
@@ -187,13 +187,13 @@ 
             $one = (null === $name) ? $key : $name;
             $two = (null === $index) ? $key : $index;
             if (1 === $eleArray) {
-                $ret .= $mv . "['{$one}'] = {$desc};\n";
+                $ret .= $mv."['{$one}'] = {$desc};\n";
             } elseif (2 === $eleArray) {
-                $ret .= $mv . "['{$one}'][{$two}] = {$desc};\n";
+                $ret .= $mv."['{$one}'][{$two}] = {$desc};\n";
             } elseif (3 === $eleArray) {
-                $ret .= $mv . "['{$one}'][{$two}]['{$key}'] = {$desc};\n";
+                $ret .= $mv."['{$one}'][{$two}]['{$key}'] = {$desc};\n";
             } elseif (4 === $eleArray) {
-                $ret .= $mv . "['{$one}'][{$two}][{$num}]['{$key}'] = {$desc};\n";
+                $ret .= $mv."['{$one}'][{$two}][{$num}]['{$key}'] = {$desc};\n";
             }
         }
 

class/Files/User/UserSubmit.php

Spacing +16 added lines, -16 removed lines

@@ -110,18 +110,18 @@ 
         $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
         $uc = UserXoopsCode::getInstance();
         $ret = $pc->getPhpCodeCommentLine('Navigation');
-        $ret .= $xc->getXcEqualsOperator('$navigation', "{$language}SUBMIT_PROPOSER", '', false, $t . "\t");
-        $ret .= $xc->getXcTplAssign('navigation', '$navigation', true, $t . "\t");
-        $ret .= $pc->getPhpCodeCommentLine('Title of page', null, $t . "\t");
-        $ret .= $xc->getXcEqualsOperator('$title', "{$language}SUBMIT_PROPOSER . ' - '", '', false, $t . "\t");
-        $ret .= $xc->getXcEqualsOperator('$title', "\$GLOBALS['xoopsModule']->name()", '.', false, $t . "\t");
-        $ret .= $xc->getXcTplAssign('xoops_pagetitle', '$title', true, $t . "\t");
-        $ret .= $pc->getPhpCodeCommentLine('Description', null, $t . "\t");
-        $ret .= $uc->getUserAddMeta('description', $language, 'SUBMIT_PROPOSER', $t . "\t");
-        $ret .= $pc->getPhpCodeCommentLine('Form Create', null, $t . "\t");
-        $ret .= $xc->getXcObjHandlerCreate($tableName, $t . "\t");
-        $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t . "\t");
-        $ret .= $xc->getXcTplAssign('form', '$form->render()', true, $t . "\t");
+        $ret .= $xc->getXcEqualsOperator('$navigation', "{$language}SUBMIT_PROPOSER", '', false, $t."\t");
+        $ret .= $xc->getXcTplAssign('navigation', '$navigation', true, $t."\t");
+        $ret .= $pc->getPhpCodeCommentLine('Title of page', null, $t."\t");
+        $ret .= $xc->getXcEqualsOperator('$title', "{$language}SUBMIT_PROPOSER . ' - '", '', false, $t."\t");
+        $ret .= $xc->getXcEqualsOperator('$title', "\$GLOBALS['xoopsModule']->name()", '.', false, $t."\t");
+        $ret .= $xc->getXcTplAssign('xoops_pagetitle', '$title', true, $t."\t");
+        $ret .= $pc->getPhpCodeCommentLine('Description', null, $t."\t");
+        $ret .= $uc->getUserAddMeta('description', $language, 'SUBMIT_PROPOSER', $t."\t");
+        $ret .= $pc->getPhpCodeCommentLine('Form Create', null, $t."\t");
+        $ret .= $xc->getXcObjHandlerCreate($tableName, $t."\t");
+        $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t."\t");
+        $ret .= $xc->getXcTplAssign('form', '$form->render()', true, $t."\t");
 
         return $ret;
     }
@@ -147,8 +147,8 @@ 
         $xoopsSecurityCheck = $xc->getXcSecurityCheck();
         $securityError = $xc->getXcSecurityErrors();
         $implode = $pc->getPhpCodeImplode(',', $securityError);
-        $redirectError = $xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t");
-        $ret .= $pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectError, false, $t);
+        $redirectError = $xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t."\t");
+        $ret .= $pc->getPhpCodeConditions('!'.$xoopsSecurityCheck, '', '', $redirectError, false, $t);
         $ret .= $xc->getXcObjHandlerCreate($tableName, $t);
         $autoincrement = in_array(1, $tableAutoincrement) ? $tableAutoincrement : 0;
         if (in_array(1, $tableSubmit)) {
@@ -156,7 +156,7 @@ 
         }
         $ret .= $pc->getPhpCodeCommentLine('Insert Data', null, $t);
         $insert = $xc->getXcInsert($tableName, $tableName, 'Obj', 'Handler');
-        $confirmOk = $xc->getXcRedirectHeader('index', '', '2', "{$language}FORM_OK", true, $t . "\t");
+        $confirmOk = $xc->getXcRedirectHeader('index', '', '2', "{$language}FORM_OK", true, $t."\t");
         $ret .= $pc->getPhpCodeConditions($insert, '', '', $confirmOk, false, $t);
 
         $ret .= $pc->getPhpCodeCommentLine('Get Form Error', null, $t);
@@ -204,7 +204,7 @@ 
         $fields = $this->getTableFields($tableMid, $tableId);
         $cases = [
             'form' => [$this->getUserSubmitForm($tableName, $language, $t)],
-            'save' => [$this->getUserSubmitSave($moduleDirname, $fields, $tableName, $tableSoleName, $tableSubmit, $tableAutoincrement, $language, $t . "\t")],
+            'save' => [$this->getUserSubmitSave($moduleDirname, $fields, $tableName, $tableSoleName, $tableSubmit, $tableAutoincrement, $language, $t."\t")],
         ];
 
         return $xc->getXcSwitch('op', $cases, true, false, $t);

class/Files/admin/AdminXoopsCode.php

Spacing +47 added lines, -47 removed lines

@@ -71,11 +71,11 @@ 
     public function getAdminItemButton($language, $tableName, $stuTableSoleName, $op = '?op=new', $type = 'add', $t = '')
     {
         $stuType = mb_strtoupper($type);
-        $aM = $t . '$adminObject->addItemButton(';
+        $aM = $t.'$adminObject->addItemButton(';
         if ('add' === $type) {
-            $ret = $aM . "{$language}ADD_{$stuTableSoleName}, '{$tableName}.php{$op}', '{$type}');\n";
+            $ret = $aM."{$language}ADD_{$stuTableSoleName}, '{$tableName}.php{$op}', '{$type}');\n";
         } else {
-            $ret = $aM . "{$language}{$stuTableSoleName}_{$stuType}, '{$tableName}.php{$op}', '{$type}');\n";
+            $ret = $aM."{$language}{$stuTableSoleName}_{$stuType}, '{$tableName}.php{$op}', '{$type}');\n";
         }
 
         return $ret;
@@ -117,11 +117,11 @@ 
      */
     public function getAxcAddInfoBoxLine($language, $label = '', $var = '', $t = '')
     {
-        $aMenu = $t . '$adminObject->addInfoBoxLine(sprintf(';
+        $aMenu = $t.'$adminObject->addInfoBoxLine(sprintf(';
         if ('' != $var) {
-            $ret = $aMenu . " '<label>'.{$label}.'</label>', {$var}));\n";
+            $ret = $aMenu." '<label>'.{$label}.'</label>', {$var}));\n";
         } else {
-            $ret = $aMenu . " '<label>'.{$label}.'</label>'));\n";
+            $ret = $aMenu." '<label>'.{$label}.'</label>'));\n";
         }
 
         return $ret;
@@ -138,11 +138,11 @@ 
      */
     public function getAxcAddConfigBoxLine($language, $label = '', $var = '', $t = '')
     {
-        $aMenu = $t . '$adminObject->addConfigBoxLine(';
+        $aMenu = $t.'$adminObject->addConfigBoxLine(';
         if ('' != $var) {
-            $ret = $aMenu . "{$language}, '{$label}', {$var});\n";
+            $ret = $aMenu."{$language}, '{$label}', {$var});\n";
         } else {
-            $ret = $aMenu . "{$language}, '{$label}');\n";
+            $ret = $aMenu."{$language}, '{$label}');\n";
         }
 
         return $ret;
@@ -164,15 +164,15 @@ 
         $ret .= $pCodeImageList->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t);
         $xRootPath = "XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'";
         $ret .= $xCodeImageList->getXcMediaUploader('uploader', $xRootPath, $moduleDirname, $t);
-        $post = $pCodeImageList->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[0]';
+        $post = $pCodeImageList->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST').'[0]';
         $fetchMedia = $this->getAxcFetchMedia('uploader', $post);
-        $ifelse = $t . "\t//" . $this->getAxcSetPrefix('uploader', "{$fieldName}_") . ";\n";
-        $ifelse .= $t . "\t//{$fetchMedia};\n";
-        $contentElseInt = $xCodeImageList->getXcSetVar($tableName, $fieldName, '$uploader->getSavedFileName()', $t . "\t\t");
-        $contentIf = $xCodeImageList->getXcEqualsOperator('$errors', '$uploader->getErrors()', null, false, $t . "\t\t");
-        $contentIf .= $xCodeImageList->getXcRedirectHeader('javascript:history.go(-1)', '', '3', '$errors', true, $t . "\t\t");
-        $ifelse .= $pCodeImageList->getPhpCodeConditions('!$uploader->upload()', '', '', $contentIf, $contentElseInt, $t . "\t");
-        $contentElseExt = $xCodeImageList->getXcSetVar($tableName, $fieldName, "\$_POST['{$fieldName}']", $t . "\t");
+        $ifelse = $t."\t//".$this->getAxcSetPrefix('uploader', "{$fieldName}_").";\n";
+        $ifelse .= $t."\t//{$fetchMedia};\n";
+        $contentElseInt = $xCodeImageList->getXcSetVar($tableName, $fieldName, '$uploader->getSavedFileName()', $t."\t\t");
+        $contentIf = $xCodeImageList->getXcEqualsOperator('$errors', '$uploader->getErrors()', null, false, $t."\t\t");
+        $contentIf .= $xCodeImageList->getXcRedirectHeader('javascript:history.go(-1)', '', '3', '$errors', true, $t."\t\t");
+        $ifelse .= $pCodeImageList->getPhpCodeConditions('!$uploader->upload()', '', '', $contentIf, $contentElseInt, $t."\t");
+        $contentElseExt = $xCodeImageList->getXcSetVar($tableName, $fieldName, "\$_POST['{$fieldName}']", $t."\t");
 
         $ret .= $pCodeImageList->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contentElseExt, $t);
 
@@ -196,21 +196,21 @@ 
         $ret = $pCodeUploadImage->getPhpCodeCommentLine('Set Var', $fieldName, $t);
         $ret .= $pCodeUploadImage->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t);
         $xUploadImage = "{$stuModuleDirname}_UPLOAD_IMAGE_PATH";
-        $ret .= $xCodeUploadImage->getXcMediaUploader('uploader', $xUploadImage . ".'/{$tableName}/'", $moduleDirname, $t);
-        $post = $pCodeUploadImage->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[0]';
+        $ret .= $xCodeUploadImage->getXcMediaUploader('uploader', $xUploadImage.".'/{$tableName}/'", $moduleDirname, $t);
+        $post = $pCodeUploadImage->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST').'[0]';
         $fetchMedia = $this->getAxcFetchMedia('uploader', $post);
-        $file = $pCodeUploadImage->getPhpCodeGlobalsVariables('attachedfile', 'FILES') . "['name']";
+        $file = $pCodeUploadImage->getPhpCodeGlobalsVariables('attachedfile', 'FILES')."['name']";
         $expr = '/^.+\.([^.]+)$/sU';
-        $ifelse = $pCodeUploadImage->getPhpCodePregFunzions('extension', $expr, '', $file, 'replace', false, $t . "\t");
+        $ifelse = $pCodeUploadImage->getPhpCodePregFunzions('extension', $expr, '', $file, 'replace', false, $t."\t");
 
-        $ifelse .= $t . "\t\$imgName = str_replace(' ', '', \$_POST['{$fieldMain}']).'.'.\$extension;\n";
-        $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t . "\t") . ";\n";
-        $ifelse .= $t . "\t{$fetchMedia};\n";
-        $contentElseInt = $xCodeUploadImage->getXcSetVar($tableName, $fieldName, '$uploader->getSavedFileName()', $t . "\t\t");
-        $contentIf = $xCodeUploadImage->getXcEqualsOperator('$errors', '$uploader->getErrors()', null, false, $t . "\t\t");
-        $contentIf .= $xCodeUploadImage->getXcRedirectHeader('javascript:history.go(-1)', '', '3', '$errors', true, $t . "\t\t");
-        $ifelse .= $pCodeUploadImage->getPhpCodeConditions('!$uploader->upload()', '', '', $contentIf, $contentElseInt, $t . "\t");
-        $contentElseExt = $xCodeUploadImage->getXcSetVar($tableName, $fieldName, "\$_POST['{$fieldName}']", $t . "\t");
+        $ifelse .= $t."\t\$imgName = str_replace(' ', '', \$_POST['{$fieldMain}']).'.'.\$extension;\n";
+        $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t."\t").";\n";
+        $ifelse .= $t."\t{$fetchMedia};\n";
+        $contentElseInt = $xCodeUploadImage->getXcSetVar($tableName, $fieldName, '$uploader->getSavedFileName()', $t."\t\t");
+        $contentIf = $xCodeUploadImage->getXcEqualsOperator('$errors', '$uploader->getErrors()', null, false, $t."\t\t");
+        $contentIf .= $xCodeUploadImage->getXcRedirectHeader('javascript:history.go(-1)', '', '3', '$errors', true, $t."\t\t");
+        $ifelse .= $pCodeUploadImage->getPhpCodeConditions('!$uploader->upload()', '', '', $contentIf, $contentElseInt, $t."\t");
+        $contentElseExt = $xCodeUploadImage->getXcSetVar($tableName, $fieldName, "\$_POST['{$fieldName}']", $t."\t");
 
         $ret .= $pCodeUploadImage->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contentElseExt, $t);
 
@@ -229,7 +229,7 @@ 
     public function getAxcUploadFileSetVar($moduleDirname, $tableName, $fieldName, $formatUrl = false, $t = '')
     {
         $stuModuleDirname = mb_strtoupper($moduleDirname);
-        $ret = $this->getAxcImageFileSetVar($moduleDirname, $stuModuleDirname . '_UPLOAD_FILES_PATH', $tableName, $fieldName, $formatUrl, $t);
+        $ret = $this->getAxcImageFileSetVar($moduleDirname, $stuModuleDirname.'_UPLOAD_FILES_PATH', $tableName, $fieldName, $formatUrl, $t);
 
         return $ret;
     }
@@ -251,26 +251,26 @@ 
         $ret = '';
         $ifelse = '';
         $files = '';
-        $post = $pCodeFileSetVar->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[0]';
+        $post = $pCodeFileSetVar->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST').'[0]';
         $fetchMedia = $this->getAxcFetchMedia('uploader', $post);
         if ($formatUrl) {
             $ret .= $xCodeFileSetVar->getXcSetVar($tableName, $fieldName, "formatUrl(\$_REQUEST['{$fieldName}'])", $t);
             $ret .= $pCodeFileSetVar->getPhpCodeCommentLine('Set Var', $fieldName, $t);
-            $ifelse .= $t . "\t\t{$fetchMedia};\n";
+            $ifelse .= $t."\t\t{$fetchMedia};\n";
         } else {
             $files = '/files';
             $ret .= $pCodeFileSetVar->getPhpCodeCommentLine('Set Var', $fieldName, $t);
-            $ifelse .= $t . "\t//" . $this->getAxcSetPrefix('uploader', "'{$fieldName}_'") . ";\n";
-            $ifelse .= $t . "\t//{$fetchMedia};\n";
+            $ifelse .= $t."\t//".$this->getAxcSetPrefix('uploader', "'{$fieldName}_'").";\n";
+            $ifelse .= $t."\t//{$fetchMedia};\n";
         }
         $ret .= $pCodeFileSetVar->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t);
-        $ret .= $xCodeFileSetVar->getXcMediaUploader('uploader', $dirname . ".'/{$tableName}{$files}'", $moduleDirname, $t);
-        $contentElse = $xCodeFileSetVar->getXcSetVar($tableName, $fieldName, '$uploader->getSavedFileName()', $t . "\t\t");
-        $contentIf = $xCodeFileSetVar->getXcEqualsOperator('$errors', '$uploader->getErrors()', null, false, $t . "\t\t");
-        $contentIf .= $xCodeFileSetVar->getXcRedirectHeader('javascript:history.go(-1)', '', '3', '$errors', true, $t . "\t\t");
-        $ifelse .= $pCodeFileSetVar->getPhpCodeConditions('!$uploader->upload()', '', '', $contentIf, $contentElse, $t . "\t");
+        $ret .= $xCodeFileSetVar->getXcMediaUploader('uploader', $dirname.".'/{$tableName}{$files}'", $moduleDirname, $t);
+        $contentElse = $xCodeFileSetVar->getXcSetVar($tableName, $fieldName, '$uploader->getSavedFileName()', $t."\t\t");
+        $contentIf = $xCodeFileSetVar->getXcEqualsOperator('$errors', '$uploader->getErrors()', null, false, $t."\t\t");
+        $contentIf .= $xCodeFileSetVar->getXcRedirectHeader('javascript:history.go(-1)', '', '3', '$errors', true, $t."\t\t");
+        $ifelse .= $pCodeFileSetVar->getPhpCodeConditions('!$uploader->upload()', '', '', $contentIf, $contentElse, $t."\t");
 
-        $ret .= $pCodeFileSetVar->getPhpCodeConditions($fetchMedia, '', '', $t . "\t" . $fetchMedia . ";\n", $ifelse, $t);
+        $ret .= $pCodeFileSetVar->getPhpCodeConditions($fetchMedia, '', '', $t."\t".$fetchMedia.";\n", $ifelse, $t);
 
         return $ret;
     }
@@ -382,24 +382,24 @@ 
         $phpCodeCaseDelete = Tdmcreate\Files\CreatePhpCode::getInstance();
         $xCodeCaseDelete = Tdmcreate\Files\CreateXoopsCode::getInstance();
         $ccFieldId = Tdmcreate\Files\CreateFile::getInstance()->getCamelCase($fieldId, false, true);
-        $ret = $xCodeCaseDelete->getXcGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler');
+        $ret = $xCodeCaseDelete->getXcGet($tableName, $ccFieldId, 'Obj', $tableName.'Handler');
 
         $reqOk = "_REQUEST['ok']";
         $isset = $phpCodeCaseDelete->getPhpCodeIsset($reqOk);
         $xoopsSecurityCheck = $xCodeCaseDelete->getXcSecurityCheck();
         $xoopsSecurityErrors = $xCodeCaseDelete->getXcSecurityErrors();
         $implode = $phpCodeCaseDelete->getPhpCodeImplode(', ', $xoopsSecurityErrors);
-        $redirectHeaderErrors = $xCodeCaseDelete->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t\t");
+        $redirectHeaderErrors = $xCodeCaseDelete->getXcRedirectHeader($tableName, '', '3', $implode, true, $t."\t\t");
 
         $delete = $xCodeCaseDelete->getXcDelete($tableName, $tableName, 'Obj', 'Handler');
-        $condition = $phpCodeCaseDelete->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectHeaderErrors, false, $t . "\t");
+        $condition = $phpCodeCaseDelete->getPhpCodeConditions('!'.$xoopsSecurityCheck, '', '', $redirectHeaderErrors, false, $t."\t");
 
-        $redirectHeaderLanguage = $xCodeCaseDelete->getXcRedirectHeader($tableName, '', '3', "{$language}FORM_DELETE_OK", true, $t . "\t\t");
+        $redirectHeaderLanguage = $xCodeCaseDelete->getXcRedirectHeader($tableName, '', '3', "{$language}FORM_DELETE_OK", true, $t."\t\t");
         $htmlErrors = $xCodeCaseDelete->getXcHtmlErrors($tableName, true);
-        $internalElse = $xCodeCaseDelete->getXcTplAssign('error', $htmlErrors, true, $t . "\t\t");
-        $condition .= $phpCodeCaseDelete->getPhpCodeConditions($delete, '', '', $redirectHeaderLanguage, $internalElse, $t . "\t");
+        $internalElse = $xCodeCaseDelete->getXcTplAssign('error', $htmlErrors, true, $t."\t\t");
+        $condition .= $phpCodeCaseDelete->getPhpCodeConditions($delete, '', '', $redirectHeaderLanguage, $internalElse, $t."\t");
 
-        $mainElse = $xCodeCaseDelete->getXcXoopsConfirm($tableName, $language, $fieldId, $fieldMain, 'delete', $t . "\t");
+        $mainElse = $xCodeCaseDelete->getXcXoopsConfirm($tableName, $language, $fieldId, $fieldMain, 'delete', $t."\t");
         $ret .= $phpCodeCaseDelete->getPhpCodeConditions($isset, ' && ', "1 == \${$reqOk}", $condition, $mainElse, $t);
 
         return $ret;

class/Files/Templates/Blocks/TemplatesBlocks.php

Spacing +22 added lines, -22 removed lines

@@ -83,11 +83,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;
     }
 
     /**
@@ -107,7 +107,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) {
@@ -125,7 +125,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;*/
@@ -134,18 +134,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;
                 }
@@ -155,19 +155,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;
     }
 
     /**
@@ -177,10 +177,10 @@ 
     private function getTemplatesBlocksTableTfoot()
     {
         $hc = Tdmcreate\Files\CreateHtmlSmartyCodes::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;
     }
 
     /**
@@ -202,7 +202,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/Index.php

Spacing +18 added lines, -18 removed lines

@@ -78,7 +78,7 @@ 
     {
         $hc = Tdmcreate\Files\CreateSmartyCode::getInstance();
 
-        return $hc->getSmartyIncludeFile($moduleDirname, 'header') . PHP_EOL;
+        return $hc->getSmartyIncludeFile($moduleDirname, 'header').PHP_EOL;
     }
 
     /**
@@ -96,7 +96,7 @@ 
         $table = $this->getTemplatesUserIndexTableThead($tableName, $language);
         $table .= $this->getTemplatesUserIndexTableTBody($moduleDirname, $tableName, $tableSoleName, $language);
 
-        return $hc->getHtmlTable($table, 'table table-' . $single) . PHP_EOL;
+        return $hc->getHtmlTable($table, 'table table-'.$single).PHP_EOL;
     }
 
     /**
@@ -111,10 +111,10 @@ 
         $stuTableName = mb_strtoupper($tableName);
         $lang = $hc->getSmartyConst($language, $stuTableName);
         $col = $hc->getSmartySingleVar('numb_col');
-        $th = $hc->getHtmlTableHead($lang, '', $col) . PHP_EOL;
-        $tr = $hc->getHtmlTableRow($th, 'head') . PHP_EOL;
+        $th = $hc->getHtmlTableHead($lang, '', $col).PHP_EOL;
+        $tr = $hc->getHtmlTableRow($th, 'head').PHP_EOL;
 
-        return $hc->getHtmlTableThead($tr) . PHP_EOL;
+        return $hc->getHtmlTableThead($tr).PHP_EOL;
     }
 
     /**
@@ -130,14 +130,14 @@ 
         $hc = Tdmcreate\Files\CreateHtmlSmartyCodes::getInstance();
         $type = $hc->getSmartySingleVar('panel_type');
         $include = $hc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName);
-        $div = $hc->getHtmlDiv($include, 'panel panel-' . $type);
-        $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;
+        $div = $hc->getHtmlDiv($include, 'panel panel-'.$type);
+        $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;
+        return $hc->getHtmlTableTbody($tr).PHP_EOL;
     }
 
     /**
@@ -147,10 +147,10 @@ 
     private function getTemplatesUserIndexTableTfoot()
     {
         $hc = Tdmcreate\Files\CreateHtmlCode::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;
     }
 
     /**
@@ -251,10 +251,10 @@ 
         $single = $hc->getSmartySingleVar('table_type');
         $table = $this->getTemplatesUserIndexTableThead($tableName, $language);
         $table .= $this->getTemplatesUserIndexTableTBody($moduleDirname, $tableName, $tableSoleName, $language);
-        $table .= $hc->getHtmlTable($table, 'table table-' . $single) . PHP_EOL;
-        $div = $hc->getHtmlDiv($table, 'table-responsive') . PHP_EOL;
+        $table .= $hc->getHtmlTable($table, 'table table-'.$single).PHP_EOL;
+        $div = $hc->getHtmlDiv($table, 'table-responsive').PHP_EOL;
 
-        return $ret/*$hc->getSmartyConditions($tableName, ' > ', '0', $div, false, true)*/ . PHP_EOL;
+        return $ret/*$hc->getSmartyConditions($tableName, ' > ', '0', $div, false, true)*/.PHP_EOL;
     }
 
     /**