Skip to content

Commit f93982d

Browse files
committed
- splitted contend of index file and page file
- removed old testdata
1 parent c2ab0aa commit f93982d

506 files changed

Lines changed: 524 additions & 29653 deletions

File tree

Some content is hidden

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

admin/fields.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@
154154
$fieldsObj->setVar('field_inlist', (1 == $_REQUEST['field_inlist'][$key]) ? 1 : 0);
155155
$fieldsObj->setVar('field_inform', (1 == $_REQUEST['field_inform'][$key]) ? 1 : 0);
156156
$fieldsObj->setVar('field_user', (1 == $_REQUEST['field_user'][$key]) ? 1 : 0);
157+
$fieldsObj->setVar('field_ihead', (1 == $_REQUEST['field_ihead'][$key]) ? 1 : 0);
158+
$fieldsObj->setVar('field_ibody', (1 == $_REQUEST['field_ibody'][$key]) ? 1 : 0);
159+
$fieldsObj->setVar('field_ifoot', (1 == $_REQUEST['field_ifoot'][$key]) ? 1 : 0);
157160
$fieldsObj->setVar('field_thead', (1 == $_REQUEST['field_thead'][$key]) ? 1 : 0);
158161
$fieldsObj->setVar('field_tbody', (1 == $_REQUEST['field_tbody'][$key]) ? 1 : 0);
159162
$fieldsObj->setVar('field_tfoot', (1 == $_REQUEST['field_tfoot'][$key]) ? 1 : 0);

class/Fields.php

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ public function __construct()
5656
$this->initVar('field_inlist', XOBJ_DTYPE_INT);
5757
$this->initVar('field_inform', XOBJ_DTYPE_INT);
5858
$this->initVar('field_user', XOBJ_DTYPE_INT);
59+
$this->initVar('field_ihead', XOBJ_DTYPE_INT);
60+
$this->initVar('field_ibody', XOBJ_DTYPE_INT);
61+
$this->initVar('field_ifoot', XOBJ_DTYPE_INT);
5962
$this->initVar('field_thead', XOBJ_DTYPE_INT);
6063
$this->initVar('field_tbody', XOBJ_DTYPE_INT);
6164
$this->initVar('field_tfoot', XOBJ_DTYPE_INT);
@@ -272,6 +275,21 @@ private function getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fName,
272275
$checkFieldUser->addOption(1, _AM_MODULEBUILDER_FIELD_USER);
273276
$parametersTray->addElement($checkFieldUser);
274277

278+
$field_ihead = 0;
279+
$checkFieldIhead = new \XoopsFormCheckBox(' ', 'field_ihead[' . $i . ']', $field_ihead);
280+
$checkFieldIhead->addOption(1, _AM_MODULEBUILDER_FIELD_IHEAD);
281+
$parametersTray->addElement($checkFieldIhead);
282+
283+
$field_ibody = 0;
284+
$checkFieldIbody = new \XoopsFormCheckBox(' ', 'field_ibody[' . $i . ']', $field_ibody);
285+
$checkFieldIbody->addOption(1, _AM_MODULEBUILDER_FIELD_IBODY);
286+
$parametersTray->addElement($checkFieldIbody);
287+
288+
$field_ifoot = 0;
289+
$checkFieldIfoot = new \XoopsFormCheckBox(' ', 'field_ifoot[' . $i . ']', $field_ifoot);
290+
$checkFieldIfoot->addOption(1, _AM_MODULEBUILDER_FIELD_IFOOT);
291+
$parametersTray->addElement($checkFieldIfoot);
292+
275293
$field_thead = 0;
276294
$checkFieldThead = new \XoopsFormCheckBox(' ', 'field_thead[' . $i . ']', $field_thead);
277295
$checkFieldThead->addOption(1, _AM_MODULEBUILDER_FIELD_THEAD);
@@ -429,6 +447,18 @@ public function getFormEdit($fieldMid = null, $fieldTid = null, $action = false)
429447
$checkFieldUser->addOption(1, _AM_MODULEBUILDER_FIELD_USER);
430448
$parametersTray->addElement($checkFieldUser);
431449

450+
$checkFieldIhead = new \XoopsFormCheckBox(' ', 'field_ihead[' . $id . ']', $field->getVar('field_ihead'));
451+
$checkFieldIhead->addOption(1, _AM_MODULEBUILDER_FIELD_IHEAD);
452+
$parametersTray->addElement($checkFieldIhead);
453+
454+
$checkFieldIbody = new \XoopsFormCheckBox(' ', 'field_ibody[' . $id . ']', $field->getVar('field_ibody'));
455+
$checkFieldIbody->addOption(1, _AM_MODULEBUILDER_FIELD_IBODY);
456+
$parametersTray->addElement($checkFieldIbody);
457+
458+
$checkFieldIfoot = new \XoopsFormCheckBox(' ', 'field_ifoot[' . $id . ']', $field->getVar('field_ifoot'));
459+
$checkFieldIfoot->addOption(1, _AM_MODULEBUILDER_FIELD_IFOOT);
460+
$parametersTray->addElement($checkFieldIfoot);
461+
432462
$checkFieldThead = new \XoopsFormCheckBox(' ', 'field_thead[' . $id . ']', $field->getVar('field_thead'));
433463
$checkFieldThead->addOption(1, _AM_MODULEBUILDER_FIELD_THEAD);
434464
$parametersTray->addElement($checkFieldThead);

class/Files/Classes/ClassSpecialFiles.php

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,24 +227,29 @@ public function renderConstants()
227227
$filename = $this->getFileName();
228228
$tables = $this->getTables();
229229
$tablePermissions = [];
230+
231+
$moduleDirname = $module->getVar('mod_dirname');
232+
$namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]);
233+
$contentFile = $this->getHeaderFilesComments($module, null, $namespace);
234+
$contentFile .= $pc->getPhpCodeDefined();
235+
$contentFile .= $pc->getPhpCodeCommentMultiLine(['Class ' => $this->className]);
236+
237+
$contentClass = $pc->getPhpCodeBlankLine();
238+
$contentClass .= $pc->getPhpCodeCommentLine('Constants for tables', '', "\t");
230239
foreach (array_keys($tables) as $t) {
231240
$tablePermissions[] = $tables[$t]->getVar('table_permissions');
241+
$stuTableName = mb_strtoupper($tables[$t]->getVar('table_name'));
242+
$contentClass .= $pc->getPhpCodeConstant("TABLE_" . $stuTableName, $t, "\t");
232243
}
233-
$moduleDirname = $module->getVar('mod_dirname');
234-
$namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]);
235-
$contentFile = $this->getHeaderFilesComments($module, null, $namespace);
236-
$contentFile .= $pc->getPhpCodeDefined();
237-
$contentFile .= $pc->getPhpCodeCommentMultiLine(['Class ' => $this->className]);
238244

239-
$contentClass = $pc->getPhpCodeBlankLine();
245+
$contentClass .= $pc->getPhpCodeBlankLine();
240246
$contentClass .= $pc->getPhpCodeCommentLine('Constants for status', '', "\t");
241247
$contentClass .= $pc->getPhpCodeConstant("STATUS_NONE ", 0, "\t");
242248
$contentClass .= $pc->getPhpCodeConstant("STATUS_OFFLINE ", 1, "\t");
243249
$contentClass .= $pc->getPhpCodeConstant("STATUS_SUBMITTED", 2, "\t");
244250
$contentClass .= $pc->getPhpCodeConstant("STATUS_APPROVED ", 3, "\t");
245251
$contentClass .= $pc->getPhpCodeConstant("STATUS_BROKEN ", 4, "\t");
246252

247-
248253
if (in_array(1, $tablePermissions)) {
249254
$constPerm = $pc->getPhpCodeBlankLine();
250255
$constPerm .= $pc->getPhpCodeCommentLine('Constants for permissions', '', "\t");
@@ -254,8 +259,8 @@ public function renderConstants()
254259
$constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_APPROVE", 3, "\t");
255260
$contentClass .= $constPerm;
256261
}
257-
$contentClass .= $pc->getPhpCodeBlankLine();
258-
$contentFile .= $pc->getPhpCodeClass($this->className, $contentClass);
262+
$contentClass .= $pc->getPhpCodeBlankLine();
263+
$contentFile .= $pc->getPhpCodeClass($this->className, $contentClass);
259264

260265
$this->create($moduleDirname, 'class', $filename, $contentFile, _AM_MODULEBUILDER_FILE_CREATED, _AM_MODULEBUILDER_FILE_NOTCREATED);
261266

class/Files/CreateArchitecture.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,14 @@ public function setFilesToBuilding($module)
316316
}
317317
$userTemplatesPagesList->write($module, $table, $tables, $moduleDirname . '_' . $tableName . '_list' . '.tpl');
318318
$ret[] = $userTemplatesPagesList->render();
319+
// User Item Templates File
320+
if ($templateType == 'bootstrap') {
321+
$userTemplatesPagesItem = Modulebuilder\Files\Templates\User\Bootstrap\PagesItem::getInstance();
322+
} else {
323+
$userTemplatesPagesItem = Modulebuilder\Files\Templates\User\Defstyle\PagesItem::getInstance();
324+
}
325+
$userTemplatesPagesItem->write($module, $table, $tables, $moduleDirname . '_' . $tableName . '_item' . '.tpl');
326+
$ret[] = $userTemplatesPagesItem->render();
319327
if (1 === (int)$tables[$t]->getVar('table_category')) {
320328
// User List Templates File
321329
$userTemplatesCategories = Templates\User\Categories::getInstance();

class/Files/CreatePhpCode.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,9 @@ public function getPhpCodeCaseSwitch($cases = [], $defaultAfterCase = false, $de
459459
$def = "{$t}default:\n";
460460
foreach ($cases as $case => $value) {
461461
$case = is_string($case) ? "'{$case}'" : $case;
462-
if (!empty($case)) {
462+
if (empty($value)) {
463+
$ret .= "{$t}case {$case}:\n";
464+
} else if (!empty($case)) {
463465
$ret .= "{$t}case {$case}:\n";
464466
if (false !== $defaultAfterCase) {
465467
$ret .= $def;
@@ -470,8 +472,8 @@ public function getPhpCodeCaseSwitch($cases = [], $defaultAfterCase = false, $de
470472
}
471473
}
472474
$ret .= "{$t}break;\n";
475+
$defaultAfterCase = false;
473476
}
474-
$defaultAfterCase = false;
475477
}
476478
if (false !== $default) {
477479
$ret .= $def;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ private function getTemplatesUserPagesTableTbody($moduleDirname, $tableName, $ta
131131
$hc = Modulebuilder\Files\CreateHtmlCode::getInstance();
132132
$sc = Modulebuilder\Files\CreateSmartyCode::getInstance();
133133
$single = $sc->getSmartySingleVar('panel_type');
134-
$include = $sc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName, "\t\t\t\t\t\t", "\n");
134+
//$include = $sc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName, "\t\t\t\t\t\t", "\n");
135+
$include = $sc->getSmartyIncludeFile($moduleDirname, $tableName . '_item', false,false, "\t\t\t\t\t\t", "\n");
135136
$div = $hc->getHtmlDiv($include, 'panel panel-' . $single, "\t\t\t\t\t", "\n");
136137
$cont = $hc->getHtmlTableData($div, '', '', "\t\t\t\t", "\n", true);
137138
$html = $hc->getHtmlEmpty('</tr><tr>', "\t\t\t\t\t", "\n");
Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
<?php
2+
3+
namespace XoopsModules\Modulebuilder\Files\Templates\User\Defstyle;
4+
5+
use XoopsModules\Modulebuilder;
6+
use XoopsModules\Modulebuilder\Files;
7+
8+
/*
9+
You may not change or alter any portion of this comment or credits
10+
of supporting developers from this source code or any supporting source code
11+
which is considered copyrighted (c) material of the original comment or credit authors.
12+
13+
This program is distributed in the hope that it will be useful,
14+
but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
16+
*/
17+
/**
18+
* modulebuilder module.
19+
*
20+
* @copyright XOOPS Project (https://xoops.org)
21+
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
22+
*
23+
* @since 2.5.0
24+
*
25+
* @author Txmod Xoops http://www.txmodxoops.org
26+
*
27+
*/
28+
29+
/**
30+
* class PagesItem.
31+
*/
32+
class PagesItem extends Files\CreateFile
33+
{
34+
/**
35+
* @public function constructor
36+
* @param null
37+
*/
38+
public function __construct()
39+
{
40+
parent::__construct();
41+
}
42+
43+
/**
44+
* @static function getInstance
45+
* @param null
46+
* @return PagesItem
47+
*/
48+
public static function getInstance()
49+
{
50+
static $instance = false;
51+
if (!$instance) {
52+
$instance = new self();
53+
}
54+
55+
return $instance;
56+
}
57+
58+
/**
59+
* @public function write
60+
* @param string $module
61+
* @param string $table
62+
* @param string $filename
63+
* @param $tables
64+
*/
65+
public function write($module, $table, $tables, $filename)
66+
{
67+
$this->setModule($module);
68+
$this->setTable($table);
69+
$this->setTables($tables);
70+
$this->setFileName($filename);
71+
}
72+
73+
/**
74+
* @private function getTemplatesUserPagesItemPanel
75+
* @param string $moduleDirname
76+
* @param $tableId
77+
* @param $tableMid
78+
* @param $tableName
79+
* @param $tableSoleName
80+
* @param $language
81+
* @return string
82+
*/
83+
private function getTemplatesUserPagesItemPanel($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $language)
84+
{
85+
$hc = Modulebuilder\Files\CreateHtmlCode::getInstance();
86+
$sc = Modulebuilder\Files\CreateSmartyCode::getInstance();
87+
$fields = $this->getTableFields($tableMid, $tableId);
88+
$ret = '';
89+
$retNumb = '';
90+
foreach (array_keys($fields) as $f) {
91+
$fieldElement = $fields[$f]->getVar('field_element');
92+
if (1 == $fields[$f]->getVar('field_user')) {
93+
if (1 == $fields[$f]->getVar('field_thead')) {
94+
switch ($fieldElement) {
95+
default:
96+
//case 2:
97+
$fieldName = $fields[$f]->getVar('field_name');
98+
$rpFieldName = $this->getRightString($fieldName);
99+
$doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
100+
$retNumb .= $hc->getHtmlHNumb($doubleVar, '3', 'panel-title', "\t");
101+
break;
102+
}
103+
}
104+
}
105+
}
106+
$ret .= $hc->getHtmlDiv($retNumb, 'panel-heading');
107+
$retElem = '';
108+
foreach (array_keys($fields) as $f) {
109+
$fieldElement = $fields[$f]->getVar('field_element');
110+
if (1 == $fields[$f]->getVar('field_user')) {
111+
if (1 == $fields[$f]->getVar('field_tbody')) {
112+
switch ($fieldElement) {
113+
default:
114+
//case 3:
115+
//case 4:
116+
$fieldName = $fields[$f]->getVar('field_name');
117+
$rpFieldName = $this->getRightString($fieldName);
118+
$doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
119+
$retElem .= $hc->getHtmlSpan($doubleVar, 'col-sm-9 justify', "\t");
120+
break;
121+
case 10:
122+
$fieldName = $fields[$f]->getVar('field_name');
123+
$rpFieldName = $this->getRightString($fieldName);
124+
$singleVar = $sc->getSmartySingleVar('xoops_icons32_url');
125+
$doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
126+
$img = $hc->getHtmlImage($singleVar . '/' . $doubleVar, (string)$tableName);
127+
$retElem .= $hc->getHtmlSpan($img, 'col-sm-3', "\t");
128+
unset($img);
129+
break;
130+
case 13:
131+
$fieldName = $fields[$f]->getVar('field_name');
132+
$rpFieldName = $this->getRightString($fieldName);
133+
$singleVar = $sc->getSmartySingleVar($moduleDirname . '_upload_url');
134+
$doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
135+
$img = $hc->getHtmlImage($singleVar . "/images/{$tableName}/" . $doubleVar, (string)$tableName);
136+
$retElem .= $hc->getHtmlSpan($img, 'col-sm-3',"\t");
137+
unset($img);
138+
break;
139+
}
140+
}
141+
}
142+
}
143+
$ret .= $hc->getHtmlDiv($retElem, 'panel-body');
144+
$retFoot = '';
145+
foreach (array_keys($fields) as $f) {
146+
if (1 == $fields[$f]->getVar('field_user')) {
147+
if (1 == $fields[$f]->getVar('field_tfoot')) {
148+
$fieldName = $fields[$f]->getVar('field_name');
149+
$rpFieldName = $this->getRightString($fieldName);
150+
$langConst = mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName);
151+
$lang = $sc->getSmartyConst($language, $langConst);
152+
$doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
153+
$retFoot .= $hc->getHtmlSpan($lang . ': ' . $doubleVar, 'block-pie justify',"\t");
154+
}
155+
}
156+
}
157+
$ret .= $hc->getHtmlDiv($retFoot, 'panel-foot');
158+
159+
return $ret;
160+
}
161+
162+
/**
163+
* @public function render
164+
* @param null
165+
* @return bool|string
166+
*/
167+
public function render()
168+
{
169+
$module = $this->getModule();
170+
$table = $this->getTable();
171+
//$tables = $this->getTables();
172+
//$tables = $this->getTableTables($module->getVar('mod_id'), 'table_order');
173+
$moduleDirname = $module->getVar('mod_dirname');
174+
$filename = $this->getFileName();
175+
$language = $this->getLanguage($moduleDirname, 'MA');
176+
$content = '';
177+
$tableId = $table->getVar('table_id');
178+
$tableMid = $table->getVar('table_mid');
179+
$tableName = $table->getVar('table_name');
180+
$tableSoleName = $table->getVar('table_solename');
181+
$tableCategory[] = $table->getVar('table_category');
182+
//$tableIndex = $table->getVar('table_index');
183+
if (in_array(0, $tableCategory)) {
184+
$content .= $this->getTemplatesUserPagesItemPanel($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $language);
185+
}
186+
187+
$this->create($moduleDirname, 'templates', $filename, $content, _AM_MODULEBUILDER_FILE_CREATED, _AM_MODULEBUILDER_FILE_NOTCREATED);
188+
189+
return $this->renderFile();
190+
}
191+
}

class/Files/Templates/User/Defstyle/PagesList.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private function getTemplatesUserPagesListPanel($moduleDirname, $tableId, $table
9090
foreach (array_keys($fields) as $f) {
9191
$fieldElement = $fields[$f]->getVar('field_element');
9292
if (1 == $fields[$f]->getVar('field_user')) {
93-
if (1 == $fields[$f]->getVar('field_thead')) {
93+
if (1 == $fields[$f]->getVar('field_ihead')) {
9494
switch ($fieldElement) {
9595
default:
9696
//case 2:
@@ -108,7 +108,7 @@ private function getTemplatesUserPagesListPanel($moduleDirname, $tableId, $table
108108
foreach (array_keys($fields) as $f) {
109109
$fieldElement = $fields[$f]->getVar('field_element');
110110
if (1 == $fields[$f]->getVar('field_user')) {
111-
if (1 == $fields[$f]->getVar('field_tbody')) {
111+
if (1 == $fields[$f]->getVar('field_ibody')) {
112112
switch ($fieldElement) {
113113
default:
114114
//case 3:
@@ -144,7 +144,7 @@ private function getTemplatesUserPagesListPanel($moduleDirname, $tableId, $table
144144
$retFoot = '';
145145
foreach (array_keys($fields) as $f) {
146146
if (1 == $fields[$f]->getVar('field_user')) {
147-
if (1 == $fields[$f]->getVar('field_tfoot')) {
147+
if (1 == $fields[$f]->getVar('field_ifoot')) {
148148
$fieldName = $fields[$f]->getVar('field_name');
149149
$rpFieldName = $this->getRightString($fieldName);
150150
$langConst = mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName);

class/Files/User/UserPages.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ private function getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableN
416416
$xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
417417

418418
$fields = $this->getTableFields($tableMid, $tableId);
419+
$cases['show'] = [];
419420
$cases['list'] = [$this->getUserPagesList($tableName, $fieldId, $fieldMain, "\t\t")];
420421
if (1 == $tableSubmit) {
421422
$cases['save'] = [$this->getUserPagesSave($moduleDirname, $fields, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $language, "\t\t")];

class/Files/User/UserXoopsVersion.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ private function getXoopsVersionTemplatesAdminUser($moduleDirname, $tables, $adm
302302
$tableSubmit[] = $tables[$t]->getVar('table_submit');
303303
$item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, '');
304304
$item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, 'list');
305+
$item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, 'item');
305306
}
306307
$item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'breadcrumbs', '');
307308
if (in_array(1, $tablePdf)) {

0 commit comments

Comments
 (0)