Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12582] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate
|
From: <txm...@us...> - 2014-06-13 14:25:56
|
Revision: 12582
http://sourceforge.net/p/xoops/svn/12582
Author: txmodxoops
Date: 2014-06-13 14:25:54 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
- Updated
- Min Version of Xoops: 2.5.7 -> for xoopsrequest.php class
- Fixed many bugs
- Work in progress
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.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/admin/header.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/classes.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/formelements.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/helper.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/index.html
Removed Paths:
-------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class/
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-06-13 14:03:12 UTC (rev 12581)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-06-13 14:25:54 UTC (rev 12582)
@@ -20,7 +20,7 @@
*/
include 'header.php';
// Recovered value of arguments op in the URL $
-$op = TDMCreateRequest::getString('op', 'list');
+$op = XoopsRequest::getString('op', 'list');
// Get fields Variables
/*$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id');*/
$table_name = TDMCreate_CleanVars($_REQUEST, 'table_name', '', 'string');
@@ -28,19 +28,29 @@
$field_tid = TDMCreate_CleanVars($_REQUEST, 'field_tid');
$field_numb = TDMCreate_CleanVars($_REQUEST, 'field_numb');
$field_name = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');/**/
-$field_id = TDMCreateRequest::getInt('field_id');
-/*$field_mid = TDMCreateRequest::getInt('field_mid');
-$field_tid = TDMCreateRequest::getInt('field_tid');
-$field_numb = TDMCreateRequest::getInt('field_numb');
-$field_name = TDMCreateRequest::getString('field_name', '');*/
+/*$field_mid = XoopsRequest::getInt('field_mid');
+$field_tid = XoopsRequest::getInt('field_tid');
+$field_numb = XoopsRequest::getInt('field_numb');
+$field_name = XoopsRequest::getString('field_name', '');*/
+/*$session_field = TDMCreateSession::getInstance();
+$table_name = $session_field->getSession('table_name');
+$field_tid = $session_field->getSession('table_id');
+$field_mid = $session_field->getSession('table_mid');
+$field_name = $session_field->getSession('table_fieldname');
+$field_numb = $session_field->getSession('table_nbfields');
+$field_tid = $_SESSION['table_id'];
+$field_mid = $_SESSION['table_mid'];
+$table_name = $_SESSION['table_name'];
+$field_name = $_SESSION['table_fieldname'];
+$field_numb = $_SESSION['table_nbfields'];*/
//
switch ($op)
{
case 'list':
default:
- $start = TDMCreateRequest::getInt('start', 0);
- $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
- //$limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('fields_adminpager'));
+ $start = XoopsRequest::getInt('start', 0);
+ $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
+ //$limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('fields_adminpager'));
// Define main template
$template_main = 'fields.tpl';
$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/assets/css/admin/style.css' );
@@ -152,6 +162,11 @@
$fieldsObj =& $tdmcreate->getHandler('fields')->create();
$form = $fieldsObj->getForm($field_mid, $field_tid, $field_numb, $field_name);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
+
+ var_dump($field_mid);
+ var_dump($field_tid);
+ var_dump($field_numb);
+ var_dump($field_name);
break;
case 'save':
@@ -159,109 +174,66 @@
if ( !$GLOBALS['xoopsSecurity']->check() ) {
redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $fieldelement_fid = TDMCreateRequest::getInt('fieldelement_fid');
+ $fieldelement_fid = XoopsRequest::getInt('fieldelement_fid');
+ // Fields Handler
+ $fields = $tdmcreate->getHandler('fields');
+ // Fields Elements Handler
+ $fieldelements = $tdmcreate->getHandler('fieldelements');
+ // Set Variables
+ foreach ($_POST['field_id'] as $key => $value)
+ {
+ switch($value){
+ case 'new':
+ $fieldsObj =& $fields->create();
+ $fieldelementObj =& $fieldelements->create();
+ break;
+ case 'edit':
+ $fieldsObj =& $fields->get($value);
+ $fieldelementObj =& $fieldelements->get($fieldelement_fid);
+ break;
+ }
+ // Set Data
+ $fieldsObj->setVar( 'field_mid', $field_mid );
+ $fieldsObj->setVar( 'field_tid', $field_tid );
+ $fieldsObj->setVar( 'field_numb', $field_numb );
+ $fieldsObj->setVar( 'field_name', (isset($_POST['field_name'][$key]) ? $_POST['field_name'][$key] : '') );
+ $fieldsObj->setVar( 'field_type', (isset($_POST['field_type'][$key]) ? $_POST['field_type'][$key] : '') );
+ $fieldsObj->setVar( 'field_value', (isset($_POST['field_value'][$key]) ? $_POST['field_value'][$key] : '') );
+ $fieldsObj->setVar( 'field_attribute', (isset($_POST['field_attribute'][$key]) ? $_POST['field_attribute'][$key] : '') );
+ $fieldsObj->setVar( 'field_null', (isset($_POST['field_null'][$key]) ? $_POST['field_null'][$key] : '') );
+ $fieldsObj->setVar( 'field_default', (isset($_POST['field_default'][$key]) ? $_POST['field_default'][$key] : '') );
+ $fieldsObj->setVar( 'field_key', (isset($_POST['field_key'][$key]) ? $_POST['field_key'][$key] : '') );
+ $fieldsObj->setVar( 'field_element', (isset($_POST['field_element'][$key]) ? $_POST['field_element'][$key] : '') );
+ $fieldsObj->setVar( 'field_parent', (($key == isset($_REQUEST['field_parent'])) ? 1 : 0) );
+ $fieldsObj->setVar( 'field_inlist', ((isset($_REQUEST['field_inlist'][$key]) == 1) ? 0 : 1) );
+ $fieldsObj->setVar( 'field_inform', ((isset($_REQUEST['field_inform'][$key]) == 1) ? 0 : 1) );
+ $fieldsObj->setVar( 'field_admin', ((isset($_REQUEST['field_admin'][$key]) == 1) ? 0 : 1) );
+ $fieldsObj->setVar( 'field_user', ((isset($_REQUEST['field_user'][$key]) == 1) ? 0 : 1) );
+ $fieldsObj->setVar( 'field_block', ((isset($_REQUEST['field_block'][$key]) == 1) ? 0 : 1) );
+ $fieldsObj->setVar( 'field_main', (($key == isset($_REQUEST['field_main'])) ? 1 : 0) );
+ $fieldsObj->setVar( 'field_search', ((isset($_REQUEST['field_search'][$key]) == 1) ? 0 : 1) );
+ $fieldsObj->setVar( 'field_required', ((isset($_REQUEST['field_required'][$key]) == 1) ? 0 : 1) );
+ // 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 (isset($field_id)) {
- $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_tid);
- if (isset($fieldelement_fid)) {
- $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->get($fieldelement_fid);
- }
+ if ($fieldsObj->isNew()) {
+ redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_SAVED_OK, $_REQUEST['table_name']));
} else {
- $fieldsObj =& $tdmcreate->getHandler('fields')->create();
- $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create();
+ redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_UPDATED_OK, $_REQUEST['table_name']));
}
- //
- 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 );
- $fieldsObj->setVar( 'field_name', (isset($_POST['field_name'][$i]) ? $_POST['field_name'][$i] : '') );
- $fieldsObj->setVar( 'field_type', (isset($_POST['field_type'][$i]) ? $_POST['field_type'][$i] : '') );
- $fieldsObj->setVar( 'field_value', (isset($_POST['field_value'][$i]) ? $_POST['field_value'][$i] : '') );
- $fieldsObj->setVar( 'field_attribute', (isset($_POST['field_attribute'][$i]) ? $_POST['field_attribute'][$i] : '') );
- $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_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') );
- $fieldsObj->setVar( 'field_admin', ((isset($_REQUEST['field_admin'][$i]) == 1) ? '1' : '0') );
- $fieldsObj->setVar( 'field_user', ((isset($_REQUEST['field_user'][$i]) == 1) ? '1' : '0') );
- $fieldsObj->setVar( 'field_block', ((isset($_REQUEST['field_block'][$i]) == 1) ? '1' : '0') );
- $fieldsObj->setVar( 'field_main', (($i == isset($_REQUEST['field_main'])) ? '1' : '0') );
- $fieldsObj->setVar( 'field_search', ((isset($_REQUEST['field_search'][$i]) == 1) ? '1' : '0') );
- $fieldsObj->setVar( 'field_required', ((isset($_REQUEST['field_required'][$i]) == 1) ? '1' : '0') );
- // Insert Data
- $tdmcreate->getHandler('fields')->insert($fieldsObj);
- }
- 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());
-
- $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');
- }
- }
+ //
+ $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
+ $form = $fieldsObj->getForm($field_mid, $field_tid, $field_numb);
+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
case 'edit':
@@ -274,17 +246,16 @@
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
$fieldsObj = $tdmcreate->getHandler('fields')->get( $field_tid );
- $form = $fieldsObj->getForm(null, $field_tid);
+ $form = $fieldsObj->getForm(null, $field_tid, $field_numb);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
-
- var_dump($field_id);
- var_dump($field_mid);
+
var_dump($field_tid);
var_dump($field_numb);
break;
case 'drag':
$side = TDMCreate_CleanVars( $_POST, 'field_id', 0, 'int' );
+ $field_id = XoopsRequest::getInt('field_id');
if ( $field_id > 0 ) {
$fieldsObj = $tdmcreate->getHandler('fields')->get( $field_id );
$fieldsObj->setVar('field_id', $side);
@@ -313,59 +284,57 @@
break;
case 'display':
+ // Get the list of fields
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('field_tid', $field_tid));
+ $fields = $tdmcreate->getHandler('fields')->getObjects($criteria);
$fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
if (isset($_GET['field_tid'])) {
if (isset($_GET['field_parent'])) {
- /*$fld_parent = intval($_GET['field_parent']);
- $field_parent = ($fld_parent == 1) ? 0 : 1;
- $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';
+ foreach ($fields as $field) {
+ $fld_parent = $field->getVar('field_parent');
+ $field_parent = ($field->getVar('field_id') == $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;
+ $field_inlist = ($fld_inlist == 1) ? '0' : '1';
$fieldsObj->setVar('field_inlist', $field_inlist);
} elseif (isset($_GET['field_inform'])) {
$fld_inform = intval($_GET['field_inform']);
- $field_inform = ($fld_inform == 1) ? 0 : 1;
+ $field_inform = ($fld_inform == 1) ? '0' : '1';
$fieldsObj->setVar('field_inform', $field_inform);
} elseif (isset($_GET['field_admin'])) {
$fld_admin = intval($_GET['field_admin']);
- $field_admin = ($fld_admin == 1) ? 0 : 1;
+ $field_admin = ($fld_admin == 1) ? '0' : '1';
$fieldsObj->setVar('field_admin', $field_admin);
} elseif (isset($_GET['field_user'])) {
$fld_user = intval($_GET['field_user']);
- $field_user = ($fld_user == 1) ? 0 : 1;
+ $field_user = ($fld_user == 1) ? '0' : '1';
$fieldsObj->setVar('field_user', $field_user);
} elseif (isset($_GET['field_block'])) {
$fld_block = intval($_GET['field_block']);
- $field_block = ($fld_block == 1) ? 0 : 1;
+ $field_block = ($fld_block == 1) ? '0' : '1';
$fieldsObj->setVar('field_block', $field_block);
- } elseif (isset($_GET['field_main'])) {
- /*$fld_main = intval($_GET['field_main']);
- $field_main = ($fld_main == 1) ? 0 : 1;
- $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';
+ } elseif (isset($_GET['field_main'])) {
+ foreach ($fields as $field) {
+ $fld_main = $field->getVar('field_main');
+ $field_main = ($field->getVar('field_id') == $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;
+ $field_search = ($fld_search == 1) ? '0' : '1';
$fieldsObj->setVar('field_search', $field_search);
} elseif (isset($_GET['field_required'])) {
$fld_required = intval($_GET['field_required']);
- $field_required = ($fld_required == 1) ? 0 : 1;
+ $field_required = ($fld_required == 1) ? '0' : '1';
$fieldsObj->setVar('field_required', $field_required);
}
if ($tdmcreate->getHandler('fields')->insert($fieldsObj, true)) {
- redirect_header('fields.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
+ redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS);
} else {
- redirect_header('fields.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
+ redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_FAILED);
}
}
break;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-06-13 14:03:12 UTC (rev 12581)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-06-13 14:25:54 UTC (rev 12582)
@@ -20,16 +20,16 @@
*/
include 'header.php';
// Recovered value of argument op in the URL $
-$op = TDMCreateRequest::getString('op', 'list');
+$op = XoopsRequest::getString('op', 'list');
//
-$mod_id = TDMCreateRequest::getInt('mod_id');
+$mod_id = XoopsRequest::getInt('mod_id');
//
switch ($op)
{
case 'list':
default:
- $start = TDMCreateRequest::getInt('start', 0);
- $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
+ $start = XoopsRequest::getInt('start', 0);
+ $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
// Define main template
$template_main = 'modules.tpl';
$GLOBALS['xoTheme']->addScript('modules/TDMCreate/assets/js/functions.js');
@@ -198,12 +198,12 @@
break;
case 'display':
- $mod_admin = TDMCreateRequest::getInt('mod_admin');
- $mod_user = TDMCreateRequest::getInt('mod_user');
- $mod_search = TDMCreateRequest::getInt('mod_search');
- $mod_comments = TDMCreateRequest::getInt('mod_comments');
- $mod_notifications = TDMCreateRequest::getInt('mod_notifications');
- $mod_permissions = TDMCreateRequest::getInt('mod_permissions');
+ $mod_admin = XoopsRequest::getInt('mod_admin');
+ $mod_user = XoopsRequest::getInt('mod_user');
+ $mod_search = XoopsRequest::getInt('mod_search');
+ $mod_comments = XoopsRequest::getInt('mod_comments');
+ $mod_notifications = XoopsRequest::getInt('mod_notifications');
+ $mod_permissions = XoopsRequest::getInt('mod_permissions');
if ( $mod_id > 0 ) {
$obj =& $tdmcreate->getHandler('modules')->get($mod_id);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-06-13 14:03:12 UTC (rev 12581)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-06-13 14:25:54 UTC (rev 12582)
@@ -20,22 +20,22 @@
*/
include 'header.php';
// Recovered value of arguments op in the URL $
-$op = TDMCreateRequest::getString('op', 'list');
+$op = XoopsRequest::getString('op', 'list');
//
-$mod_id = TDMCreateRequest::getInt('mod_id');
+$mod_id = XoopsRequest::getInt('mod_id');
//
-$table_id = TDMCreateRequest::getInt('table_id');
-$table_mid = TDMCreateRequest::getInt('table_mid');
-$table_nbfields = TDMCreateRequest::getInt('table_nbfields');
-$table_fieldname = TDMCreateRequest::getString('table_fieldname', '');
+$table_id = XoopsRequest::getInt('table_id');
+$table_mid = XoopsRequest::getInt('table_mid');
+$table_nbfields = XoopsRequest::getInt('table_nbfields');
+$table_fieldname = XoopsRequest::getString('table_fieldname', '');
//
switch ($op)
{
case 'list':
default:
- $start = TDMCreateRequest::getInt('start', 0);
- $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
- //$limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
+ $start = XoopsRequest::getInt('start', 0);
+ $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
+ //$limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
// Define main template
$template_main = 'tables.tpl';
$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/assets/css/admin/style.css' );
@@ -195,7 +195,12 @@
if( $tdmcreate->getHandler('tables')->insert($obj) ) {
if( $obj->isNew() ) {
- $table_iid = $GLOBALS['xoopsDB']->getInsertId();
+ $table_iid = $GLOBALS['xoopsDB']->getInsertId();
+ /*$_SESSION['table_id'] = $GLOBALS['xoopsDB']->getInsertId();
+ $_SESSION['table_mid'] = $table_mid;
+ $_SESSION['table_name'] = $_POST['table_name'];
+ $_SESSION['table_fieldname'] = $table_fieldname;
+ $_SESSION['table_nbfields'] = $table_nbfields;*/
$table_action = '&field_mid='.$table_mid.'&field_tid='.$table_iid.'&field_numb='.$table_nbfields.'&field_name='.$table_fieldname;
redirect_header('fields.php?op=new'.$table_action, 5, sprintf(_AM_TDMCREATE_TABLE_FORM_SAVED_OK, $_POST['table_name']));
} else {
@@ -238,14 +243,14 @@
break;
case 'display':
- $table_blocks = TDMCreateRequest::getInt('table_blocks');
- $table_admin = TDMCreateRequest::getInt('table_admin');
- $table_user = TDMCreateRequest::getInt('table_user');
- $table_submenu = TDMCreateRequest::getInt('table_submenu');
- $table_search = TDMCreateRequest::getInt('table_search');
- $table_comments = TDMCreateRequest::getInt('table_comments');
- $table_notifications = TDMCreateRequest::getInt('table_notifications');
- $table_permissions = TDMCreateRequest::getInt('table_permissions');
+ $table_blocks = XoopsRequest::getInt('table_blocks');
+ $table_admin = XoopsRequest::getInt('table_admin');
+ $table_user = XoopsRequest::getInt('table_user');
+ $table_submenu = XoopsRequest::getInt('table_submenu');
+ $table_search = XoopsRequest::getInt('table_search');
+ $table_comments = XoopsRequest::getInt('table_comments');
+ $table_notifications = XoopsRequest::getInt('table_notifications');
+ $table_permissions = XoopsRequest::getInt('table_permissions');
if ( $table_id > 0 ) {
$obj =& $tdmcreate->getHandler('tables')->get($table_id);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-06-13 14:03:12 UTC (rev 12581)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-06-13 14:25:54 UTC (rev 12582)
@@ -41,8 +41,9 @@
$this->tdmcreate = TDMCreate::getInstance();
$this->initVar('field_id', XOBJ_DTYPE_INT);
$this->initVar('field_mid', XOBJ_DTYPE_INT);
- $this->initVar('field_tid', XOBJ_DTYPE_INT);
- $this->initVar('field_name', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('field_tid', XOBJ_DTYPE_INT);
+ $this->initVar('field_numb', XOBJ_DTYPE_INT);
+ $this->initVar('field_name', XOBJ_DTYPE_TXTBOX);
$this->initVar('field_type', XOBJ_DTYPE_TXTBOX);
$this->initVar('field_value', XOBJ_DTYPE_TXTBOX);
$this->initVar('field_attribute', XOBJ_DTYPE_TXTBOX);
@@ -85,7 +86,7 @@
}
return $instance;
}
-
+
/*
* @public function getForm
*
@@ -101,14 +102,11 @@
$action = $_SERVER['REQUEST_URI'];
}
$isNew = $this->isNew();
- $title = $isNew ? sprintf(_AM_TDMCREATE_FIELD_ADD) : sprintf(_AM_TDMCREATE_FIELD_EDIT);
-
+ $title = $isNew ? sprintf(_AM_TDMCREATE_FIELD_ADD) : sprintf(_AM_TDMCREATE_FIELD_EDIT);
+
$field_mid = $isNew ? $f_mid : $this->getVar('field_mid');
$field_tid = $isNew ? $f_tid : $this->getVar('field_tid');
- // Get the list of fields
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_tid', $f_tid));
- $field_numb = $isNew ? $f_numb : $this->tdmcreate->getHandler('fields')->getCount($criteria); //$this->getVar('field_numb')
+ $field_numb = $isNew ? $f_numb : $this->getVar('field_numb');
$form = new TDMCreateThemeForm(null, 'form', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
@@ -129,225 +127,25 @@
$form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_PARAMETERS.'</th>'));
$form->addElement(new TDMCreateFormLabel('</tr></thead>'));
$form->addElement(new TDMCreateFormLabel('<tbody>'));
- $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria);
- unset($criteria);
- //var_dump($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">'.$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_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 : $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 : $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 : $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 ? ( $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 : $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 : $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>'));
- }
+ for($i = 1; $i <= $f_numb; $i++) {
+ $this->getFormElements($form, $isNew, 'new', $i, $f_name, $field_mid, $field_tid, $this);
}
} 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++;
+ // Get the list of fields
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('field_tid', $field_tid));
+ $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria);
+ unset($criteria);
+ $i = 1;
+ foreach ($fields as $field) {
+ $this->getFormElements($form, $isNew, 'edit', $i, null, $field_mid, $field_tid, $field);
+ $i++;
}
- unset($id);
- }
-
+ unset($i);
+ }
+ // Send Form Data
$form->addElement(new TDMCreateFormLabel('</tbody>'));
$form->addElement(new TDMCreateFormLabel('<tfoot><tr>'));
$form_hidden = new XoopsFormHidden('op', 'save');
@@ -356,7 +154,121 @@
$form->addElement(new TDMCreateFormLabel('<td>'.$form_button->render().'</td>'));
$form->addElement(new TDMCreateFormLabel('</tr></tfoot></table>'));
return $form;
- }
+ }
+
+ /*
+ * @private function getFormElements
+ *
+ * @param object $form
+ * @param string $type
+ * @param integer $id
+ * @param string $field_name
+ * @param string $field_mid
+ * @param string $field_tid
+ * @param object $field
+ * @param string $class
+ */
+ private function getFormElements($form, $isNew, $type, $id, $f_name = null, $field_mid, $field_tid, $field, $class = 'even')
+ {
+ $form->addElement(new XoopsFormHidden('field_id['.$id.']', $type));
+ $form->addElement(new XoopsFormHidden('field_mid', $field_mid));
+ $form->addElement(new XoopsFormHidden('field_tid', $field_tid));
+
+ $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($field_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 />');
+ // 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>'));
+ }
+ }
}
/*
* @Class TDMCreateFieldsHandler
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-13 14:03:12 UTC (rev 12581)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/header.php 2014-06-13 14:25:54 UTC (rev 12582)
@@ -76,18 +76,16 @@
EOT;
if ( $table->getVar('table_name') != '' ) {
$content .= <<<EOT
-include_once \$thisPath.'/class/helper.php';
-// Get instance
-\${$stl_mod_name}Helper = {$ucfmod_name}Helper::getInstance();\n
+// Get instance of module
+\${$stl_mod_name} = {$ucfmod_name}Helper::getInstance();\n
EOT;
}
$content .= <<<EOT
-\$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
@@ -96,7 +94,7 @@
{
$table_name = $tables[$i]->getVar('table_name');
$content .= <<<EOT
-\${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', \$thisModule);\n
+\${$table_name}Handler =& \${$stl_mod_name}->getHandler('{$table_name}');\n
EOT;
}
$content .=<<<EOT
@@ -114,9 +112,8 @@
\$xoopsTpl->assign('modPathIcon32', \$modPathIcon32);
//Load languages
-xoops_loadLanguage('admin', \$thisModule);
-xoops_loadLanguage('modinfo', \$thisModule);
-xoops_loadLanguage('main', \$thisModule);
+xoops_loadLanguage('admin');
+xoops_loadLanguage('modinfo');
// Local admin menu class
if ( file_exists(\$GLOBALS['xoops']->path(\$pathModuleAdmin.'/moduleadmin.php'))){
include_once \$GLOBALS['xoops']->path(\$pathModuleAdmin.'/moduleadmin.php');
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-13 14:03:12 UTC (rev 12581)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php 2014-06-13 14:25:54 UTC (rev 12582)
@@ -380,6 +380,10 @@
$languageMain->write($module, $table, $tables, 'main.php');
$ret[] = $languageMain->render();
}
+ // Class Helper File
+ $classHelper = ClassHelper::getInstance();
+ $classHelper->write($module, 'helper.php');
+ $ret[] = $classHelper->render();
// Css Styles File
$cssStyles = CssStyles::getInstance($module, 'style.css');
$cssStyles->write($module, 'style.css');
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/classes.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/classes.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/classes.php 2014-06-13 14:25:54 UTC (rev 12582)
@@ -0,0 +1,322 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: class_files.php 12258 2014-01-02 09:33:29Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+require_once 'formelements.php';
+class ClassFiles extends TDMCreateFormElements
+{
+ /*
+ * @var string
+ */
+ private $formelements = null;
+
+ /*
+ * @public function constructor
+ * @param null
+ */
+ public function __construct() {
+ parent::__construct();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->formelements = TDMCreateFormElements::getInstance();
+ }
+ /*
+ * @static function &getInstance
+ * @param null
+ */
+ public static function &getInstance()
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+ return $instance;
+ }
+ /*
+ * @public function write
+ * @param string $module
+ * @param string $table
+ * @param mixed $tables
+ */
+ public function write($module, $table, $tables) {
+ $this->setModule($module);
+ $this->setTable($table);
+ $this->setTables($tables);
+ }
+ /*
+ * @public function getInitVar
+ * @param string $field_name
+ * @param string $type
+ */
+ public function getInitVar($field_name, $type = 'INT') {
+ $ret = <<<EOT
+ \$this->initVar('{$field_name}', XOBJ_DTYPE_{$type});\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getInitVars
+ * @param array $fields
+ */
+ public function getInitVars($fields) {
+ $ret = '';
+ // Creation of the initVar functions list
+ foreach (array_keys($fields) as $f)
+ {
+ $field_name = $fields[$f]->getVar('field_name');
+ $field_type = $fields[$f]->getVar('field_type');
+ switch($field_type) {
+ case 'INT':
+ case 'TINYINT':
+ case 'MEDIUMINT':
+ case 'SMALLINT':
+ $ret .= $this->getInitVar($field_name, 'INT');
+ break;
+ case 'CHAR':
+ case 'VARCHAR':
+ $ret .= $this->getInitVar($field_name, 'TXTBOX');
+ break;
+ case 'TEXT':
+ case 'TINYTEXT':
+ case 'MEDIUMTEXT':
+ case 'LONGTEXT':
+ $ret .= $this->getInitVar($field_name, 'TXTAREA');
+ break;
+ case 'FLOAT':
+ $ret .= $this->getInitVar($field_name, 'FLOAT');
+ break;
+ case 'DECIMAL':
+ case 'DOUBLE':
+ $ret .= $this->getInitVar($field_name, 'DECIMAL');
+ break;
+ case 'ENUM':
+ $ret .= $this->getInitVar($field_name, 'ENUM');
+ break;
+ case 'EMAIL':
+ $ret .= $this->getInitVar($field_name, 'EMAIL');
+ break;
+ case 'URL':
+ $ret .= $this->getInitVar($field_name, 'URL');
+ break;
+ case 'DATE':
+ case 'DATETIME':
+ case 'TIMESTAMP':
+ case 'TIME':
+ case 'YEAR':
+ $ret .= $this->getInitVar($field_name, 'LTIME');
+ break;
+ }
+ }
+ return $ret;
+ }
+ /*
+ * @public function getHeadClass
+ * @param string $module_name
+ * @param string $table_name
+ * @param array $fields
+ */
+ public function getHeadClass($module_name, $table_name, $fields) {
+ $ucf_module_name = ucfirst($module_name);
+ $ucf_table_name = ucfirst($table_name);
+ $ret = <<<EOT
+\ndefined('XOOPS_ROOT_PATH') or die("Restricted access");
+/*
+ * Class Object {$ucf_module_name}{$ucf_table_name}
+ */
+class {$ucf_module_name}{$ucf_table_name} extends XoopsObject
+{
+ /*
+ * Constructor
+ *
+ * @param null
+ */
+ public function __construct()
+ {
+ \$this->XoopsObject();
+{$this->getInitVars($fields)}\t}
+ /*
+ * @static function &getInstance
+ * @param null
+ */
+ public static function &getInstance()
+ {
+ static \$instance = false;
+ if (!\$instance) {
+ \$instance = new self();
+ }
+ return \$instance;
+ }\n
+EOT;
+ return $ret;
+ }
+
+ /*
+ * @public function getHeadFunctionForm
+ * @param string $module
+ * @param string $table
+ */
+ public function getHeadFunctionForm($module, $table)
+ {
+ $module_name = strtolower($module->getVar('mod_name'));
+ $lang_add = $this->getLanguage($module_name, 'AM', 'ADD');
+ $lang_edit = $this->getLanguage($module_name, 'AM', 'EDIT');
+ $this->formelements->initForm($module, $table);
+ $ret = <<<EOT
+ /*
+ * Get form
+ *
+ * @param mixed \$action
+ */
+ public function getForm(\$action = false)
+ {
+ if (\$action === false) {
+ \$action = filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_ENCODED);
+ }
+
+ \$title = \$this->isNew() ? sprintf({$lang_add}) : sprintf({$lang_edit});
+
+ xoops_load('XoopsFormLoader');
+ \$form = new XoopsThemeForm(\$title, 'form', \$action, 'post', true);
+ \$form->setExtra('enctype="multipart/form-data"');\n
+{$this->formelements->renderElements()}\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getPermissionsInFunctionForm
+ * @param string $module_name
+ * @param string $fpif
+ */
+ public function getPermissionsInFunctionForm($module_name, $fpif) {
+ $perm_approve = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_APPROVE');
+ $perm_submit = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_SUBMIT');
+ $perm_view = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_VIEW');
+ $ret = <<<EOT
+ // Permissions
+ \$member_handler = & xoops_gethandler ( 'member' );
+ \$group_list = &\$member_handler->getGroupList();
+ \$gperm_handler = &xoops_gethandler ( 'groupperm' );
+ \$full_list = array_keys ( \$group_list );
+ global \$xoopsModule;
+ if ( !\$this->isNew() ) {
+ \$groups_ids_approve = \$gperm_handler->getGroupIds ( '{$module_name}_approve', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) );
+ \$groups_ids_submit = \$gperm_handler->getGroupIds ( '{$module_name}_submit', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) );
+ \$groups_ids_view = \$gperm_handler->getGroupIds ( '{$module_name}_view', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) );
+ \$groups_ids_approve = array_values ( \$groups_ids_approve );
+ \$groups_can_approve_checkbox = new XoopsFormCheckBox ( {$perm_approve}, 'groups_approve[]', \$groups_ids_approve );
+ \$groups_ids_submit = array_values ( \$groups_ids_submit );
+ \$groups_can_submit_checkbox = new XoopsFormCheckBox ( {$perm_submit}, 'groups_submit[]', \$groups_ids_submit );
+ \$groups_ids_view = array_values ( \$groups_ids_view );
+ \$groups_can_view_checkbox = new XoopsFormCheckBox ( {$perm_view}, 'groups_view[]', \$groups_ids_view );
+ } else {
+ \$groups_can_approve_checkbox = new XoopsFormCheckBox ( {$perm_approve}, 'gr...
[truncated message content] |
