txmodxoops / tdmcreate

class/files/templates/blocks/TemplatesBlocks.php

Spacing +22 added lines, -22 removed lines

@@ -81,11 +81,11 @@ 
             $fieldName    = $fields[$f]->getVar('field_name');
             $stuFieldName = 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;
     }
 
     /**
@@ -105,7 +105,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) {
@@ -123,7 +123,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;*/
@@ -132,18 +132,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;
                 }
@@ -153,19 +153,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;
     }
 
     /**
@@ -175,10 +175,10 @@ 
     private function getTemplatesBlocksTableTfoot()
     {
         $hc = TDMCreateHtmlSmartyCodes::getInstance();
-        $td = $hc->getHtmlTag('td', [], '&nbsp;') . PHP_EOL;
-        $tr = $hc->getHtmlTag('tr', [], $td) . PHP_EOL;
+        $td = $hc->getHtmlTag('td', [], '&nbsp;').PHP_EOL;
+        $tr = $hc->getHtmlTag('tr', [], $td).PHP_EOL;
 
-        return $hc->getHtmlTag('tfoot', [], $tr) . PHP_EOL;
+        return $hc->getHtmlTag('tfoot', [], $tr).PHP_EOL;
     }
 
     /**
@@ -200,7 +200,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/user/UserXoopsVersion.php

Spacing +5 added lines, -5 removed lines

@@ -480,10 +480,10 @@ 
 					break;
 				}
 			}
-			if (1 == $table->getVar('table_permissions')) { $table_permissions = 1;}
-			if (1 == $table->getVar('table_admin')) { $table_admin = 1;}
-			if (1 == $table->getVar('table_user')) { $table_user = 1;}
-			if (1 == $table->getVar('table_tag')) { $table_tag = 1;}
+			if (1 == $table->getVar('table_permissions')) { $table_permissions = 1; }
+			if (1 == $table->getVar('table_admin')) { $table_admin = 1; }
+			if (1 == $table->getVar('table_user')) { $table_user = 1; }
+			if (1 == $table->getVar('table_tag')) { $table_tag = 1; }
 		}
 
         if (1 === $table_permissions) {
@@ -522,7 +522,7 @@ 
         $ret .= $this->getSimpleString('++$c;');
         unset($this->keywords);
 
-        if ( 1 === $field_images) {
+        if (1 === $field_images) {
             $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Uploads : maxsize of image');
             $maxsize = [
                 'name'     => "'maxsize'", 'title' => "'{$language}MAXSIZE'", 'description' => "'{$language}MAXSIZE_DESC'",

class/files/classes/ClassFormElements.php

Spacing +11 added lines, -11 removed lines

@@ -228,7 +228,7 @@ 
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files '.$ucfFieldName, $t);
         $ret .= $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
         $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
         $ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/Frameworks/moduleclasses/icons/32'", null, false, $t);
@@ -276,7 +276,7 @@ 
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files ' . $ucfFieldName, "\t\t");
+        $ret = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files '.$ucfFieldName, "\t\t");
         $contentIf = $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
         $contentIf .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
         $contentIf .= $xc->getXcEqualsOperator('$uploadDirectory', "'/uploads/{$moduleDirname}/images/shots'", null, false, $t);
@@ -327,7 +327,7 @@ 
         $cc = ClassXoopsCode::getInstance();
 		$ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Url', 'Text File ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Url', 'Text File '.$ucfFieldName, $t);
         $ret .= $cc->getClassXoopsFormElementTray('formUrlFile', '_OPTIONS', '<br><br>', $t);
         $ret .= $pc->getPhpCodeTernaryOperator('formUrl', '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", $t);
         $ret .= $cc->getClassXoopsFormText('formText', $language, $fieldName, 75, 255, 'formUrl', false, $t);
@@ -362,7 +362,7 @@ 
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Upload', 'Image ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Upload', 'Image '.$ucfFieldName, $t);
         $ret .= $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
         $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
         $ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/uploads/{$moduleDirname}/images/{$tableName}'", null, false, $t);
@@ -378,7 +378,7 @@ 
         $paramLabel = "\"<br><img src='\".XOOPS_URL.\"/\".\$imageDirectory.\"/\".\${$ccFieldName}.\"' name='image1' id='image1' alt='' style='max-width:100px' />\"";
         $xoopsFormLabel = $cc->getClassXoopsFormLabel('', "''", $paramLabel, true, '');
         $ret .= $cc->getClassAddElement('imageTray', $xoopsFormLabel, $t);
-        $ret .= $pc->getPhpCodeCommentLine('Form', 'File ' . $ucfFieldName, $t);
+        $ret .= $pc->getPhpCodeCommentLine('Form', 'File '.$ucfFieldName, $t);
         $ret .= $cc->getClassXoopsFormElementTray('fileSelectTray', "''", '<br>', $t);
         $getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
         $xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'FORM_UPLOAD_IMAGE_'.$stuTableName, 'attachedfile', $getConfig, true, '');
@@ -411,7 +411,7 @@ 
 		$ucfFieldName = $tf->getCamelCase($fieldName, true);
         $stuTableName = strtoupper($tableName);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form', 'File ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form', 'File '.$ucfFieldName, $t);
         $getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
         $xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'_'.$stuTableName, $fieldName, $getConfig, true, '');
         $ret .= $cc->getClassAddElement('form', $xoopsFormFile, $t);
@@ -437,7 +437,7 @@ 
         $cc = ClassXoopsCode::getInstance();
 		$ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Color', 'Picker ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Color', 'Picker '.$ucfFieldName, $t);
         $getVar = $xc->getXcGetVar('', 'this', $fieldName, true);
         $xoopsFormFile = $cc->getClassXoopsFormColorPicker('', $language, $fieldName, $getVar, true, '');
         $ret .= $cc->getClassAddElement('form', $xoopsFormFile, $t);
@@ -467,7 +467,7 @@ 
         $t = "\t\t";
         $ret = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t);
         $ret .= $xc->getXoopsHandlerLine($moduleDirname, $tableName, $t);
-        $ret .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ucfTableName, $t);
+        $ret .= $pc->getPhpCodeCommentLine('Form', 'Select '.$ucfTableName, $t);
         $ret .= $cc->getClassXoopsFormSelect($ccFieldName.'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
         $ret .= $cc->getClassAddOption($ccFieldName.'Select', "'Empty'", $t);
         $ret .= $cc->getClassAddOptionArray($ccFieldName.'Select', "\${$tableName}Handler->getList()", $t);
@@ -493,7 +493,7 @@ 
         $cc = ClassXoopsCode::getInstance();
 		$ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Select', 'User ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Select', 'User '.$ucfFieldName, $t);
         $getConfig = $xc->getXcGetConfig($moduleDirname, 'maxsize');
         $xoopsSelectUser = $cc->getClassXoopsFormSelectUser('', $language, $fieldName, 'false', $fieldName, true, $t);
         $ret .= $cc->getClassAddElement('form', $xoopsSelectUser.$required, $t);
@@ -518,7 +518,7 @@ 
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
 		$ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t = "\t\t";
-        $ret = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No '.$ucfFieldName, $t);
         $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
         $xoopsRadioYN = $cc->getClassXoopsFormRadioYN('', $language, $fieldName, $ccFieldName, true, $t);
         $ret .= $cc->getClassAddElement('form', $xoopsRadioYN.$required, $t);
@@ -543,7 +543,7 @@ 
         $t = "\t\t";
         $ccFieldName = $tf->getCamelCase($fieldName, false, true);
 		$ucfFieldName = $tf->getCamelCase($fieldName, true);
-        $ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ucfFieldName, $t);
+        $ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select '.$ucfFieldName, $t);
         $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
         $xoopsTextDateSelect = $cc->getClassXoopsFormTextDateSelect('', $language, $fieldName, $fieldName, $ccFieldName, true, $t);
         $ret .= $cc->getClassAddElement('form', $xoopsTextDateSelect.$required, $t);