Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12579] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate
|
From: <txm...@us...> - 2014-06-11 15:51:25
|
Revision: 12579
http://sourceforge.net/p/xoops/svn/12579
Author: txmodxoops
Date: 2014-06-11 15:51:20 +0000 (Wed, 11 Jun 2014)
Log Message:
-----------
- Fixed many bugs
- Updated
- Work in progress
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/install.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-06-11 14:50:43 UTC (rev 12578)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-06-11 15:51:20 UTC (rev 12579)
@@ -52,6 +52,7 @@
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
+ $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgtab_url', TDMC_UPLOAD_IMGTAB_URL);
$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
//var_dump($sysPathIcon32);
@@ -160,35 +161,19 @@
}
$fieldelement_fid = TDMCreateRequest::getInt('fieldelement_fid');
//
- if (isset($field_tid)) {
- //$fieldsObj =& $tdmcreate->getHandler('fields')->get($field_tid);
+ if (isset($field_id)) {
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_tid);
if (isset($fieldelement_fid)) {
$fieldelementObj =& $tdmcreate->getHandler('fieldelements')->get($fieldelement_fid);
}
} else {
- //$fieldsObj =& $tdmcreate->getHandler('fields')->create();
+ $fieldsObj =& $tdmcreate->getHandler('fields')->create();
$fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create();
}
- // Set Variables
- $isNew = false;
- if ($field_numb > 0) {
- $fields =& $tdmcreate->getHandler('fields')->get($field_tid);
- foreach($field_id as $i => $value)
- {
- switch($value){
- case 'new':
- $fieldsObj = $tdmcreate->getHandler('fields')->create();
- $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create();
- $isNew = true;
- break;
- default:
- $fieldsObj = $tdmcreate->getHandler('fields')->get($value);
- $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->get($fieldelement_fid);
- break;
- }
- //}
- //for( $i = 1; $i <= $field_numb; $i++ ) {
- // Set Data
+ //
+ if ($fieldsObj->isNew()) {
+ for( $i = 1; $i <= $field_numb; $i++ ) {
+ //
$fieldsObj->setVar( 'field_mid', $field_mid );
$fieldsObj->setVar( 'field_tid', $field_tid );
$fieldsObj->setVar( 'field_numb', $field_numb );
@@ -199,7 +184,7 @@
$fieldsObj->setVar( 'field_null', (isset($_POST['field_null'][$i]) ? $_POST['field_null'][$i] : '') );
$fieldsObj->setVar( 'field_default', (isset($_POST['field_default'][$i]) ? $_POST['field_default'][$i] : '') );
$fieldsObj->setVar( 'field_key', (isset($_POST['field_key'][$i]) ? $_POST['field_key'][$i] : '') );
- $fieldsObj->setVar( 'field_element', (isset($_POST['field_element'][$i]) ? $_POST['field_element'][$i] : '') );
+ $fieldsObj->setVar( 'field_element', (isset($_POST['field_element'][$i]) ? $_POST['field_element'][$i] : '') );
$fieldsObj->setVar( 'field_parent', (($i == isset($_REQUEST['field_parent'])) ? '1' : '0') );
$fieldsObj->setVar( 'field_inlist', ((isset($_REQUEST['field_inlist'][$i]) == 1) ? '1' : '0') );
$fieldsObj->setVar( 'field_inform', ((isset($_REQUEST['field_inform'][$i]) == 1) ? '1' : '0') );
@@ -211,33 +196,77 @@
$fieldsObj->setVar( 'field_required', ((isset($_REQUEST['field_required'][$i]) == 1) ? '1' : '0') );
// Insert Data
$tdmcreate->getHandler('fields')->insert($fieldsObj);
- }
- }
- $fieldelementObj->setVar( 'fieldelement_mid', $field_mid );
- $fieldelementObj->setVar( 'fieldelement_tid', $field_tid );
- $fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($table_name) );
- $fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($table_name) );
- // Insert new field element id for table name
- if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) {
- $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element');
- }
- //
- if ($isNew) {
+ }
redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_SAVED_OK, $table_name));
+ $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
+ $form = $fieldsObj->getForm($field_mid, $field_tid, $field_numb);
+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
+
+ $fieldelementObj->setVar( 'fieldelement_mid', $field_mid );
+ $fieldelementObj->setVar( 'fieldelement_tid', $field_tid );
+ $fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($table_name) );
+ $fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($table_name) );
+ // Insert new field element id for table name
+ if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) {
+ $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element');
+ }
} else {
+ foreach($field_id as $id => $value)
+ {
+ switch($value){
+ case 'new':
+ $fieldsObj = $tdmcreate->getHandler('fields')->create();
+ $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create();
+ $isNew = true;
+ break;
+ default:
+ $fieldsObj = $tdmcreate->getHandler('fields')->get($value);
+ $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->get($fieldelement_fid);
+ break;
+ }
+ // Set Data
+ $fieldsObj->setVar( 'field_mid', $field_mid[$id]);
+ $fieldsObj->setVar( 'field_tid', $field_tid[$id]);
+ $fieldsObj->setVar( 'field_numb', $field_numb[$id]);
+ $fieldsObj->setVar( 'field_name', $field_name[$id]);
+ $fieldsObj->setVar( 'field_type', $field_type[$id]);
+ $fieldsObj->setVar( 'field_value', $field_value[$id]);
+ $fieldsObj->setVar( 'field_attribute', $field_attribute[$id]);
+ $fieldsObj->setVar( 'field_null', $field_null[$id]);
+ $fieldsObj->setVar( 'field_default', $field_default[$id]);
+ $fieldsObj->setVar( 'field_key', $field_key[$id]);
+ $fieldsObj->setVar( 'field_element', $field_element[$id]);
+ $fieldsObj->setVar( 'field_parent', $id == $field_parent[$id]);
+ $fieldsObj->setVar( 'field_inlist', $field_inlist[$id]);
+ $fieldsObj->setVar( 'field_inform', $field_inform[$id]);
+ $fieldsObj->setVar( 'field_admin', $field_admin[$id]);
+ $fieldsObj->setVar( 'field_user', $field_user[$id]);
+ $fieldsObj->setVar( 'field_block', $field_block[$id]);
+ $fieldsObj->setVar( 'field_main', $id == $field_main[$id]);
+ $fieldsObj->setVar( 'field_search', $field_search[$id]);
+ $fieldsObj->setVar( 'field_required', $field_required[$id]);
+ // Insert Data
+ $tdmcreate->getHandler('fields')->insert($fieldsObj);
+ }
redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_UPDATED_OK, $table_name));
- }
- //
- $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
- $form = $fieldsObj->getForm($field_mid, $field_tid, $field_numb);
- $GLOBALS['xoopsTpl']->assign('form', $form->render());
+ $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
+ $form = $fieldsObj->getForm($field_mid, $field_tid, $field_numb);
+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
+
+ $fieldelementObj->setVar( 'fieldelement_mid', $field_mid );
+ $fieldelementObj->setVar( 'fieldelement_tid', $field_tid );
+ $fieldelementObj->setVar( 'fieldelement_name', $_REQUEST['fieldelement_name'] );
+ $fieldelementObj->setVar( 'fieldelement_value', $_REQUEST['fieldelement_value'] );
+ // Insert new field element id for table name
+ if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) {
+ $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element');
+ }
+ }
break;
case 'edit':
// Define main template
$template_main = 'fields.tpl';
- $GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/assets/css/admin/style.css' );
- $GLOBALS['xoTheme']->addScript('modules/TDMCreate/assets/js/fields.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-06-11 14:50:43 UTC (rev 12578)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-06-11 15:51:20 UTC (rev 12579)
@@ -46,7 +46,7 @@
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
- //$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgtab_url', TDMC_UPLOAD_IMGTAB_URL);
+ $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgtab_url', TDMC_UPLOAD_IMGTAB_URL);
$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
// Get the list of modules
@@ -171,7 +171,7 @@
$uploader = new XoopsMediaUploader($uploaddir, $tdmcreate->getConfig('mimetypes'),
$tdmcreate->getConfig('maxsize'), null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['table_image']['name']);
+ $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']);
$name_img = $_POST['table_name'].'.'.$extension;
$uploader->setPrefix($name_img);
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-06-11 14:50:43 UTC (rev 12578)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-06-11 15:51:20 UTC (rev 12579)
@@ -132,113 +132,222 @@
$fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria);
unset($criteria);
//var_dump($field_numb);
- $class = ''; $id = 1;
- foreach ($fields as $field)
- {
- $form->addElement(new XoopsFormHidden('field_id['.$id.']', $field->getVar('field_id')));
- $form->addElement(new XoopsFormHidden('field_mid', $field_mid));
- $form->addElement(new XoopsFormHidden('field_tid', $field_tid));
- $form->addElement(new XoopsFormHidden('field_numb', $field_numb));
+ $class = '';
+ if($isNew) {
+ for($i = 1; $i <= $field_numb; $i++)
+ {
+ $form->addElement(new XoopsFormHidden('field_id['.$i.']', 'new'));
+ $form->addElement(new XoopsFormHidden('field_mid', $field_mid));
+ $form->addElement(new XoopsFormHidden('field_tid', $field_tid));
+ $form->addElement(new XoopsFormHidden('field_numb', $field_numb));
- $class = ($class == 'even') ? 'odd' : 'even';
- $form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
- // Index ID
- $form->addElement(new TDMCreateFormLabel('<td class="center">'.$id.'</td>'));
- // Field Name
- $this_field_name = $isNew ? (!empty($f_name) ? $f_name . '_' : '') : $field->getVar('field_name');
- $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$id.']', 15, 255, $this_field_name);
- $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
- // Field Type
- $fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$id.']', $field->getVar('field_type'));
- $fieldtype_select->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">'.$fieldtype_select->render().'</td>'));
- // Field Value
- $field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$id.']', 5, 20, $field->getVar('field_value'));
- $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_value->render().'</td>'));
- // Field Attributes
- $field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute['.$id.']', $field->getVar('field_attribute'));
- $field_attributes_select->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_attributes_select->render().'</td>'));
- // Field Null
- $field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null['.$id.']', $field->getVar('field_null'));
- $field_null_select->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_null_select->render().'</td>'));
- // Field Default
- $field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default['.$id.']', 15, 25, $field->getVar('field_default'));
- $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_default->render().'</td>'));
- // Field Key
- $field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key['.$id.']', $field->getVar('field_key'));
- $field_key_select->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_key_select->render().'</td>'));
- // Field Void
- $table_autoincrement = $this->tdmcreate->getHandler('tables')->get($f_tid);
- if( ($id == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1)) {
- $form->addElement(new TDMCreateFormLabel('<td> </td></tr>'));
- } else {
- // Box header row
- $parameters_tray = new XoopsFormElementTray('', '<br />');
- /*$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();
- $criteria_element->add(new Criteria('fieldelement_tid', 0));
- $criteria_table = new CriteriaCompo();
- $criteria_table->add(new Criteria('fieldelement_mid', $field_mid));
- $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$id.']', $field->getVar('field_element'));
- $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_element));
- $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_table));
- unset($criteria_element); unset($criteria_table);
- $parameters_tray->addElement($field_elements_select);
-
- $field_parent = $isNew ? ( $id == 1 ? 1 : 0 ) : $field->getVar('field_parent');
- $check_field_parent = new XoopsFormCheckBox(' ', 'field_parent', $field_parent);
- $check_field_parent->addOption($id, _AM_TDMCREATE_FIELD_PARENT );
- $parameters_tray->addElement($check_field_parent);
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
+ // Index ID
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$i.'</td>'));
+ // Field Name
+ $this_field_name = $isNew ? (!empty($f_name) ? $f_name . '_' : '') : $this->getVar('field_name');
+ $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $this_field_name);
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
+ // Field Type
+ $fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$i.']', $this->getVar('field_type'));
+ $fieldtype_select->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$fieldtype_select->render().'</td>'));
+ // Field Value
+ $field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$i.']', 5, 20, $this->getVar('field_value'));
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_value->render().'</td>'));
+ // Field Attributes
+ $field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute['.$i.']', $this->getVar('field_attribute'));
+ $field_attributes_select->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_attributes_select->render().'</td>'));
+ // Field Null
+ $field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null['.$i.']', $this->getVar('field_null'));
+ $field_null_select->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_null_select->render().'</td>'));
+ // Field Default
+ $field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default['.$i.']', 15, 25, $this->getVar('field_default'));
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_default->render().'</td>'));
+ // Field Key
+ $field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key['.$i.']', $this->getVar('field_key'));
+ $field_key_select->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_key_select->render().'</td>'));
+ // Field Void
+ $table_autoincrement = $this->tdmcreate->getHandler('tables')->get($f_tid);
+ if( ($i == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1)) {
+ $form->addElement(new TDMCreateFormLabel('<td> </td></tr>'));
+ } else {
+ // Box header row
+ $parameters_tray = new XoopsFormElementTray('', '<br />');
+ /*$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();
+ $criteria_element->add(new Criteria('fieldelement_tid', 0));
+ $criteria_table = new CriteriaCompo();
+ $criteria_table->add(new Criteria('fieldelement_mid', $field_mid));
+ $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$i.']', $this->getVar('field_element'));
+ $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_element));
+ $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_table));
+ unset($criteria_element); unset($criteria_table);
+ $parameters_tray->addElement($field_elements_select);
+
+ $field_parent = $isNew ? ( $i == 1 ? 1 : 0 ) : $this->getVar('field_parent');
+ $check_field_parent = new XoopsFormCheckBox(' ', 'field_parent', $field_parent);
+ $check_field_parent->addOption($i, _AM_TDMCREATE_FIELD_PARENT );
+ $parameters_tray->addElement($check_field_parent);
+
+ $field_inlist = $isNew ? 0 : $this->getVar('field_inlist');
+ $check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$i.']', $field_inlist);
+ $check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
+ $parameters_tray->addElement($check_field_inlist);
- $field_inlist = $isNew ? 0 : $field->getVar('field_inlist');
- $check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$id.']', $field_inlist);
- $check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
- $parameters_tray->addElement($check_field_inlist);
-
- $field_inform = $isNew ? 0 : $field->getVar('field_inform');
- $check_field_inform = new XoopsFormCheckBox(' ', 'field_inform['.$id.']', $field_inform);
- $check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
- $parameters_tray->addElement($check_field_inform);
+ $field_inform = $isNew ? 0 : $this->getVar('field_inform');
+ $check_field_inform = new XoopsFormCheckBox(' ', 'field_inform['.$i.']', $field_inform);
+ $check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
+ $parameters_tray->addElement($check_field_inform);
- $field_admin = $isNew ? 0 : $field->getVar('field_admin');
- $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin['.$id.']', $field_admin);
- $check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
- $parameters_tray->addElement($check_field_admin);
+ $field_admin = $isNew ? 0 : $this->getVar('field_admin');
+ $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin['.$i.']', $field_admin);
+ $check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
+ $parameters_tray->addElement($check_field_admin);
- $field_user = $isNew ? 0 : $field->getVar('field_user');
- $check_field_user = new XoopsFormCheckBox(' ', 'field_user['.$id.']', $field_user);
- $check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
- $parameters_tray->addElement($check_field_user);
+ $field_user = $isNew ? 0 : $this->getVar('field_user');
+ $check_field_user = new XoopsFormCheckBox(' ', 'field_user['.$i.']', $field_user);
+ $check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
+ $parameters_tray->addElement($check_field_user);
- $field_block = $isNew ? 0 : $field->getVar('field_block');
- $check_field_block = new XoopsFormCheckBox('', 'field_block['.$id.']', $field_block);
- $check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
- $parameters_tray->addElement($check_field_block);
+ $field_block = $isNew ? 0 : $this->getVar('field_block');
+ $check_field_block = new XoopsFormCheckBox('', 'field_block['.$i.']', $field_block);
+ $check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
+ $parameters_tray->addElement($check_field_block);
- $field_main = $isNew ? ( $id == 1 ? 1 : 0 ) : $field->getVar('field_main');
- $check_field_main = new XoopsFormRadio('', 'field_main', $field_main);
- $check_field_main->addOption('', _AM_TDMCREATE_FIELD_MAINFIELD );
- $parameters_tray->addElement($check_field_main);
+ $field_main = $isNew ? ( $i == 1 ? 1 : 0 ) : $this->getVar('field_main');
+ $check_field_main = new XoopsFormRadio('', 'field_main', $field_main);
+ $check_field_main->addOption('', _AM_TDMCREATE_FIELD_MAINFIELD );
+ $parameters_tray->addElement($check_field_main);
- $field_search = $isNew ? 0 : $field->getVar('field_search');
- $check_field_search = new XoopsFormCheckBox(' ', 'field_search['.$id.']', $field_search);
- $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
- $parameters_tray->addElement($check_field_search);
+ $field_search = $isNew ? 0 : $this->getVar('field_search');
+ $check_field_search = new XoopsFormCheckBox(' ', 'field_search['.$i.']', $field_search);
+ $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
+ $parameters_tray->addElement($check_field_search);
- $field_required = $isNew ? 0 : $field->getVar('field_required');
- $check_field_required = new XoopsFormCheckBox(' ', 'field_required['.$id.']', $field_required);
- $check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
- $parameters_tray->addElement($check_field_required);
- $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">'._AM_TDMCREATE_FIELD_PARAMETERS_LIST.'</div><div class="portlet-content">'.$parameters_tray->render().'</div></div></td></tr>'));
+ $field_required = $isNew ? 0 : $this->getVar('field_required');
+ $check_field_required = new XoopsFormCheckBox(' ', 'field_required['.$i.']', $field_required);
+ $check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
+ $parameters_tray->addElement($check_field_required);
+ $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">'._AM_TDMCREATE_FIELD_PARAMETERS_LIST.'</div><div class="portlet-content">'.$parameters_tray->render().'</div></div></td></tr>'));
+ }
}
- $id++;
+ } else {
+ $id = 1;
+ foreach ($fields as $field)
+ {
+ $form->addElement(new XoopsFormHidden('field_id['.$id.']', $field->getVar('field_id')));
+ $form->addElement(new XoopsFormHidden('field_mid', $field_mid));
+ $form->addElement(new XoopsFormHidden('field_tid', $field_tid));
+ $form->addElement(new XoopsFormHidden('field_numb', $field_numb));
+
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
+ // Index ID
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$id.'</td>'));
+ // Field Name
+ $this_field_name = $isNew ? (!empty($f_name) ? $f_name . '_' : '') : $field->getVar('field_name');
+ $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$id.']', 15, 255, $this_field_name);
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
+ // Field Type
+ $fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$id.']', $field->getVar('field_type'));
+ $fieldtype_select->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$fieldtype_select->render().'</td>'));
+ // Field Value
+ $field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$id.']', 5, 20, $field->getVar('field_value'));
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_value->render().'</td>'));
+ // Field Attributes
+ $field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute['.$id.']', $field->getVar('field_attribute'));
+ $field_attributes_select->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_attributes_select->render().'</td>'));
+ // Field Null
+ $field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null['.$id.']', $field->getVar('field_null'));
+ $field_null_select->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_null_select->render().'</td>'));
+ // Field Default
+ $field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default['.$id.']', 15, 25, $field->getVar('field_default'));
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_default->render().'</td>'));
+ // Field Key
+ $field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key['.$id.']', $field->getVar('field_key'));
+ $field_key_select->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_key_select->render().'</td>'));
+ // Field Void
+ $table_autoincrement = $this->tdmcreate->getHandler('tables')->get($f_tid);
+ if( ($id == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1)) {
+ $form->addElement(new TDMCreateFormLabel('<td> </td></tr>'));
+ } else {
+ // Box header row
+ $parameters_tray = new XoopsFormElementTray('', '<br />');
+ /*$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();
+ $criteria_element->add(new Criteria('fieldelement_tid', 0));
+ $criteria_table = new CriteriaCompo();
+ $criteria_table->add(new Criteria('fieldelement_mid', $field_mid));
+ $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$id.']', $field->getVar('field_element'));
+ $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_element));
+ $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_table));
+ unset($criteria_element); unset($criteria_table);
+ $parameters_tray->addElement($field_elements_select);
+
+ $field_parent = $isNew ? ( $id == 1 ? 1 : 0 ) : $field->getVar('field_parent');
+ $check_field_parent = new XoopsFormCheckBox(' ', 'field_parent', $field_parent);
+ $check_field_parent->addOption($id, _AM_TDMCREATE_FIELD_PARENT );
+ $parameters_tray->addElement($check_field_parent);
+
+ $field_inlist = $isNew ? 0 : $field->getVar('field_inlist');
+ $check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$id.']', $field_inlist);
+ $check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
+ $parameters_tray->addElement($check_field_inlist);
+
+ $field_inform = $isNew ? 0 : $field->getVar('field_inform');
+ $check_field_inform = new XoopsFormCheckBox(' ', 'field_inform['.$id.']', $field_inform);
+ $check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
+ $parameters_tray->addElement($check_field_inform);
+
+ $field_admin = $isNew ? 0 : $field->getVar('field_admin');
+ $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin['.$id.']', $field_admin);
+ $check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
+ $parameters_tray->addElement($check_field_admin);
+
+ $field_user = $isNew ? 0 : $field->getVar('field_user');
+ $check_field_user = new XoopsFormCheckBox(' ', 'field_user['.$id.']', $field_user);
+ $check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
+ $parameters_tray->addElement($check_field_user);
+
+ $field_block = $isNew ? 0 : $field->getVar('field_block');
+ $check_field_block = new XoopsFormCheckBox('', 'field_block['.$id.']', $field_block);
+ $check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
+ $parameters_tray->addElement($check_field_block);
+
+ $field_main = $isNew ? ( $id == 1 ? 1 : 0 ) : $field->getVar('field_main');
+ $check_field_main = new XoopsFormRadio('', 'field_main', $field_main);
+ $check_field_main->addOption('', _AM_TDMCREATE_FIELD_MAINFIELD );
+ $parameters_tray->addElement($check_field_main);
+
+ $field_search = $isNew ? 0 : $field->getVar('field_search');
+ $check_field_search = new XoopsFormCheckBox(' ', 'field_search['.$id.']', $field_search);
+ $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
+ $parameters_tray->addElement($check_field_search);
+
+ $field_required = $isNew ? 0 : $field->getVar('field_required');
+ $check_field_required = new XoopsFormCheckBox(' ', 'field_required['.$id.']', $field_required);
+ $check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
+ $parameters_tray->addElement($check_field_required);
+ $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">'._AM_TDMCREATE_FIELD_PARAMETERS_LIST.'</div><div class="portlet-content">'.$parameters_tray->render().'</div></div></td></tr>'));
+ }
+ $id++;
+ }
+ unset($id);
}
- unset($id);
+
$form->addElement(new TDMCreateFormLabel('</tbody>'));
$form->addElement(new TDMCreateFormLabel('<tfoot><tr>'));
$form_hidden = new XoopsFormHidden('op', 'save');
@@ -284,45 +393,8 @@
public function &get($id = null, $fields = null)
{
return parent::get($id, $fields);
- }
-
- /**
- * Load a {@link XoopsObject} object from the database
- *
- * @access protected
- * @param mixed $id ID
- * @param array $fields fields to fetch
- * @return object {@link XoopsObject}
- */
- /*public function &get($id = null, $fields = null)
- {
- $object = null;
- if (empty($id)) {
- $object = $this->create();
- return $object;
- }
- if (is_array($fields) && count($fields) > 0) {
- $select = implode(',', $fields);
- if (!in_array($this->keyName, $fields)) {
- $select .= ', ' . $this->keyName;
- }
- } else {
- $select = '*';
- }
- $sql = sprintf('SELECT %s FROM %s WHERE %s = %s', $select, $this->table, $this->keyName, $this->db->quote($id));
- //$sql = "SELECT {$select} FROM {$this->table} WHERE {$this->keyName} = " . $this->db->quote($id);
- if (!$result = $this->db->query($sql)) {
- return $object;
- }
- if (!$this->db->getRowsNum($result)) {
- return $object;
- }
- $object =& $this->create(false);
- $object->assignVars($this->db->fetchArray($result));
+ }
- return $object;
- }*/
-
/**
* get IDs of objects matching a condition
*
@@ -348,28 +420,5 @@
return false;
}
return true;
- }
-
- /*
- * @public function getFieldOption
- * @param integer $field_id
- * @param integer $field_option
- */
- public function getFieldOption($field_id, $field_option = '')
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (is_string($field_option)) {
- if (!empty($obj[0][$field_option]))
- return strtolower($obj[0][$field_option]);
- } else {
- if (!empty($obj[0][$field_option]) && is_numeric($obj[0][$field_option]))
- return intval($obj[0][$field_option]);
- }
- } else {
- return false;
- }
- unset($criteria);
- }
+ }
}
\ No newline at end of file
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-11 14:50:43 UTC (rev 12578)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/blocks.php 2014-06-11 15:51:20 UTC (rev 12579)
@@ -69,7 +69,7 @@
define('{$language}DISPLAY', "How Many Tables to Display");
define('{$language}TITLELENGTH', "Title Length");
define('{$language}CATTODISPLAY', "Categories to Display");
-define('{$language}ALLCAT', "All Categories");
+define('{$language}ALLCAT', "All Categories");\n
EOT;
foreach (array_keys($tables) as $i)
{
@@ -79,22 +79,18 @@
$nb_caracteres = strlen($table_fieldname);
$table_blocks = $tables[$i]->getVar('table_blocks');
$language1 = $language.strtoupper($table_fieldname);
- $fpif = '';
- $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)
{
- $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_fileds = $language1.strtoupper($fields_final[$f]);
+ $lng_fileds = $language1.'_'.strtoupper($fields_final[$f]);
$ucf_table_field = $table_name.str_replace('_', ' ', ucfirst($fields_final[$f]));
$content .= <<<EOT
-\ndefine('{$lng_fileds}', "{$field_name}");
+define('{$lng_fileds}', "{$ucf_table_field}");\n
EOT;
}
}
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-11 14:50:43 UTC (rev 12578)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/modinfo.php 2014-06-11 15:51:20 UTC (rev 12579)
@@ -108,7 +108,7 @@
foreach (array_keys($tables) as $i)
{
$table_name = $tables[$i]->getVar('table_name');
- $language1 = $language.strtoupper($table_name).'';
+ $language1 = $language.'_'.strtoupper($table_name).'';
$table_name = str_replace("_", " ", ucfirst($table_name));
if ( $tables[$i]->getVar('table_blocks') == 1 ) {
$content .= <<<EOT
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-06-11 14:50:43 UTC (rev 12578)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-06-11 15:51:20 UTC (rev 12579)
@@ -163,7 +163,7 @@
$imgtray1->addElement($imageselect1, false);
$imgtray1->addElement( new XoopsFormLabel( '', "<br /><img src='".XOOPS_URL."/".$iconsdirectory."/".$table_image."' name='image1' id='image1' alt='' />" ) );
$fileseltray1 = new XoopsFormElementTray('','<br />');
- $fileseltray1->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD , 'table_image', $this->tdmcreate->getConfig('maxsize')));
+ $fileseltray1->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD , 'attachedfile', $this->tdmcreate->getConfig('maxsize')));
$fileseltray1->addElement(new XoopsFormLabel(''));
$imgtray1->addElement($fileseltray1);
$form->addElement($imgtray1);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/install.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/install.php 2014-06-11 14:50:43 UTC (rev 12578)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/install.php 2014-06-11 15:51:20 UTC (rev 12579)
@@ -21,7 +21,7 @@
$indexFile = XOOPS_UPLOAD_PATH.'/index.html';
$blankFile = XOOPS_UPLOAD_PATH.'/blank.gif';
-$emptyFile = XOOPS_ROOT_PATH.'/modules/TDMCreate/images/empty.png';
+$emptyFile = XOOPS_ROOT_PATH.'/modules/TDMCreate/assets/images/empty.png';
// Making of "uploads" folder
$tdmcreate = XOOPS_UPLOAD_PATH.'/tdmcreate';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-06-11 14:50:43 UTC (rev 12578)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-06-11 15:51:20 UTC (rev 12579)
@@ -413,5 +413,5 @@
$modversion['config'][$i]['description'] = "";
$modversion['config'][$i]['formtype'] = "textbox";
$modversion['config'][$i]['valuetype'] = "text";
-$modversion['config'][$i]['default'] = '12555';
+$modversion['config'][$i]['default'] = '12576';
unset($i);
\ No newline at end of file
|
