Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13073] XoopsModules/TDMCreate/branches/timgno/1.91a2 /tdmcreate/class
|
From: <txm...@us...> - 2015-05-30 10:15:45
|
Revision: 13073
http://sourceforge.net/p/xoops/svn/13073
Author: txmodxoops
Date: 2015-05-30 10:15:43 +0000 (Sat, 30 May 2015)
Log Message:
-----------
Refactoring
Added & deleted superflues code
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -205,7 +205,7 @@
$fieldAttributesSelect->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
$form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>'));
// Field Null
- $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '';
+ $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '2';
$fieldNullSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value);
$fieldNullSelect->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());
$form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>'));
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -114,6 +114,7 @@
$tableName = $table->getVar('table_name');
$tableSoleName = $table->getVar('table_solename');
$tableFieldname = $table->getVar('table_fieldname');
+ $ucfTableName = ucfirst($tableName);
$stuTableName = strtoupper($tableName);
$stuTableSoleName = strtoupper($tableSoleName);
$stuTableFieldname = strtoupper($tableFieldname);
@@ -133,13 +134,8 @@
EOT;
}
$ret .= <<<EOT
- \$criteria = new CriteriaCompo();
- \$criteria->setStart(\$start);
- \$criteria->setLimit(\$limit);
- \$criteria->setSort('{$fieldId} ASC, {$fieldMain}');
- \$criteria->setOrder('ASC');
- \${$tableName}Count = \${$tableName}Handler->getCount(\$criteria);
- \${$tableName}All = \${$tableName}Handler->getAll(\$criteria);
+ \${$tableName}Count = \${$tableName}Handler->getCount{$ucfTableName}();
+ \${$tableName}All = \${$tableName}Handler->getAll{$ucfTableName}(\$start, \$limit);
unset(\$criteria);
\$GLOBALS['xoopsTpl']->assign('{$tableName}_count', \${$tableName}Count);
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_url', {$stuModuleDirname}_URL);
@@ -148,78 +144,11 @@
if (\${$tableName}Count > 0)
{
foreach (array_keys(\${$tableName}All) as \$i)
- {\n
-EOT;
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $fieldParent = $fields[$f]->getVar('field_parent');
- // Verify if table_fieldname is not empty
- $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableSoleName;
- $rpFieldName = $this->tdmcfile->getRightString($fieldName);
- //
- if($f < 1) {
- $ret .= $this->adminobjects->getIdGetVar($lpFieldName);
- }
- $fieldElement = $fields[$f]->getVar('field_element');
- if ((1 == $fields[$f]->getVar('field_admin')) || ((1 == $tableAutoincrement) && (1 == $fields[$f]->getVar('field_inlist')))) {
- switch ($fieldElement) {
- case 3:
- case 4:
- $ret .= $this->adminobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 8:
- $ret .= $this->adminobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 12:
- $ret .= $this->adminobjects->getUrlFileGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 13:
- $ret .= $this->adminobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 15:
- $ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- default:
- if ($fieldElement > 15) {
- $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
- $fieldElementTid = $fieldElements->getVar('fieldelement_tid');
- $fieldElementName = $fieldElements->getVar('fieldelement_name');
- $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName));
- if (1 == $fieldParent) {
- $criteriaFieldsTopic = new CriteriaCompo();
- $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid));
- $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic);
- unset($criteriaFieldsTopic);
- foreach (array_keys($fieldsTopic) as $ft) {
- if (1 == $fieldsTopic[$ft]->getVar('field_main')) {
- $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name');
- }
- }
- $ret .= $this->adminobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldName, $fieldNameTopic);
- } else {
- //
- $criteriaTablesTopic = new CriteriaCompo();
- $criteriaTablesTopic->add(new Criteria('table_id', $fieldElementTid));
- $tablesTopic = $this->tdmcreate->getHandler('tables')->getObjects($criteriaTablesTopic);
- unset($criteriaTablesTopic);
- foreach (array_keys($tablesTopic) as $ft) {
- $ucfTableSoleNameTopic = ucfirst($tablesTopic[$ft]->getVar('table_solename'));
- }
- $ret .= $this->adminobjects->getParentTopicGetVar($moduleDirname, $lpFieldName, $rpFieldName, $tableName, $ucfTableSoleNameTopic, $rpFieldElementName, $fieldName);
- }
- } else {
- $ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- }
- break;
- }
+ {
+ \${$tableSoleName} = \${$tableName}All[\$i]->getValues();
+ \$GLOBALS['xoopsTpl']->appendByRef('{$tableName}_list', \${$tableSoleName});
+ unset(\${$tableSoleName});
}
- }
- $ret .= <<<EOT
- \$GLOBALS['xoopsTpl']->append('{$tableName}_list', \${$lpFieldName});
- unset(\${$lpFieldName});
- }\n
-EOT;
- $ret .= <<<EOT
if ( \${$tableName}Count > \$limit ) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
\$pagenav = new XoopsPageNav(\${$tableName}Count, \$limit, \$start, 'start', 'op=list&limit=' . \$limit);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -192,7 +192,8 @@
* @var mixed
*/
private \${$moduleDirname} = null;
- /*
+
+ /*
* Constructor
*
* @param null
@@ -200,7 +201,7 @@
public function __construct()
{
\$this->{$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();
-{$this->getInitVars($fields)}\t}
+{$this->getInitVars($fields)}\t}\n
/*
* @static function &getInstance
* @param null
@@ -212,7 +213,7 @@
\$instance = new self();
}
return \$instance;
- }\n
+ }\n\n
EOT;
return $ret;
@@ -327,7 +328,7 @@
\$form->addElement ( \$groupsCanSubmitCheckbox );
// For view
\$groupsCanViewCheckbox->addOptionArray ( \$groupList );
- \$form->addElement ( \$groupsCanViewCheckbox );\n
+ \$form->addElement ( \$groupsCanViewCheckbox );\n\n
EOT;
return $ret;
@@ -347,12 +348,65 @@
\$form->addElement(new XoopsFormHidden('op', 'save'));
\$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
return \$form;
- }\n
+ }\n\n
EOT;
return $ret;
}
+
+ /*
+ * @private function getToArray
+ * @param null
+ */
+ /**
+ * @return string
+ */
+ private function getValuesInForm($fields)
+ {
+ $ret = <<<EOT
+ /**
+ * Get Values
+ */
+ public function getValues(\$keys = null, \$format = null, \$maxDepth = null)
+ {
+ \$ret = parent::getValues(\$keys, \$format, \$maxDepth);\n
+EOT;
+ foreach (array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldElement = $fields[$f]->getVar('field_element');
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ switch ($fieldElement) {
+ case 3:
+ case 4:
+ $ret .= <<<EOT
+ \$ret['{$rpFieldName}'] = strip_tags(\$this->getVar('{$fieldName}'));\n
+EOT;
+ break;
+ case 8:
+ $ret .= <<<EOT
+ \$ret['{$rpFieldName}'] = XoopsUser::getUnameFromId(\$this->getVar('{$fieldName}'));\n
+EOT;
+ break;
+ case 15:
+ $ret .= <<<EOT
+ \$ret['{$rpFieldName}'] = formatTimeStamp(\$this->getVar('{$fieldName}'));\n
+EOT;
+ break;
+ default:
+ $ret .= <<<EOT
+ \$ret['{$rpFieldName}'] = \$this->getVar('{$fieldName}');\n
+EOT;
+ break;
+ }
+ }
+ $ret .= <<<EOT
+
+ return \$ret;
+ }\n\n
+EOT;
+ return $ret;
+ }
/*
* @private function getToArray
* @param null
@@ -360,7 +414,7 @@
/**
* @return string
*/
- private function getToArray()
+ private function getToArrayInForm()
{
$ret = <<<EOT
/**
@@ -377,12 +431,54 @@
}
return \$ret;
}
-}\n
+}\n\n
EOT;
return $ret;
}
+
+ /*
+ * @private function getOptionsCheck
+ * @param $table
+ */
+ /**
+ * @return string
+ */
+ private function getOptionsCheck($table)
+ {
+ $ret = <<<EOT
+ /**
+ * Get Options
+ */
+ public function getOptions()
+ {
+ \$ret = array();\n
+EOT;
+ $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
+ foreach (array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldElement = $fields[$f]->getVar('field_element');
+ //
+ $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
+ $fieldElementId = $fieldElements->getVar('fieldelement_id');
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ if(5 == $fieldElementId) {
+ $ret .= <<<EOT
+ if (1 == \$this->getVar('{$fieldName}')) {
+ array_push(\$ret, '{$rpFieldName}');
+ }\n
+EOT;
+ }
+ }
+ $ret .= <<<EOT
+ return \$ret;
+ }
+}\n\n
+EOT;
+ return $ret;
+ }
+
/*
* @public function getClassHandler
* @param string $moduleDirname
@@ -399,7 +495,7 @@
* @param $fieldMain
* @return string
*/
- private function getClassHandler($moduleDirname, $table, $fieldId, $fieldMain)
+ private function getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldMain)
{
$tableName = $table->getVar('table_name');
$tableCategory = $table->getVar('table_category');
@@ -428,9 +524,21 @@
{
parent::__construct(\$db, '{$moduleDirname}_{$tableName}', '{$moduleDirname}{$tableName}', '{$fieldId}', '{$fieldMain}');
\$this->{$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();
+ }\n\n
+EOT;
+
+ return $ret;
}
-
- /**
+
+ /**
+ * @public function getClassCreate
+ *
+ * @return string
+ */
+ private function getClassCreate()
+ {
+ $ret = <<<EOT
+ /**
* @param bool \$isNew
*
* @return object
@@ -438,9 +546,21 @@
public function &create(\$isNew = true)
{
return parent::create(\$isNew);
+ }\n\n
+EOT;
+
+ return $ret;
}
-
- /**
+
+ /**
+ * @public function getClassGet
+ *
+ * @return string
+ */
+ private function getClassGet()
+ {
+ $ret = <<<EOT
+ /**
* retrieve a field
*
* @param int \$i field id
@@ -449,8 +569,20 @@
public function &get(\$i = null, \$fields = null)
{
return parent::get(\$i, \$fields);
+ }\n\n
+EOT;
+
+ return $ret;
}
-
+
+ /**
+ * @public function getClassGetInsertId
+ *
+ * @return string
+ */
+ private function getClassGetInsertId()
+ {
+ $ret = <<<EOT
/**
* get inserted id
*
@@ -460,9 +592,21 @@
public function &getInsertId()
{
return \$this->db->getInsertId();
+ }\n\n
+EOT;
+
+ return $ret;
}
-
- /**
+
+ /**
+ * @public function getClassGetIds
+ *
+ * @return string
+ */
+ private function getClassGetIds()
+ {
+ $ret = <<<EOT
+ /**
* get IDs of objects matching a condition
*
* @param object \$criteria {@link CriteriaElement} to match
@@ -471,9 +615,21 @@
function &getIds(\$criteria)
{
return parent::getIds(\$criteria);
+ }\n\n
+EOT;
+
+ return $ret;
}
-
- /**
+
+ /**
+ * @public function getClassInsert
+ *
+ * @return string
+ */
+ private function getClassInsert()
+ {
+ $ret = <<<EOT
+ /**
* insert a new field in the database
*
* @param object \$field reference to the {@link TDMCreateFields} object
@@ -487,11 +643,115 @@
return false;
}
return true;
- }\n
+ }\n\n
EOT;
- if (1 == $tableCategory) {
- $ret .= <<<EOT
- \n\t/**
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassCounter
+ *
+ * @param $tableName
+ * @param $fieldId
+ * @param $fieldMain
+ * @return string
+ */
+ private function getClassCounter($tableName, $fieldId, $fieldMain)
+ {
+ $ucfTableName = ucfirst($tableName);
+ $ret = <<<EOT
+ /**
+ * Get Count {$ucfTableName}
+ */
+ public function getCount{$ucfTableName}(\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC')
+ {
+ \$criteria = new CriteriaCompo();
+ \$criteria->setSort(\$sort);
+ \$criteria->setOrder(\$order);
+ \$criteria->setStart(\$start);
+ \$criteria->setLimit(\$limit);
+ return parent::getCount(\$criteria);
+ }\n\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassAll
+ *
+ * @param $tableName
+ * @param $fieldId
+ * @param $fieldMain
+ * @return string
+ */
+ private function getClassAll($tableName, $fieldId, $fieldMain)
+ {
+ $ucfTableName = ucfirst($tableName);
+ $ret = <<<EOT
+ /**
+ * Get All {$ucfTableName}
+ */
+ public function getAll{$ucfTableName}(\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC')
+ {
+ \$criteria = new CriteriaCompo();
+ \$criteria->setSort(\$sort);
+ \$criteria->setOrder(\$order);
+ \$criteria->setStart(\$start);
+ \$criteria->setLimit(\$limit);
+ return parent::getAll(\$criteria);
+ }\n\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassByCategory
+ *
+ * @param $tableName
+ * @param $fieldId
+ * @param $fieldMain
+ * @param $fieldParent
+ * @return string
+ */
+ private function getClassByCategory($tableName, $fieldId, $fieldMain, $fieldParent)
+ {
+ $ucfTableName = ucfirst($tableName);
+ $ret = <<<EOT
+ /**
+ * Get All {$ucfTableName} By Category Id
+ */
+ public function getAll{$ucfTableName}ByCategoryId(\$catId, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC')
+ {
+ \$criteria = new CriteriaCompo();
+ \$criteria->add(new Criteria('{$fieldParent}', \$catId));
+ \$criteria->setSort(\$sort);
+ \$criteria->setOrder(\$order);
+ \$criteria->setStart(\$start);
+ \$criteria->setLimit(\$limit);
+ return parent::getAll(\$criteria);
+ }\n\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassGetTableSolenameById
+ *
+ * @param $moduleDirname
+ * @param $table
+ * @return string
+ */
+ private function getClassGetTableSolenameById($moduleDirname, $table, $fieldMain)
+ {
+ $tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
+ $ucfTableSoleName = ucfirst($tableSoleName);
+ $ret = <<<EOT
+ /**
* Returns the {$ucfTableSoleName} from id
*
* @return string
@@ -508,15 +768,26 @@
}
}
return \${$tableSoleName};
- }\n
+ }
EOT;
- }
- $ret .= <<<EOT
-}
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassEnd
+ *
+ * @return null
+ */
+ private function getClassEnd()
+ {
+ $ret = <<<EOT
+}\n
EOT;
-
- return $ret;
+
+ return $ret;
}
+
/*
* @public function renderFile
@@ -531,30 +802,56 @@
$module = $this->getModule();
$table = $this->getTable();
$tableName = $table->getVar('table_name');
+ $tableCategory = $table->getVar('table_category');
$moduleDirname = $module->getVar('mod_dirname');
$fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $fieldInForm = $fields[$f]->getVar('field_inform');
+ $fieldInForm = array();
+ $fieldParentId = array();
+ $fieldElementId = array();
+ foreach (array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldInForm[] = $fields[$f]->getVar('field_inform');
if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) {
$fieldId = $fieldName; // $fieldId = fields parameter index field
}
if (1 == $fields[$f]->getVar('field_main')) {
$fieldMain = $fieldName; // $fieldMain = fields parameter main field
}
+ if (1 == $fields[$f]->getVar('field_parent')) {
+ $fieldParent = $fieldName; // $fieldParent = fields parameter parent field
+ }
+ $fieldElement = $fields[$f]->getVar('field_element');
+ //
+ $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
+ $fieldElementId[] = $fieldElements->getVar('fieldelement_id');
}
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getHeadClass($moduleDirname, $tableName, $fields);
- if (1 == $fieldInForm) {
+ if (in_array(1, $fieldInForm)) {
$content .= $this->getHeadInForm($module, $table);
if (1 == $table->getVar('table_permissions')) {
$content .= $this->getPermissionsInForm($moduleDirname, $fieldId);
}
$content .= $this->getFootInForm();
}
- $content .= $this->getToArray();
- $content .= $this->getClassHandler($moduleDirname, $table, $fieldId, $fieldMain);
-
+ $content .= $this->getValuesInForm($fields);
+ $content .= $this->getToArrayInForm();
+ if(in_array(5, $fieldElementId)) {
+ $content .= $this->getOptionsCheck($table);
+ }
+ $content .= $this->getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldMain);
+ $content .= $this->getClassCreate();
+ $content .= $this->getClassGet();
+ $content .= $this->getClassGetInsertId();
+ $content .= $this->getClassGetIds();
+ $content .= $this->getClassInsert();
+ $content .= $this->getClassCounter($tableName, $fieldId, $fieldMain);
+ $content .= $this->getClassAll($tableName, $fieldId, $fieldMain);
+ if (in_array(1, $fieldParentId)) {
+ $content .= $this->getClassByCategory($tableName, $fieldId, $fieldMain, $fieldParent);
+ $content .= $this->getClassGetTableSolenameById($moduleDirname, $table, $fieldMain);
+ }
+ $content .= $this->getClassEnd();
$this->tdmcfile->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -670,11 +670,11 @@
}
break;
}
- if (($fieldElement <= 15) && (1 == $fieldParent)) {
+ /*if (($fieldElement <= 15)) {
$ret .= $this->getXoopsFormTopic($language, $moduleDirname, $tableName, $fieldId, $fieldPid, $fieldMain, $required);
- }
+ }*/
if ($fieldElement > 15) {
- if (1 == $table->getVar('table_category')) {
+ if (1 == $table->getVar('table_category') || (1 == $fieldParent)) {
$fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
$fieldElementMid = $fieldElements->getVar('fieldelement_mid');
$fieldElementTid = $fieldElements->getVar('fieldelement_tid');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -85,6 +85,7 @@
{
$table = $this->getTable();
$tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
$tableFieldname = $table->getVar('table_fieldname');
$stuModuleDirname = strtoupper($moduleDirname);
$stuTableName = strtoupper($tableName);
@@ -104,77 +105,27 @@
//
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL);
//
-\$criteria{$ucfTableName} = new CriteriaCompo();
-\${$stlTableName}Count = \${$stlTableName}Handler->getCount(\$criteria{$ucfTableName});
-\${$stlTableName}All = \${$stlTableName}Handler->getAll(\$criteria{$ucfTableName});
-unset(\$criteria{$ucfTableName});
+\${$stlTableName}Count = \${$stlTableName}Handler->getCount{$ucfTableName}();
+\${$stlTableName}All = \${$stlTableName}Handler->getAll{$ucfTableName}(\$start, \$limit);
\$keywords = array();
if (\${$stlTableName}Count > 0) {
- foreach (array_keys(\${$stlTableName}All) as \$i)
- {\n
+ // Get All {$ucfTableName}
+ foreach (array_keys(\${$stlTableName}All) as \$i)
+ {
+ \${$tableSoleName} = \${$tableName}All[\$i]->getValues();
+ \$GLOBALS['xoopsTpl']->appendByRef('{$tableName}_list', \${$tableSoleName});
+ unset(\${$tableSoleName});\n
EOT;
// Fields
$fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
foreach (array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
- $fieldParent = $fields[$f]->getVar('field_parent');
- // Verify if table_fieldname is not empty
- $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;
- $rpFieldName = $this->tdmcfile->getRightString($fieldName);
if (1 == $fields[$f]->getVar('field_main')) {
- $fpmf = $fieldName; // fpmf = fields parameters main field
- }
- $fieldElement = $fields[$f]->getVar('field_element');
- if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_user'))) {
- switch ($fieldElement) {
- case 3:
- case 4:
- $ret .= $this->userobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 8:
- $ret .= $this->userobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 12:
- $ret .= $this->userobjects->getUrlFileGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 13:
- $ret .= $this->userobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 15:
- $ret .= $this->userobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- default:
- if ((1 == $fieldParent) && !$table->getVar('table_category')) {
- if ($fieldElement > 15) {
- $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
- $fieldElementTid = $fieldElements->getVar('fieldelement_tid');
- $fieldElementName = $fieldElements->getVar('fieldelement_name');
- $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName));
- //
- $fieldNameParent = $fieldName;
- //
- $criteriaFieldsTopic = new CriteriaCompo();
- $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid));
- $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic);
- unset($criteriaFieldsTopic);
- foreach (array_keys($fieldsTopic) as $ft) {
- if (1 == $fieldsTopic[$ft]->getVar('field_main')) {
- $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name');
- }
- }
- $ret .= $this->userobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldNameParent, $fieldNameTopic);
- }
- } else {
- $ret .= $this->userobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- }
- break;
- }
- }
+ $fieldMain = $fieldName; // fieldMain = fields parameters main field
+ }
}
$ret .= <<<EOT
- \$GLOBALS['xoopsTpl']->append('{$stlTableName}', \${$lpFieldName});
- \$keywords[] = \${$stlTableName}All[\$i]->getVar('{$fpmf}');
- unset(\${$lpFieldName});
+ \$keywords[] = \${$stlTableName}All[\$i]->getVar('{$fieldMain}');
}
// Display Navigation
if (\${$stlTableName}Count > \$limit) {
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -130,7 +130,7 @@
$ret = <<<EOT
defined('XOOPS_ROOT_PATH') or die('Restricted access');
//
-\$dirname = basename(__DIR__) ;
+\$dirname = basename(__DIR__);
// ------------------- Informations ------------------- //
\$modversion = array(
'name' => {$language}NAME,
@@ -325,6 +325,23 @@
}
/*
+ * @private function getXoopsVersionTemplatesUserLine
+ * @param $moduleDirname
+ */
+ /**
+ * @param $moduleDirname
+ * @return string
+ */
+ private function getXoopsVersionTemplatesUserLine($moduleDirname, $type)
+ {
+ $ret = <<<EOT
+\$modversion['templates'][] = array('file' => '{$moduleDirname}_{$type}.tpl', 'description' => '');\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
* @private function getXoopsVersionTemplatesUser
* @param $moduleDirname
*/
@@ -346,44 +363,28 @@
EOT;
}
if(1 == $table->getVar('table_broken')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_broken.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'broken');
}
if(1 == $table->getVar('table_pdf')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_pdf.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'pdf');
}
if(1 == $table->getVar('table_print')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_print.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'print');
}
if(1 == $table->getVar('table_rate')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_rate.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'rate');
}
if(1 == $table->getVar('table_rss')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_rss.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'rss');
}
if(1 == $table->getVar('table_search')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_search.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'search');
}
if(1 == $table->getVar('table_single')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_single.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'single');
}
if(1 == $table->getVar('table_submit')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_submit.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'submit');
}
$ret .= <<<EOT
\$modversion['templates'][] = array('file' => '{$moduleDirname}_footer.tpl', 'description' => '');\n\n
|
