txmodxoops / tdmcreate

class/Files/Templates/user/CategoriesList.php

Spacing +15 added lines, -15 removed lines

@@ -90,7 +90,7 @@ 
      */
     private function getTemplatesUserCategoriesListThead($table)
     {
-        $ret    = <<<EOT
+        $ret = <<<EOT
 		<thead>
 			<tr>\n
 EOT;
@@ -100,7 +100,7 @@ 
                 if (1 == $fields[$f]->getVar('field_thead')) {
                     $fieldName   = $fields[$f]->getVar('field_name');
                     $rpFieldName = $this->getRightString($fieldName);
-                    $ret         .= <<<EOT
+                    $ret .= <<<EOT
 				<th><{\$list.{$rpFieldName}}></th>\n
 EOT;
                 }
@@ -128,7 +128,7 @@ 
 		<tbody>
 			<tr>\n
 EOT;
-        $fields    = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
+        $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
         foreach (array_keys($fields) as $f) {
             $fieldElement = $fields[$f]->getVar('field_element');
             if (1 == $fields[$f]->getVar('field_user')) {
@@ -138,14 +138,14 @@ 
                         case 10:
                             $fieldName   = $fields[$f]->getVar('field_name');
                             $rpFieldName = $this->getRightString($fieldName);
-                            $ret         .= <<<EOT
+                            $ret .= <<<EOT
 				<td class="center pad5"><img src="<{\$xoops_icons32_url}>/<{\$list.{$rpFieldName}}>" alt="{$tableName}" /></td>\n
 EOT;
                             break;
                         case 13:
                             $fieldName   = $fields[$f]->getVar('field_name');
                             $rpFieldName = $this->getRightString($fieldName);
-                            $ret         .= <<<EOT
+                            $ret .= <<<EOT
 				<td class="center pad5"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$rpFieldName}}>" alt="{$tableName}" /></td>\n
 EOT;
                             break;
@@ -154,7 +154,7 @@ 
                         case 4:
                             $fieldName   = $fields[$f]->getVar('field_name');
                             $rpFieldName = $this->getRightString($fieldName);
-                            $ret         .= <<<EOT
+                            $ret .= <<<EOT
 				<td class="justify pad5"><{\$list.{$rpFieldName}}></td>\n
 EOT;
                             break;
@@ -188,7 +188,7 @@ 
                 if (1 == $fields[$f]->getVar('field_tfoot')) {
                     $fieldName   = $fields[$f]->getVar('field_name');
                     $rpFieldName = $this->getRightString($fieldName);
-                    $ret         .= <<<EOT
+                    $ret .= <<<EOT
 				<td class="center"><{\$list.{$rpFieldName}}></td>\n
 EOT;
                 }
@@ -244,35 +244,35 @@ 
                         case 2:
                             $rpFieldName = $this->getRightString($fieldName);
                             $doubleVar   = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $retElem     .= $hc->getHtmlSpan($doubleVar, 'col-sm-2') . PHP_EOL;
+                            $retElem .= $hc->getHtmlSpan($doubleVar, 'col-sm-2').PHP_EOL;
                             break;
                         case 3:
                         case 4:
                             $rpFieldName = $this->getRightString($fieldName);
                             $doubleVar   = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $retElem     .= $hc->getHtmlSpan($doubleVar, 'col-sm-3 justify') . PHP_EOL;
+                            $retElem .= $hc->getHtmlSpan($doubleVar, 'col-sm-3 justify').PHP_EOL;
                             break;
                         case 10:
                             $rpFieldName = $this->getRightString($fieldName);
                             $singleVar   = $sc->getSmartySingleVar('xoops_icons32_url');
                             $doubleVar   = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $img         = $hc->getHtmlImage($singleVar . '/' . $doubleVar, (string)$tableName);
-                            $retElem     .= $hc->getHtmlSpan($img, 'col-sm-3') . PHP_EOL;
+                            $img         = $hc->getHtmlImage($singleVar.'/'.$doubleVar, (string)$tableName);
+                            $retElem .= $hc->getHtmlSpan($img, 'col-sm-3').PHP_EOL;
                             unset($img);
                             break;
                         case 13:
                             $rpFieldName = $this->getRightString($fieldName);
-                            $singleVar   = $sc->getSmartySingleVar($moduleDirname . '_upload_url');
+                            $singleVar   = $sc->getSmartySingleVar($moduleDirname.'_upload_url');
                             $doubleVar   = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $img         = $hc->getHtmlImage($singleVar . "/images/{$tableName}/" . $doubleVar, (string)$tableName);
-                            $retElem     .= $hc->getHtmlSpan($img, 'col-sm-3') . PHP_EOL;
+                            $img         = $hc->getHtmlImage($singleVar."/images/{$tableName}/".$doubleVar, (string)$tableName);
+                            $retElem .= $hc->getHtmlSpan($img, 'col-sm-3').PHP_EOL;
                             unset($img);
                             break;
                     }
                 }
             }
         }
-        $ret .= $hc->getHtmlDiv($retElem, 'panel-body') . PHP_EOL;
+        $ret .= $hc->getHtmlDiv($retElem, 'panel-body').PHP_EOL;
 
         return $ret;
     }

class/Files/Templates/Admin/TemplatesAdminPages.php

Spacing +30 added lines, -30 removed lines

@@ -96,23 +96,23 @@ 
         $hc         = Tdmcreate\Files\CreateHtmlCode::getInstance();
         $sc         = Tdmcreate\Files\CreateSmartyCode::getInstance();
         $th         = '';
-        $langHeadId = mb_strtoupper($tableSoleName) . '_ID';
+        $langHeadId = mb_strtoupper($tableSoleName).'_ID';
         if (1 == $tableAutoincrement) {
             $lang = $sc->getSmartyConst($language, $langHeadId);
-            $th   .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t");
+            $th .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t");
         }
         foreach (array_keys($fields) as $f) {
             $fieldName     = $fields[$f]->getVar('field_name');
             $rpFieldName   = $this->getRightString($fieldName);
-            $langFieldName = mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName);
+            $langFieldName = mb_strtoupper($tableSoleName).'_'.mb_strtoupper($rpFieldName);
             if (1 == $fields[$f]->getVar('field_inlist')) {
                 $lang = $sc->getSmartyConst($language, $langFieldName);
-                $th   .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t");
+                $th .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t");
             }
         }
 
         $lang = $sc->getSmartyConst($language, 'FORM_ACTION');
-        $th   .= $hc->getHtmlTag('th', ['class' => 'center width5'], $lang, false, "\t\t\t\t");
+        $th .= $hc->getHtmlTag('th', ['class' => 'center width5'], $lang, false, "\t\t\t\t");
         $tr   = $hc->getHtmlTableRow($th, 'head', "\t\t\t");
         $ret  = $hc->getHtmlTableThead($tr, '', "\t\t");
 
@@ -136,7 +136,7 @@ 
         $td = '';
         if (1 == $tableAutoincrement) {
             $double = $sc->getSmartyDoubleVar($tableSoleName, 'id');
-            $td     .= $hc->getHtmlTableData($double, 'center', '',"\t\t\t\t");
+            $td .= $hc->getHtmlTableData($double, 'center', '', "\t\t\t\t");
         }
         $fieldId = '';
         foreach (array_keys($fields) as $f) {
@@ -150,9 +150,9 @@ 
                 switch ($fieldElement) {
                     case 5:
                         $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                        $src    = $sc->getSmartyNoSimbol('xoModuleIcons16') . $double . '.png';
-                        $img    = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'','');
-                        $td     .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t");
+                        $src    = $sc->getSmartyNoSimbol('xoModuleIcons16').$double.'.png';
+                        $img    = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', '');
+                        $td .= $hc->getHtmlTableData($img, 'center', '', "\t\t\t\t");
                         break;
                     case 9:
                         // This is to be reviewed, as it was initially to style = "backgroung-color: #"
@@ -160,30 +160,30 @@ 
                         // Old code was <span style="background-color: #<{\$list.{$rpFieldName}}>;">...
                         $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
                         $color  = "<span style='background-color:{$double};'>&nbsp;&nbsp;&nbsp;&nbsp;</span>";
-                        $td     .= $hc->getHtmlTableData($color, 'center', '',"\t\t\t\t");
+                        $td .= $hc->getHtmlTableData($color, 'center', '', "\t\t\t\t");
                         break;
                     case 10:
                         $src = $sc->getSmartyNoSimbol('xoModuleIcons32');
                         $src .= $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                        $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'','');
-                        $td  .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t");
+                        $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', '');
+                        $td  .= $hc->getHtmlTableData($img, 'center', '', "\t\t\t\t");
                         break;
                     case 13:
-                        $single = $sc->getSmartySingleVar($moduleDirname . '_upload_url');
+                        $single = $sc->getSmartySingleVar($moduleDirname.'_upload_url');
                         $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                        $img    = $hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName, 'style' => 'max-width:100px'], '', true, '', '');
-                        $td     .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t");
+                        $img    = $hc->getHtmlTag('img', ['src' => $single."/images/{$tableName}/".$double, 'alt' => $tableName, 'style' => 'max-width:100px'], '', true, '', '');
+                        $td .= $hc->getHtmlTableData($img, 'center', '', "\t\t\t\t");
                         break;
                     case 16:
                         $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                        $src = $sc->getSmartyNoSimbol('$modPathIcon16') . '/status' . $double . '.png';
-                        $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'','');
-                        $td     .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t");
+                        $src = $sc->getSmartyNoSimbol('$modPathIcon16').'/status'.$double.'.png';
+                        $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', '');
+                        $td .= $hc->getHtmlTableData($img, 'center', '', "\t\t\t\t");
                         break;
                     default:
                         if (0 != $f) {
                             $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
-                            $td     .= $hc->getHtmlTableData($double, 'center', '',"\t\t\t\t");
+                            $td .= $hc->getHtmlTableData($double, 'center', '', "\t\t\t\t");
                         }
                         break;
                 }
@@ -192,20 +192,20 @@ 
         $lang    = $sc->getSmartyConst('', '_EDIT');
         $double  = $sc->getSmartyDoubleVar($tableSoleName, 'id');
         $src     = $sc->getSmartyNoSimbol('xoModuleIcons16 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, false, "\t\t\t\t\t");
+        $img     = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', '');
+        $anchor  = $hc->getHtmlTag('a', ['href' => $tableName.".php?op=edit&amp;{$fieldId}=".$double, 'title' => $lang], $img, false, "\t\t\t\t\t");
         $lang    = $sc->getSmartyConst('', '_DELETE');
         $double  = $sc->getSmartyDoubleVar($tableSoleName, 'id');
         $src     = $sc->getSmartyNoSimbol('xoModuleIcons16 delete.png');
         $img     = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', '');
-        $anchor  .= $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&amp;{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t\t");
-        $td      .= $hc->getHtmlTag('td', ['class' => 'center  width5'], "\n" . $anchor . "\t\t\t\t", false, "\t\t\t\t");
+        $anchor  .= $hc->getHtmlTag('a', ['href' => $tableName.".php?op=delete&amp;{$fieldId}=".$double, 'title' => $lang], $img, false, "\t\t\t\t\t");
+        $td      .= $hc->getHtmlTag('td', ['class' => 'center  width5'], "\n".$anchor."\t\t\t\t", false, "\t\t\t\t");
         $cycle   = $sc->getSmartyNoSimbol('cycle values=\'odd, even\'');
         $tr      = $hc->getHtmlTableRow($td, $cycle, "\t\t\t");
-        $foreach = $sc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr, '','', "\t\t\t");
-        $tbody   = $hc->getHtmlTableTbody($foreach,'' , "\t\t");
+        $foreach = $sc->getSmartyForeach($tableSoleName, $tableName.'_list', $tr, '', '', "\t\t\t");
+        $tbody   = $hc->getHtmlTableTbody($foreach, '', "\t\t");
 
-        return $sc->getSmartyConditions($tableName . '_count', '', '', $tbody, '', false, false, "\t\t");
+        return $sc->getSmartyConditions($tableName.'_count', '', '', $tbody, '', false, false, "\t\t");
     }
 
     /**
@@ -220,7 +220,7 @@ 
      */
     private function getTemplatesAdminPagesTable($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields, $language)
     {
-        $hc  = Tdmcreate\Files\CreateHtmlCode::getInstance();
+        $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
         $tbody = $this->getTemplatesAdminPagesTableThead($tableSoleName, $tableAutoincrement, $fields, $language);
         $tbody .= $this->getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields);
 
@@ -246,15 +246,15 @@ 
         $single    = $sc->getSmartySingleVar('pagenav');
         $div       = $hc->getHtmlTag('div', ['class' => 'xo-pagenav floatright'], $single, false, "\t\t");
         $div       .= $hc->getHtmlTag('div', ['class' => 'clear spacer'], '', false, "\t\t", "\n");
-        $htmlTable .= $sc->getSmartyConditions('pagenav', '', '', $div, '', '', '', "\t" );
-        $ifList    = $sc->getSmartyConditions($tableName . '_list', '', '', $htmlTable);
+        $htmlTable .= $sc->getSmartyConditions('pagenav', '', '', $div, '', '', '', "\t");
+        $ifList    = $sc->getSmartyConditions($tableName.'_list', '', '', $htmlTable);
         $single    = $sc->getSmartySingleVar('form', "\t", "\n");
         $ifList    .= $sc->getSmartyConditions('form', '', '', $single);
         $single    = $sc->getSmartySingleVar('error');
         $strong    = $hc->getHtmlTag('strong', [], $single, false, '', '');
         $div       = $hc->getHtmlTag('div', ['class' => 'errorMsg'], $strong, false, "\t", "\n");
         $ifList    .= $sc->getSmartyConditions('error', '', '', $div);
-        $ifList    .= $hc->getHtmlEmpty('', '', "\n");;
+        $ifList    .= $hc->getHtmlEmpty('', '', "\n"); ;
 
         return $ifList;
     }

class/Files/Admin/AdminIndex.php

Spacing +12 added lines, -12 removed lines

@@ -97,19 +97,19 @@ 
         foreach (array_keys($tables) as $i) {
             $tableName    = $tables[$i]->getVar('table_name');
             $ucfTableName = ucfirst($tableName);
-            $ret          .= $xc->getXcEqualsOperator("\$count{$ucfTableName}", "\${$tableName}Handler->getCount()");
+            $ret .= $xc->getXcEqualsOperator("\$count{$ucfTableName}", "\${$tableName}Handler->getCount()");
         }
         $ret .= $pc->getPhpCodeBlankLine();
         $ret .= $pc->getPhpCodeCommentLine('InfoBox Statistics');
-        $ret .= $axc->getAxcAddInfoBox($language . 'STATISTICS');
+        $ret .= $axc->getAxcAddInfoBox($language.'STATISTICS');
         $ret .= $pc->getPhpCodeCommentLine('Info elements');
         $tableInstall = [];
         foreach (array_keys($tables) as $i) {
             $tableName      = $tables[$i]->getVar('table_name');
             $tableInstall[] = $tables[$i]->getVar('table_install');
-            $stuTableName   = $languageThereAre . mb_strtoupper($tableName);
+            $stuTableName   = $languageThereAre.mb_strtoupper($tableName);
             $ucfTableName   = ucfirst($tableName);
-            $ret            .= $axc->getAxcAddInfoBoxLine($stuTableName, "\$count{$ucfTableName}");
+            $ret .= $axc->getAxcAddInfoBoxLine($stuTableName, "\$count{$ucfTableName}");
         }
 
         if (null === $tableName) {
@@ -121,25 +121,25 @@ 
             $ret       .= $pc->getPhpCodeCommentLine('Upload Folders');
             $ret       .= $xc->getXcEqualsOperator('$configurator', 'new Common\Configurator()');
             $cond      = '$configurator->uploadFolders && is_array($configurator->uploadFolders)';
-            $fe_action = $xc->getXcEqualsOperator('$folder[]', '$configurator->uploadFolders[$i]', '',"\t\t");
+            $fe_action = $xc->getXcEqualsOperator('$folder[]', '$configurator->uploadFolders[$i]', '', "\t\t");
             $condIf    = $pc->getPhpCodeForeach('configurator->uploadFolders', true, false, 'i', $fe_action, "\t");
             $ret       .= $pc->getPhpCodeConditions($cond, '', '', $condIf, false);
 
             $ret       .= $pc->getPhpCodeCommentLine('Uploads Folders Created');
-            $boxLine   = $axc->getAxcAddConfigBoxLine('$folder[$i]', 'folder', '', "\t");
+            $boxLine = $axc->getAxcAddConfigBoxLine('$folder[$i]', 'folder', '', "\t");
             $boxLine   .= $axc->getAxcAddConfigBoxLine("array(\$folder[\$i], '777')", 'chmod', '', "\t");
-            $ret       .= $pc->getPhpCodeForeach('folder', true, false, 'i', $boxLine, '') . PHP_EOL;
+            $ret       .= $pc->getPhpCodeForeach('folder', true, false, 'i', $boxLine, '').PHP_EOL;
         }
         $ret    .= $pc->getPhpCodeCommentLine('Render Index');
         $ret    .= $xc->getXcXoopsTplAssign('navigation', "\$adminObject->displayNavigation('index.php')");
         $ret    .= $pc->getPhpCodeCommentLine('Test Data');
-        $condIf = $xc->getXcXoopsLoadLanguage('admin/modulesadmin',"\t", 'system');
-        $condIf .= $pc->getPhpCodeIncludeDir('dirname(__DIR__)', 'testdata/index', true, '','',"\t");
+        $condIf = $xc->getXcXoopsLoadLanguage('admin/modulesadmin', "\t", 'system');
+        $condIf .= $pc->getPhpCodeIncludeDir('dirname(__DIR__)', 'testdata/index', true, '', '', "\t");
         $condIf .= $axc->getAdminItemButton("constant('CO_' . \$moduleDirNameUpper . '_ADD_SAMPLEDATA')", '', '', $op = '__DIR__ . /../../testdata/index.php?op=load', $type = 'samplebutton', $t = "\t");
         $condIf .= $axc->getAdminItemButton("constant('CO_' . \$moduleDirNameUpper . '_SAVE_SAMPLEDATA')", '', '', $op = '__DIR__ . /../../testdata/index.php?op=save', $type = 'samplebutton', $t = "\t");
-        $condIf .= "//" . $axc->getAdminItemButton("constant('CO_' . \$moduleDirNameUpper . '_EXPORT_SCHEMA')", '', '', $op = '__DIR__ . /../../testdata/index.php?op=exportschema', $type = 'samplebutton', $t = "\t");
+        $condIf .= "//".$axc->getAdminItemButton("constant('CO_' . \$moduleDirNameUpper . '_EXPORT_SCHEMA')", '', '', $op = '__DIR__ . /../../testdata/index.php?op=exportschema', $type = 'samplebutton', $t = "\t");
         $condIf .= $axc->getAdminDisplayButton('left', "\t");
-        $cond   = $xc->getXcGetConfig('displaySampleButton');
+        $cond = $xc->getXcGetConfig('displaySampleButton');
         $ret    .= $pc->getPhpCodeConditions($cond, '', '', $condIf, false);
         $ret    .= $xc->getXcXoopsTplAssign('index', '$adminObject->displayIndex()');
         $ret    .= $pc->getPhpCodeCommentLine('End Test Data');
@@ -160,7 +160,7 @@ 
         $moduleDirname = $module->getVar('mod_dirname');
         $filename      = $this->getFileName();
         $content       = $this->getHeaderFilesComments($module);
-        $content       .= $this->getAdminIndex($module);
+        $content .= $this->getAdminIndex($module);
 
         $this->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 

class/Files/Admin/AdminHeader.php

Spacing +4 added lines, -4 removed lines

@@ -114,13 +114,13 @@ 
         if (is_array($tables)) {
             foreach (array_keys($tables) as $i) {
                 $tableName = $tables[$i]->getVar('table_name');
-                $ret       .= $this->xc->getXcHandlerLine($tableName);
+                $ret .= $this->xc->getXcHandlerLine($tableName);
             }
         }
         $ret            .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()');
         $ret            .= $this->pc->getPhpCodeCommentLine();
-        $template       = $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/template', true, false, 'include', "\t");
-        $template       .= $this->xc->getXcEqualsOperator('$xoopsTpl', 'new \XoopsTpl()', null,"\t");
+        $template = $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/template', true, false, 'include', "\t");
+        $template       .= $this->xc->getXcEqualsOperator('$xoopsTpl', 'new \XoopsTpl()', null, "\t");
         $ret            .= $this->pc->getPhpCodeConditions('!isset($xoopsTpl)', ' || ', '!is_object($xoopsTpl)', $template, false);
         $ret            .= $this->pc->getPhpCodeBlankLine();
         $ret            .= $this->pc->getPhpCodeCommentLine('Load languages');
@@ -159,7 +159,7 @@ 
         $filename      = $this->getFileName();
         $moduleDirname = $module->getVar('mod_dirname');
         $content       = $this->getHeaderFilesComments($module);
-        $content       .= $this->getAdminHeader($moduleDirname);
+        $content .= $this->getAdminHeader($moduleDirname);
 
         $this->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 

class/Files/CreateHtmlCode.php

Indentation +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
             $ret = "{$t}<{$tag}{$attr}>{$n}";
         } elseif ($noClosed) {
             $ret = "{$t}<{$tag}{$attr} />{$n}";
-		} elseif ($multiLine) {
+        } elseif ($multiLine) {
             $ret = "{$t}<{$tag}{$attr}>{$n}";
             $ret .= "{$content}";
             $ret .= "{$t}</{$tag}>{$n}";
@@ -111,7 +111,7 @@ 
     /**
      * @public function getHtmlComment
      * @param string $htmlComment
-	 * @param string $n
+     * @param string $n
      * @return string
      */
     public function getHtmlComment($htmlComment = '', $n = '')
@@ -321,7 +321,7 @@ 
         return "{$t}<strong{$rStrongClass}>{$content}</strong>{$n}";
     }
 
-	/**
+    /**
      * @public function getHtmlAnchor
      * @param string $url
      * @param string $content
@@ -348,7 +348,7 @@ 
      * @param string $alt
      * @param string $imgClass
      * @param string $t
-	 * @param string $n
+     * @param string $n
      * @return string
      */
     public function getHtmlImage($src = 'blank.gif', $alt = 'blank.gif', $imgClass = '', $t = '', $n = '')

class/Files/CreateArchitecture.php

Spacing +61 added lines, -61 removed lines

@@ -81,12 +81,12 @@ 
             $table     = $helper->getHandler('Tables')->get($tableId);
         }
 
-        $indexFile       = XOOPS_UPLOAD_PATH . '/index.html';
+        $indexFile       = XOOPS_UPLOAD_PATH.'/index.html';
         $stlModuleAuthor = str_replace(' ', '', mb_strtolower($module->getVar('mod_author')));
         $this->setModuleName($module->getVar('mod_dirname'));
         $uploadPath = $this->getUploadPath();
         // Creation of "module" folder in the Directory repository
-        $this->makeDir($uploadPath . '/' . $this->getModuleName());
+        $this->makeDir($uploadPath.'/'.$this->getModuleName());
         if (1 != $module->getVar('mod_user')) {
             // Copied of index.html file in "root module" folder
             $this->copyFile('', $indexFile, 'index.html');
@@ -114,8 +114,8 @@ 
             'docs'                            => $indexFile,
             'assets/images'                   => $indexFile,
             'assets/js'                       => $indexFile,
-            'language/' . $language           => $indexFile,
-            'language/' . $language . '/help' => $indexFile,
+            'language/'.$language           => $indexFile,
+            'language/'.$language.'/help' => $indexFile,
             'preloads'                        => $indexFile,
         ];
         foreach ($copyFiles as $k => $v) {
@@ -125,26 +125,26 @@ 
         //Copy the logo of the module
         $modImage = str_replace(' ', '', mb_strtolower($module->getVar('mod_image')));
         $targetImage = 'logoModule.png';
-        $this->copyFile('assets/images', TDMC_UPLOAD_IMGMOD_PATH . '/' . $modImage, $targetImage);
+        $this->copyFile('assets/images', TDMC_UPLOAD_IMGMOD_PATH.'/'.$modImage, $targetImage);
 
         //Copy blank files
         $targetImage = 'blank.gif';
-        $this->copyFile('assets/images', TDMC_IMAGE_PATH . '/' . $targetImage, $targetImage);
+        $this->copyFile('assets/images', TDMC_IMAGE_PATH.'/'.$targetImage, $targetImage);
         $targetImage = 'blank.png';
-        $this->copyFile('assets/images', TDMC_IMAGE_PATH . '/' . $targetImage , $targetImage);
+        $this->copyFile('assets/images', TDMC_IMAGE_PATH.'/'.$targetImage, $targetImage);
 
         // Copy of 'module_author_logo.png' file in uploads dir
-        $logoPng     = $stlModuleAuthor . '_logo.png';
-        $logoGifFrom = TDMC_UPLOAD_IMGMOD_PATH . '/' . $logoPng;
+        $logoPng     = $stlModuleAuthor.'_logo.png';
+        $logoGifFrom = TDMC_UPLOAD_IMGMOD_PATH.'/'.$logoPng;
         // If file exists
         if (!file_exists($logoGifFrom)) {
             // Rename file
-            $copyFile    = TDMC_IMAGES_LOGOS_URL . '/xoopsdevelopmentteam_logo.gif';
+            $copyFile    = TDMC_IMAGES_LOGOS_URL.'/xoopsdevelopmentteam_logo.gif';
             $copyNewFile = $logoGifFrom;
             copy($copyFile, $copyNewFile);
         } else {
             // Copy file
-            $copyFile    = TDMC_IMAGES_LOGOS_URL . '/' . $logoPng;
+            $copyFile    = TDMC_IMAGES_LOGOS_URL.'/'.$logoPng;
             $copyNewFile = $logoGifFrom;
             copy($copyFile, $copyNewFile);
         }
@@ -160,7 +160,7 @@ 
         ];
         foreach ($docs as $k => $v) {
             // Creation of folder docs and .txt files
-            $this->makeDirAndCopyFile('docs', TDMC_DOCS_PATH . $k, $v);
+            $this->makeDirAndCopyFile('docs', TDMC_DOCS_PATH.$k, $v);
         }
         if (!empty($tableName)) {
             if (1 == $module->getVar('mod_admin') || 1 == $module->getVar('mod_user')) {
@@ -179,7 +179,7 @@ 
             $this->makeDirAndCopyFile('sql', $indexFile, 'index.html');
             if ((1 == $module->getVar('mod_notifications')) && (1 == $table->getVar('table_notifications'))) {
                 // Creation of "language/local_language/mail_template" folder and index.html file
-                $this->makeDirAndCopyFile('language/' . $language . '/mail_template', $indexFile, 'index.html');
+                $this->makeDirAndCopyFile('language/'.$language.'/mail_template', $indexFile, 'index.html');
             }
         }
     }
@@ -248,69 +248,69 @@ 
             // Get Table Object
             $table = $helper->getHandler('Tables')->get($tableId);
             // Copy of tables images file
-            if (file_exists($uploadTableImage = TDMC_UPLOAD_IMGTAB_PATH . '/' . $tableImage)) {
+            if (file_exists($uploadTableImage = TDMC_UPLOAD_IMGTAB_PATH.'/'.$tableImage)) {
                 $this->copyFile($icon32, $uploadTableImage, $tableImage);
-            } elseif (file_exists($uploadTableImage = XOOPS_ICONS32_PATH . '/' . $tableImage)) {
+            } elseif (file_exists($uploadTableImage = XOOPS_ICONS32_PATH.'/'.$tableImage)) {
                 $this->copyFile($icon32, $uploadTableImage, $tableImage);
             }
             // Creation of admin files
             if (1 === (int)$tables[$t]->getVar('table_admin')) {
                 // Admin Pages File
                 $adminPages = Tdmcreate\Files\Admin\AdminPages::getInstance();
-                $adminPages->write($module, $table, $tableName . '.php');
+                $adminPages->write($module, $table, $tableName.'.php');
                 $ret[] = $adminPages->render();
                 // Admin Templates File
                 $adminTemplatesPages = Tdmcreate\Files\Templates\Admin\TemplatesAdminPages::getInstance();
-                $adminTemplatesPages->write($module, $table, $moduleDirname . '_admin_' . $tableName . '.tpl');
+                $adminTemplatesPages->write($module, $table, $moduleDirname.'_admin_'.$tableName.'.tpl');
                 $ret[] = $adminTemplatesPages->render();
             }
             // Creation of blocks
             if (1 === (int)$tables[$t]->getVar('table_blocks')) {
                 // Blocks Files
                 $blocksFiles = Tdmcreate\Files\Blocks\BlocksFiles::getInstance();
-                $blocksFiles->write($module, $table, $tableName . '.php');
+                $blocksFiles->write($module, $table, $tableName.'.php');
                 $ret[] = $blocksFiles->render();
                 // Templates Blocks Files
                 $templatesBlocks = Tdmcreate\Files\Templates\Blocks\TemplatesBlocks::getInstance();
-                $templatesBlocks->write($module, $table, $moduleDirname . '_block_' . $tableName . '.tpl');
+                $templatesBlocks->write($module, $table, $moduleDirname.'_block_'.$tableName.'.tpl');
                 $ret[] = $templatesBlocks->render();
             }
             // Creation of classes
             if (1 === (int)$tables[$t]->getVar('table_admin') || 1 === (int)$tables[$t]->getVar('table_user')) {
                 // Class Files
                 $classFiles = Tdmcreate\Files\Classes\ClassFiles::getInstance();
-                $classFiles->write($module, $table, $tables, ucfirst($tableName) . '.php');
+                $classFiles->write($module, $table, $tables, ucfirst($tableName).'.php');
                 $ret[] = $classFiles->render();
             }
             // Creation of classhandlers
             if (1 === (int)$tables[$t]->getVar('table_admin') || 1 === (int)$tables[$t]->getVar('table_user')) {
                 // Class Files
                 $classFiles = Tdmcreate\Files\Classes\ClassHandlerFiles::getInstance();
-                $classFiles->write($module, $table, $tables, ucfirst($tableName) . 'handler.php');
+                $classFiles->write($module, $table, $tables, ucfirst($tableName).'handler.php');
                 $ret[] = $classFiles->render();
             }
             // Creation of user files
             if (1 === (int)$tables[$t]->getVar('table_user')) {
                 // User Pages File
                 $userPages = Tdmcreate\Files\User\UserPages::getInstance();
-                $userPages->write($module, $table, $tableName . '.php');
+                $userPages->write($module, $table, $tableName.'.php');
                 $ret[] = $userPages->render();
                 // User Templates File
                 $userTemplatesPages = Tdmcreate\Files\Templates\User\Pages::getInstance();
-                $userTemplatesPages->write($module, $table, $moduleDirname . '_' . $tableName . '.tpl');
+                $userTemplatesPages->write($module, $table, $moduleDirname.'_'.$tableName.'.tpl');
                 $ret[] = $userTemplatesPages->render();
                 // User List Templates File
                 $userTemplatesPagesList = Tdmcreate\Files\Templates\User\PagesList::getInstance();
-                $userTemplatesPagesList->write($module, $table, $tables, $moduleDirname . '_' . $tableName . '_list' . '.tpl');
+                $userTemplatesPagesList->write($module, $table, $tables, $moduleDirname.'_'.$tableName.'_list'.'.tpl');
                 $ret[] = $userTemplatesPagesList->render();
                 if (1 === (int)$tables[$t]->getVar('table_category')) {
                     // User List Templates File
                     $userTemplatesCategories = Templates\User\Categories::getInstance();
-                    $userTemplatesCategories->write($module, $table, $moduleDirname . '_' . $tableName . '_cat.tpl');
+                    $userTemplatesCategories->write($module, $table, $moduleDirname.'_'.$tableName.'_cat.tpl');
                     $ret[] = $userTemplatesCategories->render();
                     // User List Templates File
                     $userTemplatesCategoriesList = Templates\User\CategoriesList::getInstance();
-                    $userTemplatesCategoriesList->write($module, $table, $moduleDirname . '_' . $tableName . '_cat_list' . '.tpl');
+                    $userTemplatesCategoriesList->write($module, $table, $moduleDirname.'_'.$tableName.'_cat_list'.'.tpl');
                     $ret[] = $userTemplatesCategoriesList->render();
                 }
             }
@@ -318,7 +318,7 @@ 
 
         // Creation of constants
         $classSpecialFiles = Tdmcreate\Files\Classes\ClassSpecialFiles::getInstance();
-        $classSpecialFiles->write($module, '', $tables, ucfirst('constants') . '.php');
+        $classSpecialFiles->write($module, '', $tables, ucfirst('constants').'.php');
         $classSpecialFiles->className = 'Constants';
         $ret[] = $classSpecialFiles->renderConstants();
 
@@ -326,13 +326,13 @@ 
         if (in_array(1, $tablePermissions)) {
             // Creation of classes
             $classSpecialFiles = Tdmcreate\Files\Classes\ClassSpecialFiles::getInstance();
-            $classSpecialFiles->write($module, '', null, ucfirst('permissions') . '.php');
+            $classSpecialFiles->write($module, '', null, ucfirst('permissions').'.php');
             $classSpecialFiles->className = 'Permissions';
             $ret[] = $classSpecialFiles->renderClass();
 
             // Creation of classhandlers
             $classSpecialFiles = Tdmcreate\Files\Classes\ClassSpecialFiles::getInstance();
-            $classSpecialFiles->write($module, '', $permTables, ucfirst('permissionshandler') . '.php');
+            $classSpecialFiles->write($module, '', $permTables, ucfirst('permissionshandler').'.php');
             $classSpecialFiles->className = 'Permissionshandler';
             $ret[] = $classSpecialFiles->renderPermissionsHandler();
 
@@ -373,19 +373,19 @@ 
             $ret[] = $adminFooter->render();
             // Templates Admin About File
             $adminTemplatesAbout = Tdmcreate\Files\Templates\Admin\TemplatesAdminAbout::getInstance();
-            $adminTemplatesAbout->write($module, $moduleDirname . '_admin_about.tpl');
+            $adminTemplatesAbout->write($module, $moduleDirname.'_admin_about.tpl');
             $ret[] = $adminTemplatesAbout->render();
             // Templates Admin Index File
             $adminTemplatesIndex = Tdmcreate\Files\Templates\Admin\TemplatesAdminIndex::getInstance();
-            $adminTemplatesIndex->write($module, $moduleDirname . '_admin_index.tpl');
+            $adminTemplatesIndex->write($module, $moduleDirname.'_admin_index.tpl');
             $ret[] = $adminTemplatesIndex->render();
             // Templates Admin Footer File
             $adminTemplatesFooter = Tdmcreate\Files\Templates\Admin\TemplatesAdminFooter::getInstance();
-            $adminTemplatesFooter->write($module, $moduleDirname . '_admin_footer.tpl');
+            $adminTemplatesFooter->write($module, $moduleDirname.'_admin_footer.tpl');
             $ret[] = $adminTemplatesFooter->render();
             // Templates Admin Header File
             $adminTemplatesHeader = Tdmcreate\Files\Templates\Admin\TemplatesAdminHeader::getInstance();
-            $adminTemplatesHeader->write($module, $moduleDirname . '_admin_header.tpl');
+            $adminTemplatesHeader->write($module, $moduleDirname.'_admin_header.tpl');
             $ret[] = $adminTemplatesHeader->render();
             // Language Admin File
             $languageAdmin = Tdmcreate\Files\Language\LanguageAdmin::getInstance();
@@ -418,7 +418,7 @@ 
             $ret[] = $adminPermissions->render();
             // Templates Admin Permissions File
             $adminTemplatesPermissions = Tdmcreate\Files\Templates\Admin\TemplatesAdminPermissions::getInstance();
-            $adminTemplatesPermissions->write($module, $moduleDirname . '_admin_permissions.tpl');
+            $adminTemplatesPermissions->write($module, $moduleDirname.'_admin_permissions.tpl');
             $ret[] = $adminTemplatesPermissions->render();
         }
         // Creation of notifications files
@@ -489,15 +489,15 @@ 
             // Creation of user template files
             // Templates Index File
             $userTemplatesIndex = Tdmcreate\Files\Templates\User\Index::getInstance();
-            $userTemplatesIndex->write($module, $table, $tables, $moduleDirname . '_index.tpl');
+            $userTemplatesIndex->write($module, $table, $tables, $moduleDirname.'_index.tpl');
             $ret[] = $userTemplatesIndex->render();
             // Templates Footer File
             $userTemplatesFooter = Tdmcreate\Files\Templates\User\Footer::getInstance();
-            $userTemplatesFooter->write($module, $table, $moduleDirname . '_footer.tpl');
+            $userTemplatesFooter->write($module, $table, $moduleDirname.'_footer.tpl');
             $ret[] = $userTemplatesFooter->render();
             // Templates Header File
             $userTemplatesHeader = Tdmcreate\Files\Templates\User\Header::getInstance();
-            $userTemplatesHeader->write($module, $moduleDirname . '_header.tpl');
+            $userTemplatesHeader->write($module, $moduleDirname.'_header.tpl');
             $ret[] = $userTemplatesHeader->render();
 
             // Creation of user files
@@ -522,7 +522,7 @@ 
                 $ret[] = $userBroken->render();
                 // User Templates Broken File
                 $userTemplatesBroken = Templates\User\Broken::getInstance();
-                $userTemplatesBroken->write($module, $table, $moduleDirname . '_broken.tpl');
+                $userTemplatesBroken->write($module, $table, $moduleDirname.'_broken.tpl');
                 $ret[] = $userTemplatesBroken->render();
             }
             // User Pdf File
@@ -532,7 +532,7 @@ 
                 $ret[] = $userPdf->render();
                 // User Templates Pdf File
                 $userTemplatesPdf = Tdmcreate\Files\Templates\User\Pdf::getInstance();
-                $userTemplatesPdf->write($module, $moduleDirname . '_pdf.tpl');
+                $userTemplatesPdf->write($module, $moduleDirname.'_pdf.tpl');
                 $ret[] = $userTemplatesPdf->render();
             }
             // User Print File
@@ -542,7 +542,7 @@ 
                 $ret[] = $userPrint->render();
                 // User Templates Print File
                 $userTemplatesPrint = Tdmcreate\Files\Templates\User\UserPrint::getInstance();
-                $userTemplatesPrint->write($module, $table, $moduleDirname . '_print.tpl');
+                $userTemplatesPrint->write($module, $table, $moduleDirname.'_print.tpl');
                 $ret[] = $userTemplatesPrint->render();
             }
             // User Rate File
@@ -553,7 +553,7 @@ 
                 $ret[] = $userRate->render();
                 // User Templates Rate File
                 $userTemplatesRate = Tdmcreate\Files\Templates\User\Rate::getInstance();
-                $userTemplatesRate->write($module, $table, $moduleDirname . '_rate.tpl');
+                $userTemplatesRate->write($module, $table, $moduleDirname.'_rate.tpl');
                 $ret[] = $userTemplatesRate->render();
             }
 
@@ -564,7 +564,7 @@ 
                 $ret[] = $userRss->render();
                 // User Templates Rss File
                 $userTemplatesRss = Tdmcreate\Files\Templates\User\Rss::getInstance();
-                $userTemplatesRss->write($module, $moduleDirname . '_rss.tpl');
+                $userTemplatesRss->write($module, $moduleDirname.'_rss.tpl');
                 $ret[] = $userTemplatesRss->render();
             }
             // User Single File
@@ -574,7 +574,7 @@ 
                 $ret[] = $userSingle->render();
                 // User Templates Single File
                 $userTemplatesSingle = Tdmcreate\Files\Templates\User\Single::getInstance();
-                $userTemplatesSingle->write($module, $table, $moduleDirname . '_single.tpl');
+                $userTemplatesSingle->write($module, $table, $moduleDirname.'_single.tpl');
                 $ret[] = $userTemplatesSingle->render();
             }
 
@@ -585,7 +585,7 @@ 
                 $ret[] = $userSubmit->render();
                 // User Templates Submit File
                 $userTemplatesSubmit = Tdmcreate\Files\Templates\User\Submit::getInstance();
-                $userTemplatesSubmit->write($module, $table, $moduleDirname . '_submit.tpl');
+                $userTemplatesSubmit->write($module, $table, $moduleDirname.'_submit.tpl');
                 $ret[] = $userTemplatesSubmit->render();
             }
             // User Visit File
@@ -614,7 +614,7 @@ 
             $ret[] = $languageMain->render();
             // User Templates Submit File
             $userTemplatesUserBreadcrumbs = Templates\User\Breadcrumbs::getInstance();
-            $userTemplatesUserBreadcrumbs->write($module, $moduleDirname . '_breadcrumbs.tpl');
+            $userTemplatesUserBreadcrumbs->write($module, $moduleDirname.'_breadcrumbs.tpl');
             $ret[] = $userTemplatesUserBreadcrumbs->render();
         }
         // Css Admin Styles File
@@ -665,7 +665,7 @@ 
         $moduleName = $module->getVar('mod_dirname');
         //$src_path   = XOOPS_ROOT_PATH . '/modules/tdmcreate/files';
         //$tmp_path   = XOOPS_UPLOAD_PATH . '/tdmcreate/temp';
-        $upl_path   = TDMC_UPLOAD_REPOSITORY_PATH . '/' . mb_strtolower($moduleName);
+        $upl_path   = TDMC_UPLOAD_REPOSITORY_PATH.'/'.mb_strtolower($moduleName);
 
         $patterns = [
             mb_strtolower('tdmcreate')          => mb_strtolower($moduleName),
@@ -678,7 +678,7 @@ 
 
         /* clone complete missing folders */
         $cloneFolders[] = [
-            'src'   => TDMC_PATH . '/commonfiles',
+            'src'   => TDMC_PATH.'/commonfiles',
             'dst'   => $upl_path,
             'rcode' => true
         ];
@@ -688,10 +688,10 @@ 
         unset($cloneFolders);
 
         /* create missing folders for common files */
-        $createFolders[] = $upl_path . '/testdata/' . $GLOBALS['xoopsConfig']['language'];
+        $createFolders[] = $upl_path.'/testdata/'.$GLOBALS['xoopsConfig']['language'];
         if ('english' !== $GLOBALS['xoopsConfig']['language']) {
-            $createFolders[] = $upl_path . '/testdata/english';
-            $createFolders[] = $upl_path . '/language/english';
+            $createFolders[] = $upl_path.'/testdata/english';
+            $createFolders[] = $upl_path.'/language/english';
         }
         foreach ($createFolders as $folder) {
             @mkdir($folder);
@@ -700,14 +700,14 @@ 
 
         if ('english' !== $GLOBALS['xoopsConfig']['language']) {
             $cloneFolders[] = [
-                'src'   => TDMC_PATH . '/commonfiles/language/english',
-                'dst'   => $upl_path . '/language/' . $GLOBALS['xoopsConfig']['language'],
+                'src'   => TDMC_PATH.'/commonfiles/language/english',
+                'dst'   => $upl_path.'/language/'.$GLOBALS['xoopsConfig']['language'],
                 'rcode' => true
             ];
             //copy back all language files to english language folder
             $cloneFolders[] = [
-                'src'   => $upl_path . '/language/' . $GLOBALS['xoopsConfig']['language'],
-                'dst'   => $upl_path . '/language/english',
+                'src'   => $upl_path.'/language/'.$GLOBALS['xoopsConfig']['language'],
+                'dst'   => $upl_path.'/language/english',
                 'rcode' => false
             ];
             foreach ($cloneFolders as $folder) {
@@ -718,25 +718,25 @@ 
 
         /* clone single missing files*/
         $cloneFiles[] = [
-            'src'   => TDMC_PATH . '/config/',
-            'dst'   => $upl_path . '/config/',
+            'src'   => TDMC_PATH.'/config/',
+            'dst'   => $upl_path.'/config/',
             'file'  => 'admin.yml',
             'rcode' => true
         ];
         $cloneFiles[] = [
-            'src'   => TDMC_PATH . '/config/',
-            'dst'   => $upl_path . '/config/',
+            'src'   => TDMC_PATH.'/config/',
+            'dst'   => $upl_path.'/config/',
             'file'  => 'icons.php',
             'rcode' => true
         ];
         $cloneFiles[] = [
-            'src'   => TDMC_PATH . '/config/',
-            'dst'   => $upl_path . '/config/',
+            'src'   => TDMC_PATH.'/config/',
+            'dst'   => $upl_path.'/config/',
             'file'  => 'paths.php',
             'rcode' => true
         ];
         foreach ($cloneFiles as $file) {
-            Tdmcreate\Files\CreateClone::cloneFile($file['src'] . $file['file'], $file['dst'] . $file['file'], $file['rcode'], $patKeys, $patValues);
+            Tdmcreate\Files\CreateClone::cloneFile($file['src'].$file['file'], $file['dst'].$file['file'], $file['rcode'], $patKeys, $patValues);
         }
         unset($cloneFiles);
     }

class/Files/Config/ConfigConfig.php

Spacing +7 added lines, -7 removed lines

@@ -94,17 +94,17 @@ 
         $ret    .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t");
         foreach (array_keys($tables) as $t) {
             $tableName = $tables[$t]->getVar('table_name');
-            $ret       .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/{$tableName}',", "\t\t");
+            $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/{$tableName}',", "\t\t");
         }
-        $ret    .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t");
+        $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t");
         foreach (array_keys($tables) as $t) {
             $tableName = $tables[$t]->getVar('table_name');
-            $ret       .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t");
+            $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t");
         }
-        $ret    .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files',", "\t\t");
+        $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files',", "\t\t");
         foreach (array_keys($tables) as $t) {
             $tableName = $tables[$t]->getVar('table_name');
-            $ret       .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files/{$tableName}',", "\t\t");
+            $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files/{$tableName}',", "\t\t");
         }
         $ret    .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/temp',", "\t\t");
         $ret    .= $this->getSimpleString("],", "\t");
@@ -112,7 +112,7 @@ 
         $ret    .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t");
         foreach (array_keys($tables) as $t) {
             $tableName = $tables[$t]->getVar('table_name');
-            $ret       .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t");
+            $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t");
         }
         $ret    .= $this->getSimpleString("],", "\t");
         $ret    .= $this->getSimpleString("'copyTestFolders'  => [", "\t");
@@ -147,7 +147,7 @@ 
         $moduleDirname = $module->getVar('mod_dirname');
         $filename      = $this->getFileName();
         $content       = $this->getHeaderFilesComments($module);
-        $content       .= $this->getConfigCode();
+        $content .= $this->getConfigCode();
         $this->create($moduleDirname, 'config', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 
         return $this->renderFile();

class/Files/Classes/ClassHandlerFiles.php

Spacing +21 added lines, -21 removed lines

@@ -175,15 +175,15 @@ 
         $pc           = Tdmcreate\Files\CreatePhpCode::getInstance();
         $xc           = Tdmcreate\Files\CreateXoopsCode::getInstance();
         $ucfTableName = ucfirst($tableName);
-        $ret          = $pc->getPhpCodeCommentMultiLine(['Get Count ' . $ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
+        $ret          = $pc->getPhpCodeCommentMultiLine(['Get Count '.$ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
 
-        $critCount  = $xc->getXcCriteriaCompo('crCount' . $ucfTableName, "\t\t");
+        $critCount  = $xc->getXcCriteriaCompo('crCount'.$ucfTableName, "\t\t");
         $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crCount{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
-        $critCount  .= $xc->getXcEqualsOperator('$crCount' . $ucfTableName, $paramsCrit, null, "\t\t");
+        $critCount  .= $xc->getXcEqualsOperator('$crCount'.$ucfTableName, $paramsCrit, null, "\t\t");
         $critCount  .= $this->getSimpleString("return parent::getCount(\$crCount{$ucfTableName});", "\t\t");
         $params     = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
 
-        $ret .= $pc->getPhpCodeFunction('getCount' . $ucfTableName, $params, $critCount, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getCount'.$ucfTableName, $params, $critCount, 'public ', false, "\t");
 
         return $ret;
     }
@@ -202,15 +202,15 @@ 
         $pc           = Tdmcreate\Files\CreatePhpCode::getInstance();
         $xc           = Tdmcreate\Files\CreateXoopsCode::getInstance();
         $ucfTableName = ucfirst($tableName);
-        $ret          = $pc->getPhpCodeCommentMultiLine(['Get All ' . $ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t");
+        $ret          = $pc->getPhpCodeCommentMultiLine(['Get All '.$ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t");
 
-        $critAll    = $xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t");
+        $critAll    = $xc->getXcCriteriaCompo('crAll'.$ucfTableName, "\t\t");
         $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
-        $critAll    .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCrit, null, "\t\t");
+        $critAll    .= $xc->getXcEqualsOperator('$crAll'.$ucfTableName, $paramsCrit, null, "\t\t");
         $critAll    .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t");
         $params     = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
 
-        $ret .= $pc->getPhpCodeFunction('getAll' . $ucfTableName, $params, $critAll, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getAll'.$ucfTableName, $params, $critAll, 'public ', false, "\t");
 
         return $ret;
     }
@@ -246,19 +246,19 @@ 
         $param2  = "\$GLOBALS['xoopsUser']->getGroups()";
         $param3  = "\$GLOBALS['xoopsModule']->getVar('mid')";
         $critAll .= $xc->getXcGetItemIds($lcfTopicTableName, 'grouppermHandler', $param1, $param2, $param3, "\t\t");
-        $critAll .= $xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t");
+        $critAll .= $xc->getXcCriteriaCompo('crAll'.$ucfTableName, "\t\t");
 
         if (false !== mb_strpos($fieldName, 'status')) {
-            $crit    = $xc->getXcCriteria('', "'{$fieldName}'", '0', "'!='", true);
-            $critAll .= $xc->getXcCriteriaAdd('crAll' . $ucfTableName, $crit, "\t\t");
+            $crit = $xc->getXcCriteria('', "'{$fieldName}'", '0', "'!='", true);
+            $critAll .= $xc->getXcCriteriaAdd('crAll'.$ucfTableName, $crit, "\t\t");
         }
         $paramsCritAll = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
-        $critAll       .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCritAll, null, "\t\t");
+        $critAll .= $xc->getXcEqualsOperator('$crAll'.$ucfTableName, $paramsCritAll, null, "\t\t");
 
         $critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t");
-        $params  = "\${$tableFieldName}Id, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
+        $params = "\${$tableFieldName}Id, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
 
-        $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id" . $ucfTableName, $params, $critAll, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id".$ucfTableName, $params, $critAll, 'public ', false, "\t");
 
         return $ret;
     }
@@ -272,16 +272,16 @@ 
     private function getClassCriteria($tableName)
     {
         $pc           = Tdmcreate\Files\CreatePhpCode::getInstance();
-		$xc           = Tdmcreate\Files\CreateXoopsCode::getInstance();
+		$xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
         $ucfTableName = ucfirst($tableName);
-        $ret          = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria ' . $ucfTableName, '@param       ' => "\$cr{$ucfTableName}", '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
+        $ret          = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria '.$ucfTableName, '@param       ' => "\$cr{$ucfTableName}", '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
 
         $paramsAllCriteria = "\$cr{$ucfTableName}, \$start, \$limit, \$sort, \$order";
 
-        $critSets = $xc->getXcCriteriaSetStart('cr' . $ucfTableName, '$start', "\t\t");
-        $critSets .= $xc->getXcCriteriaSetLimit('cr' . $ucfTableName, '$limit', "\t\t");
-        $critSets .= $xc->getXcCriteriaSetSort('cr' . $ucfTableName, '$sort', "\t\t");
-        $critSets .= $xc->getXcCriteriaSetOrder('cr' . $ucfTableName, '$order', "\t\t");
+        $critSets = $xc->getXcCriteriaSetStart('cr'.$ucfTableName, '$start', "\t\t");
+        $critSets .= $xc->getXcCriteriaSetLimit('cr'.$ucfTableName, '$limit', "\t\t");
+        $critSets .= $xc->getXcCriteriaSetSort('cr'.$ucfTableName, '$sort', "\t\t");
+        $critSets .= $xc->getXcCriteriaSetOrder('cr'.$ucfTableName, '$order', "\t\t");
         $critSets .= $this->getSimpleString("return \$cr{$ucfTableName};", "\t\t");
 
         $ret .= $pc->getPhpCodeFunction("get{$ucfTableName}Criteria", $paramsAllCriteria, $critSets, 'private ', false, "\t");
@@ -305,7 +305,7 @@ 
         $ucfTableSoleName = ucfirst($tableSoleName);
         $ccTableSoleName  = $this->getCamelCase($tableSoleName, true);
 
-        $ret              = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName . ' from id', '' => '', '@return' => 'string'], "\t");
+        $ret              = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName.' from id', '' => '', '@return' => 'string'], "\t");
         $soleName         = $xc->getXcEqualsOperator("\${$tableSoleName}Id", "(int)( \${$tableSoleName}Id )", null, "\t\t");
         $soleName         .= $xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, "\t\t");
         $contentIf        = $xc->getXcHandlerLine($tableName, "\t\t\t");

class/Files/Includes/IncludeCommon.php

Spacing +5 added lines, -5 removed lines

@@ -100,9 +100,9 @@ 
         $moduleAuthorImage       = str_replace(' ', '', mb_strtolower($moduleAuthor));
 
         $contIf = $pc->getPhpCodeDefine('XOOPS_ICONS32_PATH', "XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'", "\t");
-        $ret    = $pc->getPhpCodeConditions("!defined('XOOPS_ICONS32_PATH')", '','', $contIf, false);
+        $ret    = $pc->getPhpCodeConditions("!defined('XOOPS_ICONS32_PATH')", '', '', $contIf, false);
         $contIf = $pc->getPhpCodeDefine('XOOPS_ICONS32_URL', "XOOPS_URL . '/Frameworks/moduleclasses/icons/32'", "\t");
-        $ret    .= $pc->getPhpCodeConditions("!defined('XOOPS_ICONS32_URL')", '','', $contIf, false);
+        $ret    .= $pc->getPhpCodeConditions("!defined('XOOPS_ICONS32_URL')", '', '', $contIf, false);
         $ret    .= $this->getCommonDefines($moduleDirname, 'DIRNAME', "'{$moduleDirname}'");
         $ret    .= $this->getCommonDefines($moduleDirname, 'PATH', "XOOPS_ROOT_PATH.'/modules/'.{$stuModuleDirname}_DIRNAME");
         $ret    .= $this->getCommonDefines($moduleDirname, 'URL', "XOOPS_URL.'/modules/'.{$stuModuleDirname}_DIRNAME");
@@ -130,8 +130,8 @@ 
 
         $img     = $hc->getHtmlImage('".$localLogo."', $moduleAuthorWebsiteName);
         $anchor  = $hc->getHtmlAnchor($moduleAuthorWebsiteUrl, $img, $moduleAuthorWebsiteName, '_blank', '', '', '', "\n");
-        $replace = $xc->getXcEqualsOperator('$copyright', '"' . $anchor . '"');
-        $ret     .= str_replace("\n", '', $replace) . PHP_EOL;
+        $replace = $xc->getXcEqualsOperator('$copyright', '"'.$anchor.'"');
+        $ret     .= str_replace("\n", '', $replace).PHP_EOL;
         $ret     .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/xoopsrequest', true);
         $ret     .= $pc->getPhpCodeIncludeDir("{$stuModuleDirname}_PATH", 'class/helper', true);
         $ret     .= $pc->getPhpCodeIncludeDir("{$stuModuleDirname}_PATH", 'include/functions', true);
@@ -150,7 +150,7 @@ 
         $moduleDirname = $module->getVar('mod_dirname');
         $filename      = $this->getFileName();
         $content       = $this->getHeaderFilesComments($module);
-        $content       .= $this->getCommonCode($module);
+        $content .= $this->getCommonCode($module);
         $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 
         return $this->renderFile();