Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12569] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate
|
From: <txm...@us...> - 2014-06-09 00:03:26
|
Revision: 12569
http://sourceforge.net/p/xoops/svn/12569
Author: txmodxoops
Date: 2014-06-09 00:03:18 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Updated
Work in progress
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_files.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_templates.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_install.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_search.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/tablefields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_header.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_index.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_index.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_print.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_rss.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_submit.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_templates.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_xoopsversion.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -169,10 +169,10 @@
$fieldsObj =& $tdmcreate->getHandler('fields')->create();
$fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create();
}
- //
+ // Set Variables
if ($field_numb > 0) {
for( $i = 1; $i <= $field_numb; $i++ ) {
- //
+ // Set Data
$fieldsObj->setVar( 'field_mid', $field_mid );
$fieldsObj->setVar( 'field_tid', $field_tid );
$fieldsObj->setVar( 'field_numb', $field_numb );
@@ -201,7 +201,7 @@
$fieldelementObj->setVar( 'fieldelement_tid', $field_tid );
$fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($table_name) );
$fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($table_name) );
- // Insert new table name
+ // Insert new field element id for table name
if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) {
$GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element');
}
@@ -228,7 +228,7 @@
$adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
- $fieldsObj = $tdmcreate->getHandler('fields')->get( $field_tid );
+ $fieldsObj = $tdmcreate->getHandler('fields')->get( $field_tid, array('field_id', 'field_name') );
$form = $fieldsObj->getForm(null, $field_tid);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
@@ -271,9 +271,14 @@
$fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
if (isset($_GET['field_tid'])) {
if (isset($_GET['field_parent'])) {
- $fld_parent = intval($_GET['field_parent']);
+ /*$fld_parent = intval($_GET['field_parent']);
$field_parent = ($fld_parent == 1) ? 0 : 1;
- $fieldsObj->setVar('field_parent', $field_parent);
+ $fieldsObj->setVar('field_parent', $field_parent);*/
+ for( $i = 1; $i <= $field_numb; $i++ ) {
+ $fld_parent = intval($_GET['field_parent'][$i]);
+ $field_parent = ($i == $fld_parent) ? '1' : '0';
+ $fieldsObj->setVar('field_parent', $field_parent);
+ }
} elseif (isset($_GET['field_inlist'])) {
$fld_inlist = intval($_GET['field_inlist']);
$field_inlist = ($fld_inlist == 1) ? 0 : 1;
@@ -295,9 +300,14 @@
$field_block = ($fld_block == 1) ? 0 : 1;
$fieldsObj->setVar('field_block', $field_block);
} elseif (isset($_GET['field_main'])) {
- $fld_main = intval($_GET['field_main']);
+ /*$fld_main = intval($_GET['field_main']);
$field_main = ($fld_main == 1) ? 0 : 1;
- $fieldsObj->setVar('field_main', $field_main);
+ $fieldsObj->setVar('field_main', $field_main);*/
+ for( $i = 1; $i <= $field_numb; $i++ ) {
+ $fld_main = intval($_GET['field_main'][$i]);
+ $field_main = ($i == $fld_main) ? '1' : '0';
+ $fieldsObj->setVar('field_main', $field_main);
+ }
} elseif (isset($_GET['field_search'])) {
$fld_search = intval($_GET['field_search']);
$field_search = ($fld_search == 1) ? 0 : 1;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -182,7 +182,7 @@
} else {
// Box header row
$parameters_tray = new XoopsFormElementTray('', '<br />');
- /*$parameters_header = new TDMCreateFormLabel('<div class="portlet"><div class="portlet-header">Images</div></div>')
+ /*$parameters_header = new TDMCreateFormLabel('<div class="portlet"><div class="portlet-header">_AM_TDMCREATE_FIELD_PARAMETERS_LIST</div></div>')
$parameters_tray->addElement($parameters_header); */
// Field Elements
$criteria_element = new CriteriaCompo();
@@ -259,24 +259,12 @@
*/
class TDMCreateFieldsHandler extends XoopsPersistableObjectHandler
{
- /**
- * @var mixed
- */
- public $tdmcreate = null;
-
- /**
- * @var mixed
- */
- public $table = null;
-
/*
* @public function constructor class
* @param mixed $db
*/
public function __construct(&$db)
{
- $this->tdmcreate = TDMCreate::getInstance();
- //$this->table = TDMCreateTables::getInstance();
parent::__construct($db, 'mod_tdmcreate_fields', 'tdmcreatefields', 'field_tid', 'field_name');
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -50,8 +50,8 @@
public function write($module, $table, $tables, $filename) {
$this->setModule($module);
$this->setFileName($filename);
- $this->table = $table;
- $this->tables = $tables;
+ $this->setTable($table);
+ $this->setTables($tables);
}
/*
* @public function render
@@ -59,9 +59,10 @@
*/
public function render() {
$module = $this->getModule();
+ $table = $this->getTable();
+ $tables = $this->getTables();
$filename = $this->getFileName();
$module_name = $module->getVar('mod_name');
- //$table = $this->getTable();
$stl_mod_name = strtolower($module_name);
$ucfmod_name = ucfirst($module_name);
$language = $this->getLanguage('AM');
@@ -71,31 +72,36 @@
\$thisPath = dirname(dirname(__FILE__));
include_once \$thisPath.'/include/common.php';
include_once \$thisPath.'/include/functions.php';
+//\n
EOT;
- if ( $this->table->getVar('table_name') != '' ) {
+ if ( $table->getVar('table_name') != '' ) {
$content .= <<<EOT
-\ninclude_once \$thisPath.'/class/helper.php';
+include_once \$thisPath.'/class/helper.php';
// Get instance
-\${$stl_mod_name}Helper = {$ucfmod_name}Helper::getInstance();
+\${$stl_mod_name}Helper = {$ucfmod_name}Helper::getInstance();\n
EOT;
}
$content .= <<<EOT
-\n\n\$thisModule = \$GLOBALS['xoopsModule']->getVar('dirname');
+\$thisModule = \$GLOBALS['xoopsModule']->getVar('dirname');
\$sysPathIcon16 = '../' . \$xoopsModule->getInfo('sysicons16');
\$sysPathIcon32 = '../' . \$xoopsModule->getInfo('sysicons32');
\$pathModuleAdmin = \$GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
\$modPathIcon16 = \$xoopsModule->getInfo('modicons16');
-\$modPathIcon32 = \$xoopsModule->getInfo('modicons32');\n
+\$modPathIcon32 = \$xoopsModule->getInfo('modicons32');
+//\n
EOT;
- foreach (array_keys($this->tables) as $i)
+ foreach (array_keys($tables) as $i)
{
- $table_name = $this->tables[$i]->getVar('table_name');
- $content .= '$'.$table_name.'Handler =& xoops_getModuleHandler(\''.$table_name. '\', $thisModule);'.PHP_EOL;
+ $table_name = $tables[$i]->getVar('table_name');
+ $content .= <<<EOT
+\${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', \$thisModule);\n
+EOT;
}
$content .=<<<EOT
-\n\n\$myts =& MyTextSanitizer::getInstance();
+//
+\$myts =& MyTextSanitizer::getInstance();
if (!isset(\$xoopsTpl) || !is_object(\$xoopsTpl)) {
include_once(XOOPS_ROOT_PATH."/class/template.php");
\$xoopsTpl = new XoopsTpl();
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-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -54,7 +54,7 @@
*/
public function write($module, $table) {
$this->setModule($module);
- $this->table = $table;
+ $this->setTable($table);
}
/*
* @public function getAdminPagesHeader
@@ -170,25 +170,31 @@
\${$table_name}Obj =& \${$table_name}Handler->get(\$_REQUEST['{$fpif}']);
} else {
\${$table_name}Obj =& \${$table_name}Handler->create();
- }
+ }\n
EOT;
-
foreach (array_keys($fields) as $f)
{
$field_name = $fields[$f]->getVar('field_name');
$field_element = $fields[$f]->getVar('field_element');
- /*if(($field_element == 1) || ($field_element == 2) || ($field_element == 3) || ($field_element > 11)) {
- $this->adminobjects->getSimpleSetVar($table_name, $field_name);
- } else*/if(($field_element == 4) || ($field_element == 5)) {
- $this->adminobjects->getCheckBoxOrRadioYN($table_name, $field_name);
- } elseif($field_element == 9) {
- $this->adminobjects->getUploadImage($module_name, $table_name, $field_name);
- } elseif($field_element == 10) {
- $this->adminobjects->getUploadFile($module_name, $table_name, $field_name);
- } elseif($field_element == 11) {
- $this->adminobjects->getTextDateSelect($table_name, $field_name);
- } else {
- $this->adminobjects->getSimpleSetVar($table_name, $field_name);
+ if($f > 0) {
+ switch($field_element) {
+ case 4:
+ case 5:
+ $ret .= $this->adminobjects->getCheckBoxOrRadioYN($table_name, $field_name);
+ break;
+ case 9:
+ $ret .= $this->adminobjects->getUploadImage($module_name, $table_name, $field_name);
+ break;
+ case 10:
+ $ret .= $this->adminobjects->getUploadFile($module_name, $table_name, $field_name);
+ break;
+ case 11:
+ $ret .= $this->adminobjects->getTextDateSelect($table_name, $field_name);
+ break;
+ default:
+ $ret .= $this->adminobjects->getSimpleSetVar($table_name, $field_name);
+ break;
+ }
}
}
@@ -271,32 +277,28 @@
*/
public function renderFile($filename)
{
- $fpif = ''; $fpmf = '';
- $table_id = $this->table->getVar('table_id');
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach(array_keys($fields_all) as $f)
+ $module = $this->getModule();
+ $table = $this->getTable();
+ $module_name = $module->getVar('mod_name');
+ $table_name = $table->getVar('table_name');
+ $language = $this->getLanguage($module_name, 'AM');
+ $fpif = ''; $fpmf = '';
+ $fields = $this->getTableFields($table->getVar('table_id'));
+ foreach(array_keys($fields) as $f)
{
- $field_name = $fields_all[$f]->getVar('field_name');
+ $field_name = $fields[$f]->getVar('field_name');
if($f == 0) {
$fpif = $field_name;
}
- if($fields_all[$f]->getVar('field_main') == 1) {
+ if($fields[$f]->getVar('field_main') == 1) {
$fpmf = $field_name;
}
- }
- $module = $this->getModule();
- $module_name = $module->getVar('mod_name');
- $table_name = $this->table->getVar('table_name');
- //$filename = $this->getFileName();
- $language = $this->getLanguage($module_name, 'AM');
+ }
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getAdminPagesHeader($module_name, $table_name);
- $content .= $this->getAdminPagesList($table_name, $language, $fields_all, $fpif, $fpmf);
+ $content .= $this->getAdminPagesList($table_name, $language, $fields, $fpif, $fpmf);
$content .= $this->getAdminPagesNew($table_name, $language);
- $content .= $this->getAdminPagesSave($module_name, $table_name, $language, $fields_all, $fpif, $fpmf);
+ $content .= $this->getAdminPagesSave($module_name, $table_name, $language, $fields, $fpif, $fpmf);
$content .= $this->getAdminPagesEdit($table_name, $language, $fpif);
$content .= $this->getAdminPagesDelete($table_name, $language, $fpif, $fpmf);
$content .= $this->getAdminPagesFooter();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -52,7 +52,7 @@
public function write($module, $tables, $filename) {
$this->setModule($module);
$this->setFileName($filename);
- $this->tables = $tables;
+ $this->setTables($tables);
}
/*
* @public function render
@@ -140,27 +140,22 @@
*/
public function getBodyPermissionsCode($module_name, $language)
{
- $table_permissions = ''; $table_name = '';
- foreach(array_keys($this->tables) as $t)
+ $tables = $this->getTables();
+ foreach(array_keys($tables) as $t)
{
- $table_id = $this->tables[$t]->getVar('table_id');
- $table_permissions = $this->tables[$t]->getVar('table_permissions');
- if($table_permissions == 1) {
- $table_name = $this->tables[$t]->getVar('table_name');
+ $table_id = $tables[$t]->getVar('table_id');
+ if($tables[$t]->getVar('table_permissions') == 1) {
+ $table_name = $tables[$t]->getVar('table_name');
}
}
- $fpif = ''; $fpmf = '';
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach(array_keys($fields_all) as $f)
+ $fields = $this->getTableFields($table_id);
+ foreach(array_keys($fields) as $f)
{
if($f == 1) {
- $fpif = $fields_all[$f]->getVar('field_name');
+ $fpif = $fields[$f]->getVar('field_name');
}
- if($fields_all[$f]->getVar('field_main') == 1) {
- $fpmf = $fields_all[$f]->getVar('field_name');
+ if($fields[$f]->getVar('field_main') == 1) {
+ $fpmf = $fields[$f]->getVar('field_name');
}
}
$ret = <<<PRM
@@ -214,7 +209,6 @@
$module = $this->getModule();
$filename = $this->getFileName();
$module_name = strtolower($module->getVar('mod_name'));
- //$table_name = $this->table->getVar('table_name');
$language = $this->getLanguage($module_name, 'AM');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getHeaderPermissionsCode($module_name, $language);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -245,7 +245,7 @@
$ret[] = $userPages->renderFile($table_name.'.php');
// User Templates File
$userTemplates = UserTemplates::getInstance();
- $userTemplates->write($module, $table, $tables);
+ $userTemplates->write($module, $table);
$ret[] = $userTemplates->renderFile($table_name.'.tpl');
}
var_dump($table_name);
@@ -254,14 +254,14 @@
if ( $table_admin == 1) {
// Language Admin File
$languageAdmin = LanguageAdmin::getInstance();
- $languageAdmin->write($module, $table, $tables, 'admin.php');
+ $languageAdmin->write($module, $tables, 'admin.php');
$ret[] = $languageAdmin->render();
}
// Creation of blocks language file
if ( $table_blocks == 1) {
// Language Blocks File
$languageBlocks = LanguageBlocks::getInstance();
- $languageBlocks->write($module, $table, $tables, 'blocks.php');
+ $languageBlocks->write($module, $tables, 'blocks.php');
$ret[] = $languageBlocks->render();
}
// Creation of user language file
@@ -287,7 +287,7 @@
$ret[] = $templatesHeader->render();
// User Index File
$userIndex = UserIndex::getInstance();
- $userIndex->write($module, $table, 'index.php');
+ $userIndex->write($module, 'index.php');
$ret[] = $userIndex->render();
}
// Creation of admin files
@@ -327,7 +327,7 @@
if ( $table_name != null) {
// Sql File
$sqlFile = SqlFile::getInstance();
- $sqlFile->write($module, $table, $tables, 'mysql.sql');
+ $sqlFile->write($module, $tables, 'mysql.sql');
$ret[] = $sqlFile->render();
}
// Creation of search file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_files.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_files.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_files.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -49,22 +49,19 @@
*/
public function write($module, $table) {
$this->setModule($module);
- $this->table = $table;
+ $this->setTable($table);
}
/*
* @public function getBlocksShow
* @param null
*/
- public function getBlocksShow($module, $fields_all, $fpif, $fpmf) {
- $mod_name = $module->getVar('mod_name');
- $mod_name_lowercase = strtolower($mod_name);
- $table_name = $this->table->getVar('table_name');
- $table_fieldname = $this->table->getVar('table_fieldname');
+ public function getBlocksShow($module_name, $table_name, $table_fieldname, $table_category, $fields, $fpif, $fpmf) {
+ $mod_name_lowercase = strtolower($module_name);
$ret = <<<EOT
-include_once XOOPS_ROOT_PATH.'/modules/{$mod_name}/include/functions.php';
+include_once XOOPS_ROOT_PATH.'/modules/{$module_name}/include/functions.php';
function b_{$mod_name_lowercase}_{$table_name}_show(\$options)
{
- include_once XOOPS_ROOT_PATH.'/modules/{$mod_name}/class/{$table_name}.php';
+ include_once XOOPS_ROOT_PATH.'/modules/{$mod_name_lowercase}/class/{$table_name}.php';
\$myts =& MyTextSanitizer::getInstance();
\${$table_fieldname} = array();
@@ -72,22 +69,22 @@
\$nb_{$table_name} = \$options[1];
\$lenght_title = \$options[2];
- \${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', '{$mod_name}');
+ \${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', '{$module_name}');
\$criteria = new CriteriaCompo();
array_shift(\$options);
array_shift(\$options);
- array_shift(\$options);
+ array_shift(\$options);\n
EOT;
- if ( $this->table->getVar('table_category') == 1 ) {
+ if ( $table_category == 1 ) {
$ret .= <<<EOT
- \n\tif (!(count(\$options) == 1 && \$options[0] == 0)) {
- \$criteria->add(new Criteria('{$table_fieldname}_category', {$mod_name}_block_addCatSelect(\$options), 'IN'));
- }
+ if (!(count(\$options) == 1 && \$options[0] == 0)) {
+ \$criteria->add(new Criteria('{$table_fieldname}_category', {$mod_name_lowercase}_block_addCatSelect(\$options), 'IN'));
+ }\n
EOT;
}
$ret .= <<<EOT
- \n\tif (\$type_block)
+ if (\$type_block)
{
\$criteria->add(new Criteria('{$fpif}', 0, '!='));
\$criteria->setSort('{$fpif}');
@@ -97,13 +94,13 @@
\$criteria->setLimit(\$nb_{$table_name});
\${$table_name}_arr = \${$table_name}Handler->getAll(\$criteria);
foreach (array_keys(\${$table_name}_arr) as \$i)
- {
+ {\n
EOT;
- foreach(array_keys($fields_all) as $f)
+ foreach(array_keys($fields) as $f)
{
- if( $fields_all[$f]->getVar('field_block') == 1 ) {
+ if( $fields[$f]->getVar('field_block') == 1 ) {
$ret .= <<<EOT
-\n\t\t\${$table_fieldname}['{$fpmf}'] = \${$table_name}_arr[\$i]->getVar('{$fpmf}');\n
+ \${$table_fieldname}['{$fpmf}'] = \${$table_name}_arr[\$i]->getVar('{$fpmf}');\n
EOT;
}
}
@@ -118,34 +115,31 @@
* @public function getBlocksEdit
* @param null
*/
- public function getBlocksEdit($module, $fpif, $fpmf, $language) {
- $mod_name = $module->getVar('mod_name');
- $mod_name_lowercase = strtolower($mod_name);
- $table_name = $this->table->getVar('table_name');
- $table_fieldname = $this->table->getVar('table_fieldname');
+ public function getBlocksEdit($module_name, $table_name, $table_category, $fpif, $fpmf, $language) {
+ $mod_name_lowercase = strtolower($module_name);
$ret = <<<EOT
function b_{$mod_name_lowercase}_{$table_name}_edit(\$options)
-{
+{\n
EOT;
- if ( $this->table->getVar('table_category') == 1 ) {
+ if ( $table_category == 1 ) {
$ret .=<<<EOT
- \ninclude_once XOOPS_ROOT_PATH.'/modules/{$mod_name}/class/category.php';
+ include_once XOOPS_ROOT_PATH.'/modules/{$module_name}/class/category.php';
- \$categoryHandler =& xoops_getModuleHandler('category', "{$mod_name}");
+ \$categoryHandler =& xoops_getModuleHandler('category', "{$module_name}");
\$criteria = new CriteriaCompo();
\$criteria->setSort("{$fpmf}");
\$criteria->setOrder("ASC");
- \${$table_name}_arr = \$categoryHandler->getall(\$criteria);
+ \${$table_name}_arr = \$categoryHandler->getall(\$criteria);\n
EOT;
}
$ret .= <<<EOT
- \ninclude_once XOOPS_ROOT_PATH.'/modules/{$mod_name}/class/{$table_name}.php';
+ include_once XOOPS_ROOT_PATH.'/modules/{$module_name}/class/{$table_name}.php';
\$form = {$language}DISPLAY;
\$form .= "<input type='hidden' name='options[0]' value='".\$options[0]."' />";
\$form .= "<input name='options[1]' size='5' maxlength='255' value='".\$options[1]."' type='text' /> <br />";
\$form .= {$language}TITLELENGTH." : <input name='options[2]' size='5' maxlength='255' value='".\$options[2]."' type='text' /><br /><br />";
- \${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', '{$mod_name}');
+ \${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', '{$module_name}');
\$criteria = new CriteriaCompo();
array_shift(\$options);
array_shift(\$options);
@@ -172,29 +166,26 @@
*/
public function renderFile($filename)
{
- $fpif = ''; $fpmf = '';
- $table_id = $this->table->getVar('table_id');
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach(array_keys($fields_all) as $f)
+ $module = $this->getModule();
+ $table = $this->getTable();
+ $module_name = $module->getVar('mod_name');
+ $table_name = $table->getVar('table_name');
+ $table_fieldname = $table->getVar('table_fieldname');
+ $table_category = $table->getVar('table_category');
+ $language = $this->getLanguage($module_name, 'MB');
+ $fields = $this->getTableFields($table->getVar('table_id'));
+ foreach(array_keys($fields) as $f)
{
- if($f == 1) {
- $fpif = $fields_all[$f]->getVar('field_name');
+ if($f == 0) {
+ $fpif = $fields[$f]->getVar('field_name');
}
- if($fields_all[$f]->getVar('field_main') == 1) {
- $fpmf = $fields_all[$f]->getVar('field_name');
+ if($fields[$f]->getVar('field_main') == 1) {
+ $fpmf = $fields[$f]->getVar('field_name');
}
- }
- $module = $this->getModule();
- $module_name = $module->getVar('mod_name');
- //$table = $this->getTable();
- //$filename = $this->getFileName();
- $language = $this->getLanguage($module_name, 'MB');
+ }
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= $this->getBlocksShow($module, $fields_all, $fpif, $fpmf);
- $content .= $this->getBlocksEdit($module, $fpif, $fpmf, $language);
+ $content .= $this->getBlocksShow($module_name, $table_name, $table_fieldname, $table_category, $fields, $fpif, $fpmf);
+ $content .= $this->getBlocksEdit($module_name, $table_name, $table_category, $fpif, $fpmf, $language);
//
$this->tdmcfile->create($module_name, 'blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_templates.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_templates.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_templates.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -49,7 +49,7 @@
*/
public function write($module, $table) {
$this->setModule($module);
- $this->table = $table;
+ $this->setTable($table);
}
/*
* @public function render
@@ -57,37 +57,32 @@
*/
public function renderFile($filename) {
$module = $this->getModule();
- $table_fieldname = $this->table->getVar('table_fieldname');
- //$fields = $this->getFields();
- //$filename = $this->getFileName();
+ $table = $this->getTable();
$module_name = $module->getVar('mod_name');
+ $table_name = $table->getVar('table_name');
+ $table_fieldname = $table->getVar('table_fieldname');
$language = $this->getLanguage($module_name, 'MB');
- //$content = $this->getHeaderFilesComments($module, $filename);
$content = <<<EOT
<table class="outer">
<tr class="head">\n
EOT;
- $table_id = $this->table->getVar('table_id');
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach(array_keys($fields_all) as $f)
+ $fields = $this->getTableFields($table->getVar('table_id'));
+ foreach(array_keys($fields) as $f)
{
- $lng_field_name = $language.strtoupper($fields_all[$f]->getVar('field_name'));
+ $lng_field_name = $language.strtoupper($fields[$f]->getVar('field_name'));
$content .= <<<EOT
<th><{\$smarty.const.{$lng_field_name}}></th>\n
EOT;
}
$content .= <<<EOT
</tr>
- <{foreachq item={$table_fieldname} from=\${$table_fieldname}}>
+ <{foreachq item={$table_fieldname} from=\${$table_name}}>
<tr class = "<{cycle values = 'even,odd'}>">\n
EOT;
- foreach(array_keys($fields_all) as $f)
+ foreach(array_keys($fields) as $f)
{
- $table_field_name = $table_fieldname.'.'.strip_tags($fields_all[$f]->getVar('field_name'));
+ $table_field_name = $table_fieldname.'.'.strip_tags($fields[$f]->getVar('field_name'));
$content .= <<<EOT
<td><{\${$table_field_name}}></td>\n
EOT;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -56,8 +56,8 @@
*/
public function write($module, $table, $tables) {
$this->setModule($module);
- $this->table = $table;
- $this->tables = $tables;
+ $this->setTable($table);
+ $this->setTables($tables);
}
/*
* @public function getInitVar
@@ -72,15 +72,15 @@
}
/*
* @public function getInitVars
- * @param array $fields_all
+ * @param array $fields
*/
- public function getInitVars($fields_all) {
+ public function getInitVars($fields) {
$ret = '';
// Creation of the initVar functions list
- foreach (array_keys($fields_all) as $f)
+ foreach (array_keys($fields) as $f)
{
- $field_name = $fields_all[$f]->getVar('field_name');
- $field_type = $fields_all[$f]->getVar('field_type');
+ $field_name = $fields[$f]->getVar('field_name');
+ $field_type = $fields[$f]->getVar('field_type');
switch($field_type) {
case 'INT':
case 'TINYINT':
@@ -129,7 +129,7 @@
* @public function getHeadClass
* @param mixed $constructor
*/
- public function getHeadClass($module_name, $table_name, $fields_all) {
+ public function getHeadClass($module_name, $table_name, $fields) {
$ucf_module_name = ucfirst($module_name);
$ucf_table_name = ucfirst($table_name);
$ret = <<<EOT
@@ -147,7 +147,7 @@
public function __construct()
{
\$this->XoopsObject();
- {$this->getInitVars($fields_all)}
+ {$this->getInitVars($fields)}
}\n
EOT;
return $ret;
@@ -273,36 +273,33 @@
*/
public function renderFile($filename) {
$module = $this->getModule();
- $table_nbfields = $this->table->getVar('table_nbfields');
- $table_name = $this->table->getVar('table_name');
+ $table = $this->getTable();
+ $table_nbfields = $table->getVar('table_nbfields');
+ $table_name = $table->getVar('table_name');
//$fields = $this->getFields();
//$filename = $this->getFileName();
$module_name = strtolower($module->getVar('mod_name'));
$fpif = ''; $fpmf = '';
$initvar_functions = array();
- $table_id = $this->table->getVar('table_id');
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach(array_keys($fields_all) as $f)
+ $fields = $this->getTableFields($table->getVar('table_id'));
+ foreach(array_keys($fields) as $f)
{
- $field_name = $fields_all[$f]->getVar('field_name');
- if(($f == 0) && ($this->table->getVar('table_autoincrement') == 1)) {
+ $field_name = $fields[$f]->getVar('field_name');
+ if(($f == 0) && ($table->getVar('table_autoincrement') == 1)) {
$fpif = $field_name;
}
- if($fields_all[$f]->getVar('field_main') == 1) {
+ if($fields[$f]->getVar('field_main') == 1) {
$fpmf = $field_name;
}
}
- //$initvar = $this->getInitVars($fields_all);
- $this->formelements->initForm($module, $this->table);
+ //$initvar = $this->getInitVars($fields);
+ $this->formelements->initForm($module, $table);
$elements_form = $this->formelements->renderElement();
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= $this->getHeadClass($module_name, $table_name, $fields_all);
+ $content .= $this->getHeadClass($module_name, $table_name, $fields);
$content .= $this->getHeadFunctionForm($module_name, $elements_form);
- if ($this->table->getVar('table_permissions') == 1) {
+ if ($table->getVar('table_permissions') == 1) {
$content .= $this->getPermissionsInFunctionForm($module_name, $fpif);
}
$content .= $this->getFootFunctionForm();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -20,9 +20,9 @@
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'abstract.php';
+require_once 'tablefields.php';
xoops_load('XoopsFile');
-class TDMCreateFile extends TDMCreateAbstract
+class TDMCreateFile extends TDMCreateTableFields
{
/*
* @var string
@@ -80,19 +80,14 @@
/*
* @var string
*/
- protected $tdmcfile = null;
+ protected $tdmcfile = null;
/*
- * @var string
- */
- protected $tdmcreate = null;
-
- /*
* @public function constructor
* @param null
*/
public function __construct() {
- $this->xoopsfile = XoopsFile::getHandler();
+ $this->xoopsfile = XoopsFile::getHandler();
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -49,7 +49,7 @@
*/
public function write($module, $table) {
$this->setModule($module);
- $this->table = $table;
+ $this->setTable($table);
}
/*
* @public function getCommentsIncludes
@@ -74,20 +74,16 @@
*/
public function renderCommentsNew($module, $filename)
{
+ $table = $this->getTable();
$module_name = strtolower($module->getVar('mod_name'));
- $table_name = $this->table->getVar('table_name');
- $table_fieldname = $this->table->getVar('table_fieldname');
+ $table_name = $table->getVar('table_name');
+ $table_fieldname = $table->getVar('table_fieldname');
$fpmf = null;
- $table_id = $this->table->getVar('table_id');
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach(array_keys($fields_all) as $f)
+ $fields = $this->getTableFields($table->getVar('table_id'));
+ foreach(array_keys($fields) as $f)
{
- $field_name = $fields_all[$f]->getVar('field_name');
- if($fields_all[$f]->getVar('field_main') == 1) {
- $fpmf = $field_name;
+ if($fields[$f]->getVar('field_main') == 1) {
+ $fpmf = $fields[$f]->getVar('field_name');
}
}
$content = $this->getHeaderFilesComments($module, $filename.'.php');
@@ -111,7 +107,7 @@
*/
/*public function render() {
$module = $this->getModule();
- //$fields = $this->getFields();
+ $table = $this->getTable();
$filename = $this->getFileName();
$module_name = $module->getVar('mod_name');
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-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_install.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -50,8 +50,8 @@
*/
public function write($module, $tables, $filename) {
$this->setModule($module);
- $this->setFileName($filename);
- $this->tables = $tables;
+ $this->setTables($tables);
+ $this->setFileName($filename);
}
/*
* @public function render
@@ -61,8 +61,7 @@
{
$module = $this->getModule();
$module_name = strtolower($module->getVar('mod_name'));
- //$table = $this->getTable();
- //$fields = $this->getFields();
+ $tables = $this->getTables();
$filename = $this->getFileName();
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
@@ -77,21 +76,17 @@
copy(\$indexFile, \${$module_name}.'/index.html');
EOT;
$field_element = '';
- foreach (array_keys($this->tables) as $t)
+ foreach (array_keys($tables) as $t)
{
- $table_name = $this->tables[$t]->getVar('table_name');
- $table_id = $this->tables[$t]->getVar('table_id');
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach(array_keys($fields_all) as $f) {
+ $table_name = $tables[$t]->getVar('table_name');
+ $fields = $this->getTableFields($tables[$t]->getVar('table_id'));
+ foreach(array_keys($fields) as $f) {
{
- $field_name = $fields_all[$f]->getVar('field_name');
- if ( ($f > 1) && ($this->tables[$t]->getVar('table_autoincrement') == 1) ) {
- $field_element = $fields_all[$f]->getVar('field_element');
+ $field_name = $fields[$f]->getVar('field_name');
+ if ( ($f > 0) && ($tables[$t]->getVar('table_autoincrement') == 1) ) {
+ $field_element = $fields[$f]->getVar('field_element');
}
- if ( $f == 1 ) {
+ if ( $f == 0 ) {
$content .= <<<EOT
\n// Making of {$table_name} uploads folder
\${$table_name} = \${$module_name}.'/{$table_name}';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -47,13 +47,12 @@
* @public function write
* @param string $module
* @param mixed $table
- * @param string $fields
* @param string $filename
*/
public function write($module, $table, $filename) {
$this->setModule($module);
$this->setFileName($filename);
- $this->table = $table;
+ $this->setTable($table);
}
/*
* @static function getNotificationsFunction
@@ -61,20 +60,17 @@
*/
public function getNotificationsFunction($module_name)
{
- $table_name = $this->table->getVar('table_name');
- $table_fieldname = $this->table->getVar('table_fieldname');
+ $table = $this->getTable();
+ $table_name = $table->getVar('table_name');
+ $table_fieldname = $table->getVar('table_fieldname');
$fpif = null; $fpmf = null;
- $table_id = $this->table->getVar('table_id');
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach(array_keys($fields_all) as $i) {
- $field_name = $fields_all[$i]->getVar('field_name');
- if(($i == 1) && ($this->table->getVar('table_autoincrement') == 1)) {
+ $fields = $this->getTableFields($table->getVar('table_id'));
+ foreach(array_keys($fields) as $i) {
+ $field_name = $fields[$i]->getVar('field_name');
+ if(($i == 1) && ($table->getVar('table_autoincrement') == 1)) {
$fpif = $field_name;
}
- if($fields_all[$i]->getVar('field_main') == 1) {
+ if($fields[$i]->getVar('field_main') == 1) {
$fpmf = $field_name;
}
}
@@ -138,8 +134,6 @@
*/
public function render() {
$module = $this->getModule();
- //$table = $this->getTable();
- //$fields = $this->getFields();
$filename = $this->getFileName();
$module_name = strtolower($module->getVar('mod_name'));
$content = $this->getHeaderFilesComments($module, $filename);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_search.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_search.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_search.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -47,13 +47,12 @@
* @public function write
* @param string $module
* @param mixed $table
- * @param string $fields
* @param string $filename
*/
public function write($module, $table, $filename) {
$this->setModule($module);
$this->setFileName($filename);
- $this->table = $table;
+ $this->setTable($table);
}
/*
* @static function getSearchField
@@ -66,7 +65,7 @@
$sql = '';
if(isset($fpsf)) {
$nb_fpsf = count($fpsf);
- $sql = '(';
+ $sql .= '(';
for($i = 0; $i < $nb_fpsf; $i++)
{
if ( $i != $nb_fpsf - 1 ) {
@@ -85,24 +84,21 @@
*/
public function getSearchFunction($module_name)
{
- $table_name = $this->table->getVar('table_name');
- $table_fieldname = $this->table->getVar('table_fieldname');
+ $table = $this->getTable();
+ $table_name = $table->getVar('table_name');
+ $table_fieldname = $table->getVar('table_fieldname');
$fpif = ''; $fpsf = null;
- $table_id = $this->table->getVar('table_id');
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach(array_keys($fields_all) as $f)
+ $fields = $this->getTableFields($table->getVar('table_id'));
+ foreach(array_keys($fields) as $f)
{
- $field_name = $fields_all[$f]->getVar('field_name');
- if(($f > 1) && ($this->table->getVar('table_autoincrement') == 1)) {
+ $field_name = $fields[$f]->getVar('field_name');
+ if(($f == 0) && ($table->getVar('table_autoincrement') == 1)) {
$fpif = $field_name;
}
- if($fields_all[$f]->getVar('field_main') == 1) {
+ if($fields[$f]->getVar('field_main') == 1) {
$fpmf = $field_name;
}
- if($fields_all[$f]->getVar('field_search') == 1) {
+ if($fields[$f]->getVar('field_search') == 1) {
$fpsf = $field_name;
}
}
@@ -152,8 +148,6 @@
*/
public function render() {
$module = $this->getModule();
- //$table = $this->getTable();
- //$fields = $this->getFields();
$filename = $this->getFileName();
$module_name = strtolower($module->getVar('mod_name'));
$content = $this->getHeaderFilesComments($module, $filename);
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-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -44,15 +44,13 @@
/*
* @public function write
* @param string $module
- * @param mixed $table
- * @param string $fields
+ * @param string $tables
* @param string $filename
*/
- public function write($module, $table, $tables, $filename) {
+ public function write($module, $tables, $filename) {
$this->setModule($module);
- $this->setFileName($filename);
- $this->table = $table;
- $this->tables = $tables;
+ $this->setTables($tables);
+ $this->setFileName($filename);
}
/*
* @public function render
@@ -60,20 +58,17 @@
*/
public function render() {
$module = $this->getModule();
- //$table = $this->getTable();
- $fields = $this->getFields();
+ $tables = $this->getTables();
$filename = $this->getFileName();
- $module_name = $module->getVar('mod_name');
- $table_name = $this->table->getVar('table_name');
-
+ $module_name = $module->getVar('mod_name');
$language = $this->getLanguage($module_name, 'AM');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
\n//Admin
EOT;
- foreach (array_keys($this->tables) as $i)
+ foreach (array_keys($tables) as $i)
{
- $table_name = $this->tables[$i]->getVar('table_name');
+ $table_name = $tables[$i]->getVar('table_name');
$stu_table_name = strtoupper($table_name);
$table_name_nohs = strtolower($table_name);
$content .= <<<EOT
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -45,16 +45,13 @@
/*
* @public function write
* @param string $module
- * @param mixed $table
* @param mixed $tables
- * @param string $fields
* @param string $filename
*/
- public function write($module, $table, $tables, $filename) {
+ public function write($module, $tables, $filename) {
$this->setModule($module);
$this->setFileName($filename);
- $this->table = $table;
- $this->tables = $tables;
+ $this->setTables($tables);
}
/*
* @public function render
@@ -62,13 +59,9 @@
*/
public function render() {
$module = $this->getModule();
- //$table = $this->getTable();
- //$fields = $this->getFields();
+ $tables = $this->getTables();
$filename = $this->getFileName();
- $module_name = $module->getVar('mod_name');
- $table_name = $this->table->getVar('table_name');
- $table_fieldname = $this->table->getVar('table_fieldname');
- $table_nbfields = $this->table->getVar('table_nbfields');
+ $module_name = $module->getVar('mod_name');
$language = $this->getLanguage($module_name, 'MB');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
@@ -78,13 +71,13 @@
define('{$language}CATTODISPLAY', "Categories to Display");
define('{$language}ALLCAT', "All Categories");
EOT;
- foreach (array_keys($this->tables) as $i)
+ foreach (array_keys($tables) as $i)
{
- $table_id = $this->tables[$i]->getVar('table_id');
- $table_name = $this->tables[$i]->getVar('table_name');
- $table_fieldname = $this->tables[$i]->getVar('table_fieldname');
+ $table_id = $tables[$i]->getVar('table_id');
+ $table_name = $tables[$i]->getVar('table_name');
+ $table_fieldname = $tables[$i]->getVar('table_fieldname');
$nb_caracteres = strlen($table_fieldname);
- $table_blocks = $this->tables[$i]->getVar('table_blocks');
+ $table_blocks = $tables[$i]->getVar('table_blocks');
$language1 = $language.strtoupper($table_fieldname);
$fpif = '';
$criteria_fields = new CriteriaCompo();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -52,8 +52,8 @@
public function write($module, $table, $tables, $filename) {
$this->setModule($module);
$this->setFileName($filename);
- $this->table = $table;
- $this->tables = $tables;
+ $this->setTable($table);
+ $this->setTables($tables);
}
/*
* @public function render
@@ -61,14 +61,10 @@
*/
public function render() {
$module = $this->getModule();
- //$table = $this->getTable();
- //$fields = $this->getFields();
+ $tables = $this->getTables();
$filename = $this->getFileName();
$module_name = $module->getVar('mod_name');
- $module_description = $module->getVar('mod_description');
- $table_name = $this->table->getVar('table_name');
- $table_fieldname = $this->table->getVar('table_fieldname');
- $table_nbfields = $this->table->getVar('table_nbfields');
+ $module_description = $module->getVar('mod_description');
$ucf_mod_name = ucfirst($module_name);
$language = $this->getLanguage($module_name, 'MA');
$content = $this->getHeaderFilesComments($module, $filename);
@@ -77,42 +73,37 @@
define('{$language}INDEX', "Home");
define('{$language}TITLE', "{$ucf_mod_name}");
define('{$language}DESC', "{$module_description}");
-define('{$language}INDEX_DESC', "{$module_description}");
+define('{$language}INDEX_DESC', "{$module_description}");\n
EOT;
- foreach (array_keys($this->tables) as $i)
+ foreach (array_keys($tables) as $i)
{
- $table_name = $this->tables[$i]->getVar('table_name');
- $table_fieldname = $this->tables[$i]->getVar('table_fieldname');
+ $table_name = $tables[$i]->getVar('table_name');
+ $table_fieldname = $tables[$i]->getVar('table_fieldname');
$nb_caracteres = strlen($table_fieldname);
- $table_blocks = $this->tables[$i]->getVar('table_blocks');
+ $table_blocks = $tables[$i]->getVar('table_blocks');
$lng_stu_table_name = $language.strtoupper($table_name);
$ucf_table_name = UcFirstAndToLower($table_name);
$content .= <<<EOT
-\n\ndefine('{$lng_stu_table_name}', "{$ucf_table_name}");
-define('{$lng_stu_table_name}_DESC', "{$ucf_table_name} description");
+define('{$lng_stu_table_name}', "{$ucf_table_name}");
+define('{$lng_stu_table_name}_DESC', "{$ucf_table_name} description");\n
EOT;
- $fpif = '';
- $table_id = $this->tables[$i]->getVar('table_id');
- $criteria_fields = new CriteriaCompo();
- $criteria_fields->add(new Criteria('field_tid', $table_id));
- $fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
- unset($criteria_fields);
- foreach (array_keys($fields_all) as $f)
+ $fields = $this->getTableFields($tables[$i]->getVar('table_id'));
+ foreach (array_keys($fields) as $f)
{
- $field_name = $fields_all[$f]->getVar('field_name');
- if($f == 1) {
+ $field_name = $fields[$f]->getVar('field_name');
+ if($f == 0) {
$fpif = $field_name;
}
$fields_final[$f] = substr($fpif, $nb_caracteres);
$lng_stu_fields = $language.'_'.strtoupper($table_fieldname).strtoupper($fields_final[$f]);
$ucf_fields = ucfirst($table_fieldname.str_replace("_", " ", $fields_final[$f]));
$content .= <<<EOT
-\ndefine('{$lng_stu_fields}', "{$ucf_fields}");
+define('{$lng_stu_fields}', "{$ucf_fields}");\n
EOT;
}
}
$content .= <<<EOT
-\n\ndefine('{$language}ADMIN', "Admin");
+define('{$language}ADMIN', "Admin");
EOT;
$this->tdmcfile->create($module_name, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -52,8 +52,8 @@
public function write($module, $table, $tables, $filename) {
$this->setModule($module);
$this->setFileName($filename);
- $this->table = $table;
- $this->tables = $tables;
+ $this->setTable($table);
+ $this->setTables($tables);
}
/*
* @public function render
@@ -61,16 +61,16 @@
*/
public function render() {
$module = $this->getModule();
- //$table = $this->getTable();
- //$fields = $this->getFields();
+ $table = $this->getTable();
+ $tables = $this->getTables();
$filename = $this->getFileName();
$module_name = $module->getVar('mod_name');
$module_description = $module->getVar('mod_description');
- $table_name = $this->table->getVar('table_name');
- $table_fieldname = $this->table->getVar('table_fieldname');
- $table_nbfields = $this->table->getVar('table_nbfields');
- $table_image = $this->table->getVar('table_image');
- $table_permissions = $this->table->getVar('table_permissions');
+ $table_name = $table->getVar('table_name');
+ $table_fieldname = $table->getVar('table_fieldname');
+ $table_nbfields = $table->getVar('table_nbfields');
+ $table_image = $table->getVar('table_image');
+ $table_permissions = $table->getVar('table_permissions');
$language = $this->getLanguage($module_name, 'MI');
$content = $this->getHeaderFilesComments($module, $filename);
$menu = 1;
@@ -79,81 +79,81 @@
define('{$language}NAME', "{$module_name}");
define('{$language}DESC', "{$module_description}");
//Menu
-define('{$language}ADMENU{$menu}', "Home");
+define('{$language}ADMENU{$menu}', "Home");\n
EOT;
- foreach (array_keys($this->tables) as $i)
+ foreach (array_keys($tables) as $i)
{
$menu++;
- $table_name = str_replace('_', ' ', $this->tables[$i]->getVar('table_name'));
+ $table_name = str_replace('_', ' ', $tables[$i]->getVar('table_name'));
$table_name = ucfirst($table_name);
$content .= <<<EOT
-\ndefine('{$language}ADMENU{$menu}', "{$table_name}");
+define('{$language}ADMENU{$menu}', "{$table_name}");\n
EOT;
}
if ( $table_permissions != 0 ) {
$menu++;
$content .= <<<EOT
-\ndefine('{$language}ADMENU{$menu}', "Permissions");
+define('{$language}ADMENU{$menu}', "Permissions");\n
EOT;
}
$menu++;
$content .= <<<EOT
-\ndefine('{$language}ADMENU{$menu}', "About");
+define('{$language}ADMENU{$menu}', "About");\n
EOT;
unset( $menu );
$content .= <<<EOT
-\n//Blocks
+//Blocks\n
EOT;
- foreach (array_keys($this->tables) as $i)
+ foreach (array_keys($tables) as $i)
{
- $table_name = $this->tables[$i]->getVar('table_name');
+ $table_name = $tables[$i]->getVar('table_name');
$language1 = $language.strtoupper($table_name).'';
$table_name = str_replace("_", " ", ucfirst($table_name));
- if ( $this->tables[$i]->getVar('table_blocks') == 1 ) {
+ if ( $tables[$i]->getVar('table_blocks') == 1 ) {
$content .= <<<EOT
-\ndefine('{$language1}BLOCK', "{$table_name} block");
+define('{$language1}BLOCK', "{$table_name} block");\n
EOT;
}
}
$content .= <<<EOT
-\n//Config
+//Config
define('{$language}EDITOR', "Editor");
define('{$language}EDITOR_DESC', "Select the Editor to use");
define('{$language}KEYWORDS', "Keywords");
-define('{$language}KEYWORDS_DESC', "Insert here the keywords (separate by comma)");
+define('{$language}KEYWORDS_DESC', "Insert here the keywords (separate by comma)");\n
EOT;
if ( $table_name != '' ) {
$content .= <<<EOT
-\ndefine('{$language}ADMINPAGER', "Admin pager");
+define('{$language}ADMINPAGER', "Admin pager");
define('{$language}ADMINPAGER_DESC', "Admin per page list");
define('{$language}USERPAGER', "User pager");
-define('{$language}USERPAGER_DESC', "User per page list");
+define('{$language}USERPAGER_DESC', "User per page list");\n
EOT;
}
if ( $table_image != '' )
{
$content .= <<<EOT
-\ndefine('{$language}MAXSIZE', "Max size");
+define('{$language}MAXSIZE', "Max size");
define('{$language}MAXSIZE_DESC', "Set a number of max size uploads file in byte");
define('{$language}MIMETYPES', "Mime Types");
-define('{$language}MIMETYPES_DESC', "Set the mime types selected");
+define('{$language}MIMETYPES_DESC', "Set the mime types selected");\n
EOT;
}
$content .= <<<EOT
-\ndefine('{$language}IDPAYPAL', "Paypal ID");
+define('{$language}IDPAYPAL', "Paypal ID");
define('{$language}IDPAYPAL_DESC', "Insert here your PayPal ID for donactions.");
define('{$language}ADVERTISE', "Advertisement Code");
define('{$language}ADVERTISE_DESC', "Insert here the advertisement code");
define('{$language}BOOKMARKS', "Social Bookmarks");
define('{$language}BOOKMARKS_DESC', "Show Social Bookmarks in the form");
define('{$language}FBCOMMENTS', "Facebook comments");
-define('{$language}FBCOMMENTS_DESC', "Allow Facebook comments in the form");
+define('{$language}FBCOMMENTS_DESC', "Allow Facebook comments in the form");\n
EOT;
- if ( $this->table->getVar('table_notifications') == 1 )
+ if ( $table->getVar('table_notifications') == 1 )
{
$content .= <<<EOT
-\n// Notifications
+// Notifications
define('{$language}GLOBAL_NOTIFY', "Allow Facebook comments in the form");
define('{$language}GLOBAL_NOTIFY_DESC', "Allow Facebook comments in the form");
define('{$language}CATEGORY_NOTIFY', "Allow Facebook comments in the form");
@@ -191,12 +191,12 @@
define('{$language}FILE_APPROVE_NOTIFY', "Allow Facebook comments in the form");
define('{$language}FILE_APPROVE_NOTIFY_CAPTION', "Allow Facebook comments in the form");
define('{$language}FILE_APPROVE_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}FILE_APPROVE_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
+define('{$language}FILE_APPROVE_NOTIFY_SUBJECT', "Allow Facebook comments in the form");\n
EOT;
}
if ( $table_permissions != 0 ) {
$content .= <<<EOT
-\n// Permissions Groups
+// Permissions Groups
define('{$language}GROUPS', "Groups access");
define('{$language}GROUPS_DESC', "Select general access permission for groups.");
define('{$language}ADMINGROUPS', "Admin Group Permissions");
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php 2014-06-07 10:22:26 UTC (rev 12568)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php 2014-06-09 00:03:18 UTC (rev 12569)
@@ -49,14 +49,12 @@
* @param string $module
* @param string $table
* @param string $tables
- * @param array $fields
* @param string $filename
*/
- public function write($module, $table, $tables, $filename) {
+ public function write($module, $tables, $filename) {
$this->setModule($module);
- $this->setFileName($filename);
- $this->table = $table;
- $this->tables = $tables;
+ $this->setTables($tables);
+ $this->setFileName($filename);
}
/*
@@ -110,12 +108,13 @@
public function getDatabaseTables($module_name)
{
$ret = null;
- foreach(array_keys($this->tables) as $t)
+ $tables = $this->getTables();
+ foreach(array_keys($tables) as $t)
{
- $table_id = $this->tables[$t]->getVar('table_id');
- $table_name = $this->tables[$t]->getVar('table_name');
- $table_autoincrement = $this->tables[$t]->getVar('table_autoincrement');
- $nb_fields = $this->tables[$t]->getVar('table_nbfields');
+ $table_id = $tables[$t]->getVar('table_id');
+ $table_name = $tables[$t]->getVar('table_name');
+ $table_autoincrement = $tabl...
[truncated message content] |
