Skip to content

Commit 3cbd87f

Browse files
mambax7mambax7
authored
Merge pull request #9 from mambax7/master
Alpha 4
2 parents 0cad66a + 4ed9159 commit 3cbd87f

File tree

504 files changed

+801
-30631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

504 files changed

+801
-30631
lines changed

‎class/Files/Classes/ClassFormElements.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ private function getXoopsFormUploadImage($language, $moduleDirname, $tableName,
407407
$formHidden = $cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, $t, true);
408408
$contElse = $cxc->getClassAddElement('imageTray', $formHidden, $t . "\t");
409409
$ret .= $pc->getPhpCodeConditions('$permissionUpload', null, null, $contIf, $contElse, "\t\t");
410-
$ret .= $cxc->getClassAddElement('form', "\$imageTray, {$required}", $t);
410+
$ret .= $cxc->getClassAddElement('form', "\$imageTray {$required}", $t);
411411

412412
return $ret;
413413
}
@@ -501,7 +501,7 @@ private function getXoopsFormSelectBox($language, $tableName, $fieldName, $requi
501501
$ucfTableName = ucfirst($tableName);
502502
$ccFieldName = $tf->getCamelCase($fieldName, false, true);
503503
$t = "\t\t";
504-
$ret = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t);
504+
$ret = $pc->getPhpCodeCommentLine($ucfTableName, 'Handler', $t);
505505
$ret .= $xc->getXcHandlerLine($tableName, $t);
506506
$ret .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t);
507507
$ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
@@ -764,7 +764,7 @@ private function getXoopsFormSelectCombo($language, $moduleDirname, $tableName,
764764
$ccFieldName = $tf->getCamelCase($fieldName, false, true);
765765
$languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_';
766766
$t = "\t\t";
767-
$ret = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t);
767+
$ret = $pc->getPhpCodeCommentLine($ucfTableName, 'Handler', $t);
768768
$ret .= $xc->getXcHandlerLine($tableName, $t);
769769
$ret .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t);
770770
$ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", '5', '', false, $t);
@@ -908,7 +908,7 @@ public function renderElements()
908908
}
909909
$rpFieldName = $tf->getRightString($fieldName);
910910
$language = $languageFunct . mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName);
911-
$required = (1 == $fields[$f]->getVar('field_required')) ? ', true' : '';
911+
$required = (1 == $fields[$f]->getVar('field_required')) ? ', true' : ' ';
912912

913913
$fieldElements = $tc->getHandler('Fieldelements')->get($fieldElement);
914914
$fieldElementId[] = $fieldElements->getVar('fieldelement_id');

‎class/Files/CreateArchitecture.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function setBaseFoldersFiles($module)
123123
$this->makeDirAndCopyFile($k, $v, 'index.html');
124124
}
125125
//Copy the logo of the module
126-
$modImage = str_replace(' ', '', mb_strtolower($module->getVar('mod_image')));
126+
$modImage = str_replace(' ', '', $module->getVar('mod_image'));
127127
$targetImage = 'logoModule.png';
128128
$this->copyFile('assets/images', TDMC_UPLOAD_IMGMOD_PATH . '/' . $modImage, $targetImage);
129129

@@ -291,7 +291,7 @@ public function setFilesToBuilding($module)
291291
if (1 === (int)$tables[$t]->getVar('table_admin') || 1 === (int)$tables[$t]->getVar('table_user')) {
292292
// Class Files
293293
$classFiles = Modulebuilder\Files\Classes\ClassHandlerFiles::getInstance();
294-
$classFiles->write($module, $table, $tables, ucfirst($tableName) . 'handler.php');
294+
$classFiles->write($module, $table, $tables, ucfirst($tableName) . 'Handler.php');
295295
$ret[] = $classFiles->render();
296296
}
297297
// Creation of user files
@@ -318,11 +318,11 @@ public function setFilesToBuilding($module)
318318
$ret[] = $userTemplatesPagesList->render();
319319
if (1 === (int)$tables[$t]->getVar('table_category')) {
320320
// User List Templates File
321-
$userTemplatesCategories = Templates\User\Categories::getInstance();
321+
$userTemplatesCategories = Templates\User\Defstyle\Categories::getInstance();
322322
$userTemplatesCategories->write($module, $table, $moduleDirname . '_' . $tableName . '_cat.tpl');
323323
$ret[] = $userTemplatesCategories->render();
324324
// User List Templates File
325-
$userTemplatesCategoriesList = Templates\User\CategoriesList::getInstance();
325+
$userTemplatesCategoriesList = Templates\User\Defstyle\CategoriesList::getInstance();
326326
$userTemplatesCategoriesList->write($module, $table, $moduleDirname . '_' . $tableName . '_cat_list' . '.tpl');
327327
$ret[] = $userTemplatesCategoriesList->render();
328328
}
@@ -345,8 +345,8 @@ public function setFilesToBuilding($module)
345345

346346
// Creation of classhandlers
347347
$classSpecialFiles = Modulebuilder\Files\Classes\ClassSpecialFiles::getInstance();
348-
$classSpecialFiles->write($module, '', $permTables, ucfirst('permissionshandler') . '.php');
349-
$classSpecialFiles->className = 'Permissionshandler';
348+
$classSpecialFiles->write($module, '', $permTables, ucfirst('PermissionsHandler') . '.php');
349+
$classSpecialFiles->className = 'PermissionsHandler';
350350
$ret[] = $classSpecialFiles->renderPermissionsHandler();
351351

352352
}

‎class/Files/Includes/IncludeCommon.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private function getCommonCode($module)
133133
$replace = $xc->getXcEqualsOperator('$copyright', '"' . $anchor . '"');
134134
$ret .= str_replace("\n", '', $replace) . PHP_EOL;
135135
$ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/xoopsrequest', true);
136-
$ret .= $pc->getPhpCodeIncludeDir("{$stuModuleDirname}_PATH", 'class/helper', true);
136+
// $ret .= $pc->getPhpCodeIncludeDir("{$stuModuleDirname}_PATH", 'class/helper', true);
137137
$ret .= $pc->getPhpCodeIncludeDir("{$stuModuleDirname}_PATH", 'include/functions', true);
138138

139139
return $ret;

‎class/Helper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function getHandler($name)
7878
$db = \XoopsDatabaseFactory::getDatabaseConnection();
7979
$helper = self::getInstance();
8080
$ret = new $class($db, $helper);
81-
$this->addLog("Getting handler '{$name}'");
81+
$this->addLog("Getting Handler '{$name}'");
8282

8383
return $ret;
8484
}

‎class/helper0.php‎

Lines changed: 0 additions & 229 deletions
This file was deleted.

‎docs/changelog.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
<h5>3.03 Alpha 4 [2020-05-11]</h5> Dev: XOOPS 2.5.11, PHP 7.4.5
2+
<hr>
3+
- missing folder name (mamba)
4+
- changed date integer to 11 (mamba)
5+
- fix removed extra comma in generated FormUploadImage code (mamba)
6+
- added schema (mamba)
7+
- renamed "handler" to "Handler" in generated code (heyula/mamba)
8+
- removed call to include Helper.php file (mamba)
9+
- fix copying logo file (mamba)
10+
11+
112
<h5>3.03 Alpha 3 [WORK IN PROGRESS - NOT RELEASED]</h5> Dev: XOOPS 2.5.11, PHP 7.4.5
213
<hr>
314
- fix class names to case-sensitive (heyula/mamba)

0 commit comments

Comments
 (0)