Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12709] XoopsModules/TDMCreate/branches/timgno/1.91/ tdmcreate
|
From: <txm...@us...> - 2014-07-13 10:24:24
|
Revision: 12709
http://sourceforge.net/p/xoops/svn/12709
Author: txmodxoops
Date: 2014-07-13 10:24:13 +0000 (Sun, 13 Jul 2014)
Log Message:
-----------
- Fixed bugs
- Updated
- Still work to do
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/blocks/blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/install.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -202,7 +202,7 @@
if( $tablesObj->isNew() ) {
$tableIid = $GLOBALS['xoopsDB']->getInsertId();
$table_action='&field_mid='.$tableMid.'&field_tid='.$tableIid.'&field_numb='.$tableNumbFields.'&field_name='.$tableFieldname;
- redirect_header('fields.php?op=new'.$table_action, 5, sprintf(_AM_TDMCREATE_TABLE_FORM_SAVED_OK, $_POST['table_name']));
+ redirect_header('fields.php?op=new'.$table_action, 5, sprintf(_AM_TDMCREATE_TABLE_FORM_CREATED_OK, $_POST['table_name']));
} else {
// Get fields where table id
$fields =& $tdmcreate->getHandler('fields');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -169,6 +169,22 @@
return $ret;
}
/*
+ * @public function getUploadImageGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $fieldName
+ */
+ public function getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
+ $ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$fieldName} = \${$tableName}_arr[\$i]->getVar('{$fieldName}');
+\t\t\t\t\$upload_image = \${$fieldName} ? \${$fieldName} : 'blank.gif';
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \$upload_image;\n
+EOT;
+ return $ret;
+ }
+ /*
* @public function getTextAreaGetVar
* @param string $lpFieldName
* @param string $rpFieldName
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -61,7 +61,7 @@
* @param string $moduleDirname
* @param string $tableName
*/
- public function getAdminPagesHeader($moduleDirname, $tableName, $fpif) {
+ public function getAdminPagesHeader($moduleDirname, $table, $fpif) {
$ret = <<<EOT
include_once 'header.php';
@@ -127,9 +127,12 @@
case 4:
$ret .= $this->adminobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
- case 5:
+ case 8:
$ret .= $this->adminobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
+ break;
+ case 11:
+ $ret .= $this->adminobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
case 13:
$ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -320,6 +320,10 @@
}
// Creation of blocks language file
if (is_object($table)) {
+ // Include Install File
+ $includeInstall = IncludeInstall::getInstance();
+ $includeInstall->write($module, $table, $tables, 'install.php');
+ $ret[] = $includeInstall->render();
if ( $table->getVar('table_blocks') == 1) {
// Language Blocks File
$languageBlocks = LanguageBlocks::getInstance();
@@ -354,11 +358,7 @@
$languageMailTpl = LanguageMailTpl::getInstance();
$languageMailTpl->write($module);
$ret[] = $languageMailTpl->renderFile('category_new_notify.tpl');
- }
- // Include Install File
- $includeInstall = IncludeInstall::getInstance();
- $includeInstall->write($module, $table, $tables, 'install.php');
- $ret[] = $includeInstall->render();
+ }
// Creation of sql file
if ( $table->getVar('table_name') != null) {
// Sql File
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/blocks/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/blocks/blocks.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/blocks/blocks.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -60,7 +60,7 @@
$ucfModuleDirname = ucfirst($moduleDirname);
$ret = <<<EOT
include_once XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/include/common.php';
-include_once XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/include/functions.php';
+// Function show block
function b_{$moduleDirname}_{$tableName}_show(\$options)
{
include_once XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/class/{$tableName}.php';
@@ -128,6 +128,7 @@
$stuModuleDirname = strtoupper($moduleDirname);
$ucfModuleDirname = ucfirst($moduleDirname);
$ret = <<<EOT
+// Function edit block
function b_{$moduleDirname}_{$tableName}_edit(\$options)
{
include_once XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/class/{$tableName}.php';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/install.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/install.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/install.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -181,7 +181,7 @@
$fieldElement = $fields[$f]->getVar('field_element');
// All fields elements selected
switch( $fieldElement ) {
- case 10:
+ case 11:
$content .= $this->getInstallImagesFolder($moduleDirname);
foreach(array_keys($tables) as $t)
{
@@ -189,7 +189,7 @@
$content .= $this->getInstallTableImagesFolder($tableName);
}
break;
- case 11:
+ case 12:
$content .= $this->getInstallFilesFolder($moduleDirname);
foreach(array_keys($tables) as $t)
{
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -165,17 +165,17 @@
EOT;
switch($fieldElement)
{
- case 9:
+ case 10:
$ret .= <<<EOT
define('{$language}FORM_UPLOAD_IMAGE_LIST_{$stuTableName}', "{$fieldNameDesc} in frameworks images");\n
EOT;
break;
- case 10:
+ case 11:
$ret .= <<<EOT
define('{$language}FORM_UPLOAD_IMAGE_{$stuTableName}', "{$fieldNameDesc} in uploads images");\n
EOT;
break;
- case 11:
+ case 12:
$ret .= <<<EOT
define('{$language}FORM_UPLOAD_FILE_{$stuTableName}', "{$fieldNameDesc} in uploads files");\n
EOT;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -43,6 +43,10 @@
*/
private $path = null;
/*
+ * @var mixed
+ */
+ //private $uploadPath = null;
+ /*
* @var string
*/
private $fromFile = null;
@@ -70,12 +74,40 @@
return $instance;
}
/*
+ * @public function setPath
+ * @param string $path
+ */
+ /*public function setPath($path) {
+ $this->path = TDMC_PATH . DIRECTORY_SEPARATOR . $path;
+ }*/
+ /*
+ * @public function setUploadPath
+ * @param string $path
+ */
+ /*public function setUploadPath($path) {
+ $this->uploadPath = TDMC_UPLOAD_PATH . DIRECTORY_SEPARATOR . $path;
+ }*/
+ /*
* @public function getPath
* @param string $path
*/
+ /*public function getPath() {
+ return $this->path;
+ }*/
+ /*
+ * @public function getUploadPath
+ * @param string $path
+ */
+ /*public function getUploadPath() {
+ return $this->uploadPath;
+ }*/
+ /*
+ * @public function getPath
+ * @param string $path
+ */
public function getPath($path) {
$this->path = $path;
- }
+ }
/*
* @public function isDir
* @param string $dname
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -58,7 +58,9 @@
* @param string $fields
* @param string $language
*/
- private function getTemplatesAdminPagesHeader($moduleDirname, $tableName, $fields, $language) {
+ private function getTemplatesAdminPagesHeader($moduleDirname, $table, $fields, $language)
+ {
+ $tableName = $table->getVar('table_name');
$ret = <<<EOT
<{include file="db:{$moduleDirname}_admin_header.tpl"}>
<{if {$tableName}_list}>
@@ -70,7 +72,8 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$lang_fn = $language.strtoupper($fieldName);
- if( $fields[$f]->getVar('field_inlist') == 1 ) {
+ if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1)
+ ) {
$ret .= <<<EOT
<th class="center"><{\$smarty.const.{$lang_fn}}></th>\n
EOT;
@@ -90,8 +93,9 @@
* @param string $fields
* @param string $language
*/
- private function getTemplatesAdminPagesBody($moduleDirname, $tableName, $fields, $language)
+ private function getTemplatesAdminPagesBody($moduleDirname, $table, $fields, $language)
{
+ $tableName = $table->getVar('table_name');
$ret = <<<EOT
<tbody>
<{foreach item=list from=\${$tableName}_list}>
@@ -108,7 +112,7 @@
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
}
$lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
- if( $fields[$f]->getVar('field_inlist') == 1 ) {
+ if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
$ret .= <<<EOT
@@ -156,8 +160,9 @@
* @param string $fields
* @param string $language
*/
- private function getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $tableName, $fields, $language)
+ private function getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $table, $fields, $language)
{
+ $tableName = $table->getVar('table_name');
$ret = <<<EOT
<tbody>
<{foreach item=list from=\${$tableName}_list}>
@@ -169,8 +174,8 @@
$fieldElement = $fields[$f]->getVar('field_element');
if($f == 0) {
$field_id = $fieldName;
- }
- if( $fields[$f]->getVar('field_inlist') == 1 ) {
+ }
+ if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
$ret .= <<<EOT
@@ -222,11 +227,11 @@
<!-- Display navigation -->
<div class="xo-pagenav floatright"><{\$pagenav}></div><div class="clear spacer"></div>
<{/if}>
- <{if \$error}>
- <div class="errorMsg">
- <strong><{\$error}></strong>
- </div>
- <{/if}>
+<{/if}>
+<{if \$error}>
+ <div class="errorMsg">
+ <strong><{\$error}></strong>
+ </div>
<{/if}>
<{if \$form}>
<!-- Display form (add,edit) -->
@@ -246,16 +251,15 @@
$module = $this->getModule();
$table = $this->getTable();
$moduleDirname = $module->getVar('mod_dirname');
- $tableName = $table->getVar('table_name');
$tableFieldname = $table->getVar('table_fieldname');
$language = $this->getLanguage($moduleDirname, 'AM');
$fields = $this->getTableFields($table->getVar('table_id'));
- $content = $this->getTemplatesAdminPagesHeader($moduleDirname, $tableName, $fields, $language);
+ $content = $this->getTemplatesAdminPagesHeader($moduleDirname, $table, $fields, $language);
// Verify if table_fieldname is not empty
if(!empty($tableFieldname)) {
- $content .= $this->getTemplatesAdminPagesBody($moduleDirname, $tableName, $fields, $language);
+ $content .= $this->getTemplatesAdminPagesBody($moduleDirname, $table, $fields, $language);
} else {
- $content .= $this->getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $tableName, $fields, $language);
+ $content .= $this->getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $table, $fields, $language);
}
$content .= $this->getTemplatesAdminPagesFooter($moduleDirname);
//
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/pages.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/pages.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -71,7 +71,7 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$langStuFieldName = $language.strtoupper($fieldName);
- if( $fields[$f]->getVar('field_user') == 1 ) {
+ if( ($fields[$f]->getVar('field_user') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
$ret .= <<<EOT
<th class="center"><{\$smarty.const.{$langStuFieldName}}></th>\n
EOT;
@@ -103,7 +103,7 @@
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
- if( $fields[$f]->getVar('field_user') == 1 ) {
+ if( ($fields[$f]->getVar('field_user') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
$ret .= <<<EOT
@@ -155,7 +155,7 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
- if( $fields[$f]->getVar('field_user') == 1 ) {
+ if( ($fields[$f]->getVar('field_user') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
$ret .= <<<EOT
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -16,7 +16,7 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: user_objects.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: objects.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
@@ -78,12 +78,28 @@
*/
public function getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
$ret = <<<EOT
-\t\t\t// Get Var {$fieldName}
-\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
+\t\t// Get Var {$fieldName}
+\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
EOT;
return $ret;
}
/*
+ * @public function getUploadImageGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $fieldName
+ */
+ public function getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
+ $ret = <<<EOT
+\t\t// Get Var {$fieldName}
+\t\t\${$fieldName} = \${$tableName}_arr[\$i]->getVar('{$fieldName}');
+\t\t\$upload_image = \${$fieldName} ? \${$fieldName} : 'blank.gif';
+\t\t\${$lpFieldName}['{$rpFieldName}'] = \$upload_image;\n
+EOT;
+ return $ret;
+ }
+ /*
* @public function getTextAreaGetVar
* @param string $lpFieldName
* @param string $rpFieldName
@@ -92,8 +108,8 @@
*/
public function getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
$ret = <<<EOT
-\t\t\t// Get Var {$fieldName}
-\t\t\t\${$lpFieldName}['{$rpFieldName}'] = strip_tags(\${$tableName}_arr[\$i]->getVar('{$fieldName}'));\n
+\t\t// Get Var {$fieldName}
+\t\t\${$lpFieldName}['{$rpFieldName}'] = strip_tags(\${$tableName}_arr[\$i]->getVar('{$fieldName}'));\n
EOT;
return $ret;
}
@@ -106,8 +122,8 @@
*/
public function getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
$ret = <<<EOT
-\t\t\t// Get Var {$fieldName}
-\t\t\t\${$lpFieldName}['{$rpFieldName}'] = XoopsUser::getUnameFromId(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
+\t\t// Get Var {$fieldName}
+\t\t\${$lpFieldName}['{$rpFieldName}'] = XoopsUser::getUnameFromId(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
EOT;
return $ret;
}
@@ -120,8 +136,8 @@
*/
public function getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
$ret = <<<EOT
-\t\t\t// Get Var {$fieldName}
-\t\t\t\${$lpFieldName}['{$rpFieldName}'] = formatTimeStamp(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
+\t\t// Get Var {$fieldName}
+\t\t\${$lpFieldName}['{$rpFieldName}'] = formatTimeStamp(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
EOT;
return $ret;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -67,10 +67,10 @@
$table = $this->getTable();
$tableName = $table->getVar('table_name');
$tableFieldname = $table->getVar('table_fieldname');
- $tableAutoincrement = $table->getVar('table_autoincrement');
$stuModuleDirname = strtoupper($moduleDirname);
$stuTableName = strtoupper($tableName);
$stlTableName = strtolower($tableName);
+ $ucfTableName = ucfirst($tableName);
$ret = <<<EOT
\ninclude_once 'header.php';
\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_{$tableName}.tpl';
@@ -84,9 +84,10 @@
//
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL);
//
-\$criteria = new CriteriaCompo();
-\${$stlTableName}_count = \${$stlTableName}Handler->getCount(\$criteria);
-\${$stlTableName}_arr = \${$stlTableName}Handler->getAll(\$criteria);
+\$criteria{$ucfTableName} = new CriteriaCompo();
+\${$stlTableName}_count = \${$stlTableName}Handler->getCount(\$criteria{$ucfTableName});
+\${$stlTableName}_arr = \${$stlTableName}Handler->getAll(\$criteria{$ucfTableName});
+unset(\$criteria{$ucfTableName});
\$keywords = array();
if (\${$stlTableName}_count > 0) {
foreach (array_keys(\${$stlTableName}_arr) as \$i)
@@ -104,16 +105,19 @@
$fpmf = $fieldName; // fpmf = fields parameters main field
}
$fieldElement = $fields[$f]->getVar('field_element');
- if( ($fields[$f]->getVar('field_user') == 1) || ($tableAutoincrement == 1) ) {
+ if( ($fields[$f]->getVar('field_user') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch($fieldElement) {
- case 2:
case 3:
+ case 4:
$ret .= $this->userobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
- case 7:
+ case 8:
$ret .= $this->userobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 12:
+ break;
+ case 11:
+ $ret .= $this->userobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ case 13:
$ret .= $this->userobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
default:
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql 2014-07-13 10:24:13 UTC (rev 12709)
@@ -110,7 +110,8 @@
`field_required` TINYINT(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`field_id`),
KEY `field_mid` (`field_mid`),
- KEY `field_tid` (`field_tid`)
+ KEY `field_tid` (`field_tid`),
+ KEY `field_name` (`field_name`)
)ENGINE =MyISAM;
#
|
