Skip to content

Commit b7c25b9

Browse files
ggoffyggoffy
committed
transfered code: broken from brocken.php to the userpage / submit from submit.php to the userpage (goffy)
1 parent c2d2e03 commit b7c25b9

18 files changed

Lines changed: 476 additions & 175 deletions

File tree

class/Files/User/UserBroken.php renamed to _archive/class/Files/User/UserBroken.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ public function getUserBrokenSave($moduleDirname, $fields, $tableName, $tableSol
162162

163163
$condElse = $pc->getPhpCodeCommentLine('Insert Data', null, $t . "\t");
164164
$insert = $xc->getXcHandlerInsert($tableName, $tableName, 'Obj');
165-
$redirctHeader = $xc->getXcRedirectHeader('index', '', '2', "{$language}FORM_OK", true, $t . "\t\t");
166-
$condElse .= $pc->getPhpCodeConditions($insert, '', '', $redirctHeader, false, $t . "\t");
165+
$redirectHeader = $xc->getXcRedirectHeader('index', '', '2', "{$language}FORM_OK", true, $t . "\t\t");
166+
$condElse .= $pc->getPhpCodeConditions($insert, '', '', $redirectHeader, false, $t . "\t");
167167
$assigne = $xc->getXcXoopsTplAssign('error_message', '$errorMessage', true, $t . "\t");
168168
$ret .= $pc->getPhpCodeConditions('$error', ' === ', 'true', $assigne, $condElse, $t);
169169

class/Files/User/UserSubmit.php renamed to _archive/class/Files/User/UserSubmit.php

File renamed without changes.

‎class/Files/Classes/ClassFormElements.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,7 @@ private function getXoopsFormSelectStatus($language, $moduleDirname, $fieldName,
630630
$ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_OFFLINE, {$languageShort}STATUS_OFFLINE", $t);
631631
$ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_SUBMITTED, {$languageShort}STATUS_SUBMITTED", $t);
632632
$ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_APPROVED, {$languageShort}STATUS_APPROVED", $t);
633+
$ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_BROKEN, {$languageShort}STATUS_BROKEN", $t);
633634
$ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t);
634635

635636
return $ret;

‎class/Files/Classes/ClassSpecialFiles.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ public function renderConstants()
242242
$contentClass .= $pc->getPhpCodeConstant("STATUS_OFFLINE ", 1, "\t");
243243
$contentClass .= $pc->getPhpCodeConstant("STATUS_SUBMITTED", 2, "\t");
244244
$contentClass .= $pc->getPhpCodeConstant("STATUS_APPROVED ", 3, "\t");
245+
$contentClass .= $pc->getPhpCodeConstant("STATUS_BROKEN ", 4, "\t");
246+
245247

246248
if (in_array(1, $tablePermissions)) {
247249
$constPerm = $pc->getPhpCodeBlankLine();

‎class/Files/CreateArchitecture.php‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -540,20 +540,6 @@ public function setFilesToBuilding($module)
540540
$userNotificationUpdate->write($module, 'notification_update.php');
541541
$ret[] = $userNotificationUpdate->render();
542542
}
543-
// User Broken File
544-
if (in_array(1, $tableBroken)) {
545-
$userBroken = Tdmcreate\Files\User\UserBroken::getInstance();
546-
$userBroken->write($module, $table, 'broken.php');
547-
$ret[] = $userBroken->render();
548-
// User Templates Broken File
549-
if ($templateType == 'bootstrap') {
550-
$userTemplatesBroken = Tdmcreate\Files\Templates\User\Bootstrap\Broken::getInstance();
551-
} else {
552-
$userTemplatesBroken = Tdmcreate\Files\Templates\User\Defstyle\Broken::getInstance();
553-
}
554-
$userTemplatesBroken->write($module, $table, $moduleDirname . '_broken.tpl');
555-
$ret[] = $userTemplatesBroken->render();
556-
}
557543
// User Pdf File
558544
if (in_array(1, $tablePdf)) {
559545
$userPdf = Tdmcreate\Files\User\UserPdf::getInstance();
@@ -626,21 +612,6 @@ public function setFilesToBuilding($module)
626612
$userTemplatesSingle->write($module, $table, $moduleDirname . '_single.tpl');
627613
$ret[] = $userTemplatesSingle->render();
628614
}
629-
630-
// User Submit File
631-
if (in_array(1, $tableSubmit)) {
632-
$userSubmit = Tdmcreate\Files\User\UserSubmit::getInstance();
633-
$userSubmit->write($module, $table, 'submit.php');
634-
$ret[] = $userSubmit->render();
635-
// User Templates Submit File
636-
if ($templateType == 'bootstrap') {
637-
$userTemplatesSubmit = Tdmcreate\Files\Templates\User\Bootstrap\Submit::getInstance();
638-
} else {
639-
$userTemplatesSubmit = Tdmcreate\Files\Templates\User\Defstyle\Submit::getInstance();
640-
}
641-
$userTemplatesSubmit->write($module, $table, $moduleDirname . '_submit.tpl');
642-
$ret[] = $userTemplatesSubmit->render();
643-
}
644615
// User Visit File
645616
if (in_array(1, $tableVisit)) {
646617
$userVisit = Tdmcreate\Files\User\UserVisit::getInstance();

‎class/Files/CreateXoopsCode.php‎

Lines changed: 84 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,13 @@ public function getXcSetVarObj($tableName, $fieldName, $var, $t = '')
111111

112112
/**
113113
* @public function getXcGetVar
114-
* @param $varLeft
115-
* @param $handle
116-
* @param $var
117-
* @param $isParam
118-
* @param $t
114+
* @param string $varLeft
115+
* @param string $handle
116+
* @param string $var
117+
* @param bool $isParam
118+
* @param string $t
119119
*
120+
* @param string $format
120121
* @return string
121122
*/
122123
public function getXcGetVar($varLeft = '', $handle = '', $var = '', $isParam = false, $t = '', $format = '')
@@ -1674,4 +1675,82 @@ public function getXcXoopsHandler($left, $t = '', $n = "\n")
16741675
{
16751676
return "{$t}\${$left}Handler = xoops_getHandler('{$left}');{$n}";
16761677
}
1678+
1679+
1680+
/*************************************************************/
1681+
/** common components for user and admin pages */
1682+
/*************************************************************/
1683+
1684+
/**
1685+
* @public function getXcCommonPagesEdit
1686+
* @param $tableName
1687+
* @param $ccFieldId
1688+
* @param string $t
1689+
* @return string
1690+
*/
1691+
public function getXcCommonPagesEdit($tableName, $ccFieldId, $t = '')
1692+
{
1693+
$pc = Tdmcreate\Files\CreatePhpCode::getInstance();
1694+
$xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
1695+
1696+
$ret = $pc->getPhpCodeCommentLine('Get Form', null, "\t\t");
1697+
$ret .= $xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t);
1698+
$ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
1699+
$ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
1700+
1701+
return $ret;
1702+
}
1703+
1704+
/**
1705+
* @public function getXcCommonPagesNew
1706+
* @param $tableName
1707+
* @param string $t
1708+
* @return string
1709+
*/
1710+
public function getXcCommonPagesNew($tableName, $t = '')
1711+
{
1712+
$pc = Tdmcreate\Files\CreatePhpCode::getInstance();
1713+
$xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
1714+
1715+
$ret = $pc->getPhpCodeCommentLine('Form Create', null, $t);
1716+
$ret .= $xc->getXcHandlerCreateObj($tableName, $t);
1717+
$ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
1718+
$ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
1719+
1720+
return $ret;
1721+
}
1722+
1723+
/**
1724+
* @public function getXcCommonPagesDelete
1725+
* @param $language
1726+
* @param $tableName
1727+
* @param $fieldId
1728+
* @param $fieldMain
1729+
* @param string $t
1730+
* @return string
1731+
*/
1732+
public function getXcCommonPagesDelete($language, $tableName, $fieldId, $fieldMain, $t = '')
1733+
{
1734+
$pc = Tdmcreate\Files\CreatePhpCode::getInstance();
1735+
$xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
1736+
$cf = Tdmcreate\Files\CreateFile::getInstance();
1737+
$ccFieldId = $cf->getCamelCase($fieldId, false, true);
1738+
$ret = $xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', '', $t);
1739+
$reqOk = "_REQUEST['ok']";
1740+
$isset = $pc->getPhpCodeIsset($reqOk);
1741+
$xoopsSecurityCheck = $xc->getXcXoopsSecurityCheck();
1742+
$xoopsSecurityErrors = $xc->getXcXoopsSecurityErrors();
1743+
$implode = $pc->getPhpCodeImplode(', ', $xoopsSecurityErrors);
1744+
$redirectHeaderErrors = $xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t\t");
1745+
$delete = $xc->getXcHandlerDelete($tableName, $tableName, 'Obj', 'Handler');
1746+
$condition = $pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectHeaderErrors, false, $t . "\t");
1747+
$redirectHeaderLanguage = $xc->getXcRedirectHeader($tableName, '', '3', "{$language}FORM_DELETE_OK", true, $t . "\t\t");
1748+
$htmlErrors = $xc->getXcHtmlErrors($tableName, true);
1749+
$internalElse = $xc->getXcXoopsTplAssign('error', $htmlErrors, true, $t . "\t\t");
1750+
$condition .= $pc->getPhpCodeConditions($delete, '', '', $redirectHeaderLanguage, $internalElse, $t . "\t");
1751+
$mainElse = $xc->getXcXoopsConfirm($tableName, $language, $fieldId, $fieldMain, 'delete', $t . "\t");
1752+
$ret .= $pc->getPhpCodeConditions($isset, ' && ', "1 == \${$reqOk}", $condition, $mainElse, $t);
1753+
1754+
return $ret;
1755+
}
16771756
}

‎class/Files/Language/LanguageAdmin.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ public function getLanguageAdminClass($language, $tables)
238238
$ret .= $this->defines->getDefine($language, 'STATUS_OFFLINE', 'Offline');
239239
$ret .= $this->defines->getDefine($language, 'STATUS_SUBMITTED', 'Submitted');
240240
$ret .= $this->defines->getDefine($language, 'STATUS_APPROVED', 'Approved');
241+
$ret .= $this->defines->getDefine($language, 'STATUS_BROKEN', 'Broken');
241242
}
242243
if ($fieldSampleListValue > 0) {
243244
$ret .= $this->defines->getAboveDefines('Sample List Values');

‎class/Files/Language/LanguageMain.php‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,13 @@ private function getLanguageMain($module, $language)
8585
{
8686
/** @var \XoopsModules\Tdmcreate\Utility $utility */
8787
$utility = new \XoopsModules\Tdmcreate\Utility();
88+
$pc = Tdmcreate\Files\CreatePhpCode::getInstance();
8889

8990
$moduleName = $module->getVar('mod_name');
9091
$tables = $this->getTables();
9192
$ret = $this->defines->getBlankLine();
93+
$ret .= $pc->getPhpCodeIncludeDir('__DIR__', 'admin', true);
94+
$ret .= $this->defines->getBlankLine();
9295
$ret .= $this->defines->getAboveHeadDefines('Main');
9396
$ret .= $this->defines->getDefine($language, 'INDEX', 'Home');
9497
$ret .= $this->defines->getDefine($language, 'TITLE', (string)$module->getVar('mod_name'));
@@ -107,9 +110,13 @@ private function getLanguageMain($module, $language)
107110
$ucfTableSoleName = '';
108111
$stuTableSoleName = '';
109112
$tableSoleName = '';
113+
$tableSubmit = 0;
110114
foreach (array_keys($tables) as $i) {
111115
$tableName = $tables[$i]->getVar('table_name');
112116
$tableSoleName = $tables[$i]->getVar('table_solename');
117+
if (1 === (int)$tables[$i]->getVar('table_submit')) {
118+
$tableSubmit = 1;
119+
}
113120
$stuTableName = mb_strtoupper($tableName);
114121
$stuTableSoleName = mb_strtoupper($tableSoleName);
115122
$ucfTableName = $utility::UcFirstAndToLower($tableName);
@@ -140,11 +147,14 @@ private function getLanguageMain($module, $language)
140147
$ret .= $this->defines->getDefine($language, 'SUBMIT_RECEIVED', "We have received your {$tableSoleName} info. Thank you !");
141148
$ret .= $this->defines->getDefine($language, 'SUBMIT_SUBMITONCE', "Submit your {$tableSoleName}/script only once.");
142149
$ret .= $this->defines->getDefine($language, 'SUBMIT_TAKEDAYS', "This will take many days to see your {$tableSoleName}/script added successfully in our database.");
143-
$ret .= $this->defines->getAboveDefines('Form');
144-
$ret .= $this->defines->getDefine($language, 'FORM_OK', 'Successfully saved');
145-
$ret .= $this->defines->getDefine($language, 'FORM_DELETE_OK', 'Successfully deleted');
146-
$ret .= $this->defines->getDefine($language, 'FORM_SURE_DELETE', "Are you sure to delete: <b><span style='color : Red;'>%s </span></b>", true);
147-
$ret .= $this->defines->getDefine($language, 'FORM_SURE_RENEW', "Are you sure to update: <b><span style='color : Red;'>%s </span></b>", true);
150+
if (1 == $tableSubmit) {
151+
$ret .= $this->defines->getAboveDefines('Form');
152+
$ret .= $this->defines->getDefine($language, 'FORM_OK', 'Successfully saved');
153+
$ret .= $this->defines->getDefine($language, 'FORM_DELETE_OK', 'Successfully deleted');
154+
$ret .= $this->defines->getDefine($language, 'FORM_SURE_DELETE', "Are you sure to delete: <b><span style='color : Red;'>%s </span></b>", true);
155+
$ret .= $this->defines->getDefine($language, 'FORM_SURE_RENEW', "Are you sure to update: <b><span style='color : Red;'>%s </span></b>", true);
156+
$ret .= $this->defines->getDefine($language, 'INVALID_PARAM', "Invalid parameter", true);
157+
}
148158
return $ret;
149159
}
150160

‎class/Files/Language/LanguageModinfo.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,18 @@ private function getLanguageSubmenu($language, $tables)
162162
$tableSearch = [];
163163
foreach (array_keys($tables) as $t) {
164164
$tableName = $tables[$t]->getVar('table_name');
165-
$tableSubmit[] = $tables[$t]->getVar('table_submit');
166165
$tableSearch[] = $tables[$t]->getVar('table_search');
167-
$desc = ucfirst(mb_strtolower($tableName));
166+
$ucfTablename = ucfirst(mb_strtolower($tableName));
168167
if (1 == $tables[$t]->getVar('table_submenu')) {
169-
$ret .= $df->getDefine($language, "SMNAME{$i}", $desc);
168+
$ret .= $df->getDefine($language, "SMNAME{$i}", $ucfTablename);
170169
}
171170
++$i;
171+
if (1 == $tables[$t]->getVar('table_submit')) {
172+
$ret .= $df->getDefine($language, "SMNAME{$i}", 'Submit ' . $ucfTablename);
173+
++$i;
174+
}
172175
}
173-
if (in_array(1, $tableSubmit)) {
174-
$ret .= $df->getDefine($language, "SMNAME{$i}", 'Submit');
175-
++$i;
176-
}
176+
177177
if (in_array(1, $tableSearch)) {
178178
$ret .= $df->getDefine($language, "SMNAME{$i}", 'Search');
179179
}

‎class/Files/Templates/User/Defstyle/Pages.php‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,38 @@ private function getTemplatesUserPages($moduleDirname, $tableName, $tableSoleNam
174174
return $sc->getSmartyConditions($tableName . 'Count', ' > ', '0', $div, false, false, true);
175175
}
176176

177+
/**
178+
* @private function getTemplatesUserPagesForm
179+
* @param $moduleDirname
180+
* @param $tableName
181+
* @param $tableSoleName
182+
* @param $language
183+
* @return string
184+
*/
185+
private function getTemplatesUserPagesForm($t = '')
186+
{
187+
$sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
188+
$var = $sc->getSmartySingleVar('form', "\t", "\n");
189+
190+
return $sc->getSmartyConditions('form', '', '', $var, false, false, true);
191+
}
192+
193+
/**
194+
* @private function getTemplatesUserPagesError
195+
* @param $moduleDirname
196+
* @param $tableName
197+
* @param $tableSoleName
198+
* @param $language
199+
* @return string
200+
*/
201+
private function getTemplatesUserPagesError($t = '')
202+
{
203+
$sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
204+
$var = $sc->getSmartySingleVar('error', "\t", "\n");
205+
206+
return $sc->getSmartyConditions('error', '', '', $var, false, false, true);
207+
}
208+
177209
/**
178210
* @private function getTemplatesUserPagesFooter
179211
* @param string $moduleDirname
@@ -207,6 +239,8 @@ public function render()
207239
$language = $this->getLanguage($moduleDirname, 'MA');
208240
$content = $this->getTemplatesUserPagesHeader($moduleDirname);
209241
$content .= $this->getTemplatesUserPages($moduleDirname, $tableName, $tableSoleName, $language);
242+
$content .= $this->getTemplatesUserPagesForm();
243+
$content .= $this->getTemplatesUserPagesError();
210244
$content .= $this->getTemplatesUserPagesFooter($moduleDirname);
211245

212246
$this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);

0 commit comments

Comments
 (0)