Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11050] XoopsModules26/tdmcreate/branches/2.01/timgno /tdmcreate
|
From: <txm...@us...> - 2013-02-13 22:37:15
|
Revision: 11050
http://sourceforge.net/p/xoops/svn/11050
Author: txmodxoops
Date: 2013-02-13 22:37:10 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
Updated
Needed re-installaction
Test
Modified Paths:
--------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/extensions.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/import.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/functions.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/en_US.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_building.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_extensions.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_fields.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_import.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/xoops_version.php
Added Paths:
-----------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/language/english/_admin.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/language/english/_modinfo.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_fields_form.html
Removed Paths:
-------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/forms.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/language/english/admin.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/language/english/modinfo.php
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -37,25 +37,25 @@
{
case 'default':
default:
- $form = new XoopsSimpleForm(_AM_TDMCREATE_BUILDING_TITLE, 'building', 'building.php', 'post', true);
+ $form = new XoopsSimpleForm(TDMCreateLocale::BUILDING_TITLE, 'building', 'building.php', 'post', true);
- $mods_select = new XoopsFormSelect(_AM_TDMCREATE_BUILDING_MODULES, 'mod_name', 'mod_name');
- $mods_select->addOption(0, _AM_TDMCREATE_SELDEFMOD);
+ $mods_select = new XoopsFormSelect(TDMCreateLocale::BUILDING_MODULES, 'mod_name', 'mod_name');
+ $mods_select->addOption(0, TDMCreateLocale::BUILDING_SELDEFMOD);
$mods_select->addOptionArray($modules_Handler->getList());
$form->addElement($mods_select);
- $exts_select = new XoopsFormSelect(_AM_TDMCREATE_BUILDING_EXTENSIONS, 'ext_name', 'ext_name');
- $exts_select->addOption(0, _AM_TDMCREATE_SELDEFEXT);
+ $exts_select = new XoopsFormSelect(TDMCreateLocale::BUILDING_EXTENSIONS, 'ext_name', 'ext_name');
+ $exts_select->addOption(0, TDMCreateLocale::BUILDING_SELDEFEXT);
$exts_select->addOptionArray($extensions_Handler->getList());
$form->addElement($exts_select);
$form->addElement(new XoopsFormHidden('op', 'build'));
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit'));
$xoops->tpl()->assign('form', $form->render());
break;
case 'build':
- $admin_menu->addItemButton(_AM_TDMCREATE_BUILDING_FORM, 'building.php', 'application-view-detail');
+ $admin_menu->addItemButton(TDMCreateLocale::BUILDING_FORM, 'building.php', 'application-view-detail');
$admin_menu->renderButton();
$mods =& $modules_Handler->get($_REQUEST['mod_name']);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -38,7 +38,7 @@
{
case 'list':
default:
- $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_EXTENSION, 'extensions.php?op=new', 'add');
+ $admin_menu->addItemButton(TDMCreateLocale::ADD_EXTENSION, 'extensions.php?op=new', 'add');
$admin_menu->renderButton();
$criteria = new CriteriaCompo();
$criteria->setSort('ext_name');
@@ -72,12 +72,12 @@
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
- $xoops->tpl()->assign('error_message', _AM_TDMCREATE_EXTENSION_ERROR_NOEXTENSIONS);
+ $xoops->tpl()->assign('error_message', TDMCreateLocale::E_NO_EXTENSIONS);
}
break;
case 'new':
- $admin_menu->addItemButton(_AM_TDMCREATE_EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
+ $admin_menu->addItemButton(TDMCreateLocale::EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
$admin_menu->renderButton();
$obj = $extensions_Handler->create();
@@ -113,7 +113,7 @@
$uploader->setPrefix($name_img);
$uploader->fetchMedia($_POST['extensions_image'][0]);
if (!$uploader->upload()) {
- redirect_header('javascript:history.go(-1)',3, $uploader->getErrors());
+ $xoops->redirect('javascript:history.go(-1)',3, $uploader->getErrors());
} else {
$obj->setVar('ext_image', $uploader->getSavedFileName());
}
@@ -140,7 +140,7 @@
'ext_subversion' => $_POST['ext_subversion']));
// Insert Data
if ($extensions_Handler->insert($obj)) {
- redirect_header('extensions.php?op=list', 2, _AM_TDMCREATE_FORMOK);
+ $xoops->redirect('extensions.php?op=list', 2, XoopsLocale::S_DATA_INSERTED);
}
// Form Data
$xoops->error($obj->getHtmlErrors());
@@ -149,8 +149,8 @@
break;
case 'edit':
- $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_EXTENSION, 'extensions.php?op=new', 'add');
- $admin_menu->addItemButton(_AM_TDMCREATE_EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
+ $admin_menu->addItemButton(TDMCreateLocale::EXTENSION_ADD, 'extensions.php?op=new', 'add');
+ $admin_menu->addItemButton(TDMCreateLocale::EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
$admin_menu->renderButton();
$obj = $extensions_Handler->get($system->cleanVars($_REQUEST, 'ext_id', 0, 'int'));
@@ -160,22 +160,22 @@
case 'delete':
$id = $system->cleanVars($_REQUEST, 'ext_id', 0, 'int');
- if ($id > 0) {
+ if ($id != 0) {
$obj = $extensions_Handler->get($id);
if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
$xoops->redirect('extensions.php', 3, implode(',', $xoops->security()->getErrors()));
}
if ($extensions_Handler->delete($obj)) {
- $xoops->redirect('extensions.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_EXTENSION));
+ $xoops->redirect('extensions.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::EXTENSION));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'extensions.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('ext_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'extensions.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('ext_name')) . '<br />');
}
} else {
- $xoops->redirect('extensions.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('extensions.php', 1, TDMCreateLocale::E_DATABASE_ERROR);
}
break;
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -8,7 +8,6 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-
/**
* tdmcreate module
*
@@ -20,49 +19,52 @@
* @version $Id: fields.php 10665 2012-12-27 10:14:15Z timgno $
*/
include dirname(__FILE__) . '/header.php';
-// Get main instance
-$system = System::getInstance();
-$xoops = Xoops::getInstance();
// Preferences Limit
-$nb_pager = $xoops->getModuleConfig('pager');
+$nb_pager = $xoops->getModuleConfig('adminpager');
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+$field_id = $system->cleanVars($_REQUEST, 'field_id', 0, 'int');
+$table_id = $system->cleanVars($_REQUEST, 'table_id', 0, 'int');
// Get limit pager
$limit = $system->cleanVars($_REQUEST, 'limit', 0, 'int');
// Get start pager
$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
-// heaser
-$xoops->header('tdmcreate_fields.html');
// Get handler
/* @var $tables_handler TDMCreateTablesHandler */
$tables_Handler = $xoops->getModuleHandler('tables');
/* @var $fields_handler TDMCreateFieldsHandler */
$fields_Handler = $xoops->getModuleHandler('fields');
+$fieldtype_Handler = $xoops->getModuleHandler('fieldtype');
+$fieldattrs_Handler = $xoops->getModuleHandler('fieldattributes');
+$fieldnull_Handler = $xoops->getModuleHandler('fieldnull');
+$fieldkey_Handler = $xoops->getModuleHandler('fieldkey');
+$fieldelements_Handler = $xoops->getModuleHandler('fieldelements');
$admin_menu->renderNavigation('fields.php');
switch ($op)
{
case 'list':
default:
- $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
- $admin_menu->renderButton();
+ $admin_menu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
+ $admin_menu->renderButton();
+ // heaser
+ $xoops->header('tdmcreate_fields.html');
// Get modules list
$criteria = new CriteriaCompo();
- $criteria->setSort('mod_name');
+ $criteria->setSort('table_name');
$criteria->setOrder('ASC');
$criteria->setStart($start);
$criteria->setLimit($nb_pager);
$numrows_tables = $tables_Handler->getCount($criteria);
$table_arr = $tables_Handler->getAll($criteria);
$xoops->tpl()->assign('tables_count', $numrows_tables);
- $xoops->tpl()->assign('timg_path', TDMC_TABLES_URL_IMG);
unset($criteria);
// Redirect if there aren't modules
/* if ( $numrows_mods == 0 ) {
- redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
+ $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOTMODULES );
}*/
$criteria = new CriteriaCompo();
- $criteria->setSort('table_name');
+ $criteria->setSort('field_name');
$criteria->setOrder('ASC');
$criteria->setStart($start);
$criteria->setLimit($limit);
@@ -76,64 +78,155 @@
foreach (array_keys($table_arr) as $i) {
$tables['id'] = $table_arr[$i]->getVar('table_id');
$tables['name'] = $table_arr[$i]->getVar('table_name');
- $tables['modname'] = TDMCreate_getPathTree($mytree, $table_arr[$i]->getVar('table_mid'), $table_arr, 'table_name');
+ $tables['mid'] = tdmcreate_getPathTree($mytree, $table_arr[$i]->getVar('table_mid'), $table_arr, 'table_name');
$tables['image'] = $table_arr[$i]->getVar('table_image');
- $tables['submenu'] = $table_arr[$i]->getVar('table_submenu');
+ $tables['nbfields'] = $table_arr[$i]->getVar('table_nbfields');
+ $tables['blocks'] = $table_arr[$i]->getVar('table_blocks');
+ $tables['admin'] = $table_arr[$i]->getVar('table_admin');
+ $tables['user'] = $table_arr[$i]->getVar('table_user');
+ $tables['submenu'] = $table_arr[$i]->getVar('table_submenu');
+ $tables['search'] = $table_arr[$i]->getVar('table_search');
+ $tables['comments'] = $table_arr[$i]->getVar('table_comments');
+ $tables['notifications'] = $table_arr[$i]->getVar('table_notifications');
$xoops->tpl()->append_by_ref('tables', $tables);
unset($tables);
if ($numrows_fields > 0) {
foreach (array_keys($field_arr) as $i) {
$field['id'] = $field_arr[$i]->getVar('field_id');
- $field['name'] = $field_arr[$i]->getVar('field_name');
- $field['version'] = $field_arr[$i]->getVar('field_version');
- $field['image'] = $field_arr[$i]->getVar('field_image');
- $field['nbfields'] = $field_arr[$i]->getVar('field_nbfields');
+ $field['tid'] = $field_arr[$i]->getVar('field_tid');
+ $field['name'] = $field_arr[$i]->getVar('field_name');
+ $field['type'] = $field_arr[$i]->getVar('field_type');
+ $field['value'] = $field_arr[$i]->getVar('field_value');
$field['blocks'] = $field_arr[$i]->getVar('field_blocks');
- $field['admin'] = $field_arr[$i]->getVar('field_admin');
- $field['user'] = $field_arr[$i]->getVar('field_user');
- $field['submenu'] = $field_arr[$i]->getVar('field_submenu');
- $field['search'] = $field_arr[$i]->getVar('field_search');
- $field['comments'] = $field_arr[$i]->getVar('field_comments');
- $field['notifies'] = $field_arr[$i]->getVar('field_notifies');
+ $field['attribute'] = $field_arr[$i]->getVar('field_attribute');
+ $field['default'] = $field_arr[$i]->getVar('field_default');
+ $field['key'] = $field_arr[$i]->getVar('field_key');
+ $field['auto_increment'] = $field_arr[$i]->getVar('field_auto_increment');
+ $field['blocks'] = $field_arr[$i]->getVar('field_blocks');
+ $field['search'] = $field_arr[$i]->getVar('field_search');
+ $field['required'] = $field_arr[$i]->getVar('field_required');
$xoops->tpl()->append_by_ref('fields', $field);
unset($field);
}
}
}
// Display Page Navigation
- if ($numrows_mods > $nb_pager) {
- $nav = new XoopsPageNav($numrows_mods, $nb_pager, $start, 'start');
+ if ($numrows_tables > $nb_pager) {
+ $nav = new XoopsPageNav($numrows_tables, $nb_pager, $start, 'start');
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
- $xoops->tpl()->assign('error_message', _AM_TDMCREATE_FIELD_ERROR_NOFIELDS);
+ $xoops->tpl()->assign('error_message', TDMCreateLocale::FIELD_ERROR_NOFIELDS);
}
break;
case 'new':
- $admin_menu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'application-view-detail');
+ $admin_menu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail');
$admin_menu->renderButton();
-
- $obj = $fields_Handler->create();
- $form = $xoops->getModuleForm($obj, 'fields');
- $xoops->tpl()->assign('form', $form->render());
+ // heaser
+ $xoops->header('tdmcreate_fields_form.html');
+
+ $fobj = $fields_Handler->get($field_id);
+ $tobj = $tables_Handler->get($table_id);
+
+ $criteria = new CriteriaCompo(new Criteria('table_id', $tobj->getVar('table_id')));
+ $criteria->add(new Criteria('table_mid', $tobj->getVar('table_mid')));
+ $criteria->setSort('table_name');
+ $criteria->setOrder('ASC');
+ $tables_arr = $tables_Handler->getAll($criteria);
+ unset($criteria);
+
+ $criteria = new CriteriaCompo();
+ //$criteria->add(new Criteria('field_tid', $tobj->getVar('table_id')));
+ //$criteria->add(new Criteria('field_numb', $tobj->getVar('table_nbfields')));
+ $field_arr = $fields_Handler->getAll($criteria);
+ unset($criteria);
+ $numrows_fields = /*$fobj->getVar('table_nbfields')*/12;
+ // Assign Template variablesnew Criteria('field_id', $field_id)
+ $xoops->tpl()->assign('fields_numb_count', $numrows_fields);
+ $field = array();
+ if ($numrows_fields > 0)
+ {
+ foreach (array_keys($field_arr) as $i)
+ {
+ $field['id'] = $field_arr[$i]->getVar('field_id');
+ $field['name'] = new XoopsFormText(TDMCreateLocale::FIELD_NAME, 'field_name', 1, 25, $field_arr[$i]->getVar('field_name'));
+ $field_type_select = new XoopsFormSelect(TDMCreateLocale::FIELD_TYPE, 'field_type', $field_arr[$i]->getVar('field_type'));
+ $field_type_select->addOptionArray($fieldtype_Handler->getList());
+ $field['type'] = $field_type_select->render();
+ $field['value'] = new XoopsFormText(TDMCreateLocale::FIELD_VALUE, 'field_value', 1, 25, $field_arr[$i]->getVar('field_value'));
+ $field_attrs_select = new XoopsFormSelect(TDMCreateLocale::FIELD_ATTRIBUTE, 'field_attribute', $field_arr[$i]->getVar('field_attribute'));
+ $field_attrs_select->addOptionArray($fieldattrs_Handler->getList());
+ $field['attribute'] = $field_attrs_select->render();
+ $field_null_select = new XoopsFormSelect(TDMCreateLocale::FIELD_NULL, 'field_null', $field_arr[$i]->getVar('field_null'));
+ $field_null_select->addOptionArray($fieldnull_Handler->getList());
+ $field['null'] = $field_null_select->render();
+ $field['default'] = new XoopsFormText(TDMCreateLocale::FIELD_DEFAULT, 'field_default', 1, 25, $field_arr[$i]->getVar('field_default'));
+ $field_key_select = new XoopsFormSelect(TDMCreateLocale::FIELD_KEY, 'field_key', $field_arr[$i]->getVar('field_key'));
+ $field_key_select->addOptionArray($fieldkey_Handler->getList());
+ $field['key'] = $field_key_select->render();
+ $field_autoincrement = $field_arr[$i]->getVar('field_auto_increment') ? $field_arr[$i]->getVar('field_auto_increment') : 0;
+ $check_field_autoincrement = new XoopsFormCheckBox(' ', 'field_auto_increment', $field_autoincrement);
+ $check_field_autoincrement->addOption(1, TDMCreateLocale::FIELD_AUTO_INCREMENT);
+ $field['auto_increment'] = $check_field_autoincrement->render();
+ $field_elements_select = new XoopsFormSelect(TDMCreateLocale::FIELD_ELEMENTS, 'field_elements', $field_arr[$i]->getVar('field_elements'));
+ $field_elements_select->addOptionArray($fieldelements_Handler->getList());
+ foreach (array_keys($tables_arr) as $j)
+ {
+ $table_name = $tables_arr[$j]->getVar('table_name');
+ if ( $j[$i] == 'XoopsFormTables-'.$table_name ) {
+ $field_elements_select->addOption('XoopsFormTables-'.$table_name, 'Table : '.$table_name);
+ }
+ }
+ $field['elements'] = $field_elements_select->render();
+ $field_admin = $field_arr[$i]->getVar('field_admin') ? 0 : $field_arr[$i]->getVar('field_admin');
+ $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin', $field_admin);
+ $check_field_admin->addOption(1, TDMCreateLocale::C_FIELD_ADMIN);
+ $field['admin'] = $check_field_admin->render();
+ $field_user = $field_arr[$i]->getVar('field_user') ? 0 : $field_arr[$i]->getVar('field_user');
+ $check_field_user = new XoopsFormCheckBox(' ', 'field_user', $field_user);
+ $check_field_user->addOption(1, TDMCreateLocale::C_FIELD_USER);
+ $field['user'] = $check_field_user->render();
+ $field_block = $field_arr[$i]->getVar('field_blocks') ? 0 : $field_arr[$i]->getVar('field_blocks');
+ $check_field_block = new XoopsFormCheckBox(' ', 'field_block', $field_block);
+ $check_field_block->addOption(1, TDMCreateLocale::C_FIELD_BLOCK);
+ $field['blocks'] = $check_field_block->render();
+ $field_main = $field_arr[$i]->getVar('field_main') ? 0 : $field_arr[$i]->getVar('field_main');
+ $field_main_radio = new XoopsFormRadio(' ', 'field_main', $field_main);
+ $field_main_radio->addOption( ' ', TDMCreateLocale::C_FIELD_MAINFIELD );
+ $field['main'] = $field_main_radio->render();
+ $field_search = $field_arr[$i]->getVar('field_search') ? 0 : $field_arr[$i]->getVar('field_search');
+ $check_field_search = new XoopsFormCheckBox(' ', 'field_search', $field_search);
+ $check_field_search->addOption(1, TDMCreateLocale::C_FIELD_SEARCH);
+ $field['search'] = $check_field_search->render();
+ $field_required = $field_arr[$i]->getVar('field_required') ? 0 : $field_arr[$i]->getVar('field_required');
+ $check_field_required = new XoopsFormCheckBox(' ', 'field_required', $field_required);
+ $check_field_required->addOption(1, TDMCreateLocale::C_FIELD_REQUIRED);
+ $field['required'] = $check_field_required->render();
+ $xoops->tpl()->append_by_ref('fields', $field);
+ unset($field);
+ }
+ } else {
+ $xoops->tpl()->assign('error_message', TDMCreateLocale::E_NO_FIELDS_FORM);
+ }
break;
case 'save':
if ( !$GLOBALS['xoopsSecurity']->check() ) {
- redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ $xoops->redirect('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- if (isset($_REQUEST['field_id'])) {
- $obj =& $fieldsHandler->get($_REQUEST['field_id']);
+
+ if ($field_id) {
+ $obj = $fields_Handler->get($field_id);
} else {
- $obj =& $fieldsHandler->create();
+ $obj = $fields_Handler->create();
}
//Form fields
- $obj->setVars(array('field_table' => $_POST['field_table'], 'field_name' => $_POST['field_name'],
- 'field_type' => $_POST['field_type'], 'field_value' => $_POST['field_value'],
- 'field_attribute' => $_POST['field_attribute'], 'field_null' => $_POST['field_null'],
- 'field_default' => $_POST['field_default'], 'field_key' => $_POST['field_key'],
- 'field_elements' => $_POST['field_elements'],
+ $obj->setVars(array('field_tid' => $_POST['field_tid'], 'field_numb' => $_POST['field_numb'],
+ 'field_name' => $_POST['field_name'], 'field_type' => $_POST['field_type'],
+ 'field_value' => $_POST['field_value'], 'field_attribute' => $_POST['field_attribute'],
+ 'field_null' => $_POST['field_null'], 'field_default' => $_POST['field_default'],
+ 'field_key' => $_POST['field_key'], 'field_elements' => $_POST['field_elements'],
'field_admin' => (($_REQUEST['field_admin'] == 1) ? '1' : '0'),
'field_user' => (($_REQUEST['field_user'] == 1) ? '1' : '0'),
'field_blocks' => (($_REQUEST['field_blocks'] == 1) ? '1' : '0'),
@@ -141,47 +234,121 @@
'field_search' => (($_REQUEST['field_search'] == 1) ? '1' : '0'),
'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0')));
- if ($fieldsHandler->insert($obj)) {
- redirect_header('fields.php?op=list', 2, _AM_TDMCREATE_FORMOK);
+ if ($fields_Handler->insert($obj)) {
+ $xoops->redirect('fields.php', 2, TDMCreateLocale::FORMOK);
}
$xoops->error($obj->getHtmlErrors());
- $form = $xoops->getModuleForm($obj, 'fields');
- $xoops->tpl()->assign('form', $form->render());
break;
case 'edit':
- $admin_menu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'application-view-detail');
- $admin_menu->renderButton();
+ $admin_menu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail');
+ $admin_menu->renderButton();
+ // heaser
+ $xoops->header('tdmcreate_fields_form.html');
- $id = $system->cleanVars($_REQUEST, 'field_id', 0, 'int');
- if ($id > 0) {
- $obj = $tables_Handler->get($id);
- $form = $xoops->getModuleForm($obj, 'fields');
- $xoops->tpl()->assign('form', $form->render());
- } else {
- $xoops->redirect('fields.php', 1, _AM_SYSTEM_DBERROR);
+ $fobj = $fields_Handler->get($field_id);
+ $tobj = $tables_Handler->get($table_id);
+
+ $criteria = new CriteriaCompo(new Criteria('table_id', $tobj->getVar('table_id')));
+ $criteria->add(new Criteria('table_mid', $tobj->getVar('table_mid')));
+ $criteria->setSort('table_name');
+ $criteria->setOrder('ASC');
+ $tables_arr = $tables_Handler->getAll($criteria);
+ unset($criteria);
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('field_tid', $tobj->getVar('table_id')));
+ $field_arr = $fields_Handler->getAll($criteria);
+ unset($criteria);
+
+ $numrows_fields = $fobj->getVar('table_nbfields');
+ // Assign Template variables
+ $xoops->tpl()->assign('fields_count', $numrows_fields);
+
+ if ($numrows_fields > 0)
+ {
+ foreach (array_keys($field_arr) as $i)
+ {
+ $field['id'] = $field_arr[$i]->getVar('field_id');
+ $field['name'] = new XoopsFormText(TDMCreateLocale::FIELD_NAME, 'field_name', 1, 25, $field_arr[$i]->getVar('field_name'));
+ $field_type_select = new XoopsFormSelect(TDMCreateLocale::FIELD_TYPE, 'field_type', $field_arr[$i]->getVar('field_type'));
+ $field_type_select->addOptionArray($fieldtype_Handler->getList());
+ $field['type'] = $field_type_select->render();
+ $field['value'] = new XoopsFormText(TDMCreateLocale::FIELD_VALUE, 'field_value', 1, 25, $field_arr[$i]->getVar('field_value'));
+ $field_attrs_select = new XoopsFormSelect(TDMCreateLocale::FIELD_ATTRIBUTE, 'field_attribute', $field_arr[$i]->getVar('field_attribute'));
+ $field_attrs_select->addOptionArray($fieldattrs_Handler->getList());
+ $field['attribute'] = $field_attrs_select->render();
+ $field_null_select = new XoopsFormSelect(TDMCreateLocale::FIELD_NULL, 'field_null', $field_arr[$i]->getVar('field_null'));
+ $field_null_select->addOptionArray($fieldnull_Handler->getList());
+ $field['null'] = $field_null_select->render();
+ $field['default'] = new XoopsFormText(TDMCreateLocale::FIELD_DEFAULT, 'field_default', 1, 25, $field_arr[$i]->getVar('field_default'));
+ $field_key_select = new XoopsFormSelect(TDMCreateLocale::FIELD_KEY, 'field_key', $field_arr[$i]->getVar('field_key'));
+ $field_key_select->addOptionArray($fieldkey_Handler->getList());
+ $field['key'] = $field_key_select->render();
+ $field_autoincrement = $field_arr[$i]->getVar('field_auto_increment') ? $field_arr[$i]->getVar('field_auto_increment') : 0;
+ $check_field_autoincrement = new XoopsFormCheckBox(' ', 'field_auto_increment', $field_autoincrement);
+ $check_field_autoincrement->addOption(1, TDMCreateLocale::FIELD_AUTO_INCREMENT);
+ $field['auto_increment'] = $check_field_autoincrement->render();
+ $field_elements_select = new XoopsFormSelect(TDMCreateLocale::FIELD_ELEMENTS, 'field_elements', $field_arr[$i]->getVar('field_elements'));
+ $field_elements_select->addOptionArray($fieldelements_Handler->getList());
+ foreach (array_keys($tables_arr) as $j)
+ {
+ $table_name = $tables_arr[$j]->getVar('table_name');
+ if ( $j[$i] == 'XoopsFormTables-'.$table_name ) {
+ $field_elements_select->addOption('XoopsFormTables-'.$table_name, 'Table : '.$table_name);
+ }
+ }
+ $field['elements'] = $field_elements_select->render();
+ $field_admin = $field_arr[$i]->getVar('field_admin') ? 0 : $field_arr[$i]->getVar('field_admin');
+ $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin', $field_admin);
+ $check_field_admin->addOption(1, TDMCreateLocale::FIELD_ADMIN);
+ $field['admin'] = $check_field_admin->render();
+ $field_user = $field_arr[$i]->getVar('field_user') ? 0 : $field_arr[$i]->getVar('field_user');
+ $check_field_user = new XoopsFormCheckBox(' ', 'field_user', $field_user);
+ $check_field_user->addOption(1, TDMCreateLocale::FIELD_USER);
+ $field['user'] = $check_field_user->render();
+ $field_block = $field_arr[$i]->getVar('field_blocks') ? 0 : $field_arr[$i]->getVar('field_blocks');
+ $check_field_block = new XoopsFormCheckBox(' ', 'field_block', $field_block);
+ $check_field_block->addOption(1, TDMCreateLocale::FIELD_DISPLAY_BLOCK);
+ $field['blocks'] = $check_field_block->render();
+ $field_main = $field_arr[$i]->getVar('field_main') ? 0 : $field_arr[$i]->getVar('field_main');
+ $field_main_radio = new XoopsFormRadio(' ', 'field_main', $field_main);
+ $field_main_radio->addOption( ' ', TDMCreateLocale::FIELD_MAINFIELD );
+ $field['main'] = $field_main_radio->render();
+ $field_search = $field_arr[$i]->getVar('field_search') ? 0 : $field_arr[$i]->getVar('field_search');
+ $check_field_search = new XoopsFormCheckBox(' ', 'field_search', $field_search);
+ $check_field_search->addOption(1, TDMCreateLocale::FIELD_SEARCH);
+ $field['search'] = $check_field_search->render();
+ $field_required = $field_arr[$i]->getVar('field_required') ? 0 : $field_arr[$i]->getVar('field_required');
+ $check_field_required = new XoopsFormCheckBox(' ', 'field_required', $field_required);
+ $check_field_required->addOption(1, TDMCreateLocale::FIELD_REQUIRED);
+ $field['required'] = $check_field_required->render();
+ $xoops->tpl()->append_by_ref('fields', $field);
+ unset($field);
+ }
+ } else {
+ $xoops->tpl()->assign('error_message', TDMCreateLocale::E_NO_FIELDS);
}
break;
- case 'delete':
- $id = $system->cleanVars($_REQUEST, 'field_id', 0, 'int');
- if ($id > 0) {
- $obj = $fields_Handler->get($id);
+ case 'delete':
+ if ($field_id > 0) {
+ $obj = $fields_Handler->get($field_id);
if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
$xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors()));
}
if ($fields_Handler->delete($obj)) {
- $xoops->redirect('fields.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_TABLE));
+ $xoops->redirect('fields.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::TABLE));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'fields.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('field_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $field_id, 'op' => 'delete'), 'fields.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('field_name')) . '<br />');
}
} else {
- $xoops->redirect('fields.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('fields.php', 1, TDMCreateLocale::E_DATABASE_ERROR);
}
break;
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -19,9 +19,6 @@
* @version $Id: import.php 10665 2012-12-27 10:14:15Z timgno $
*/
include dirname(__FILE__) . '/header.php';
-// Get main instance
-$system = System::getInstance();
-$xoops = Xoops::getInstance();
// Preferences Limit
$nb_pager = $xoops->getModuleConfig('pager');
// Get Action type
@@ -40,7 +37,7 @@
switch ($op)
{
case 'list':
- $admin_menu->addItemButton(_AM_TDMCREATE_IMPORT, 'import.php?op=import', 'add');
+ $admin_menu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'import.php?op=import', 'add');
$admin_menu->renderButton();
// Get modules list
$criteria = new CriteriaCompo();
@@ -69,12 +66,12 @@
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
- $xoops->tpl()->assign('error_message', _AM_TDMCREATE_IMPORT_ERROR_NOIMPORTS);
+ $xoops->tpl()->assign('error_message', TDMCreateLocale::IMPORT_ERROR_NOIMPORTS);
}
break;
case 'import':
- $admin_menu->addItemButton(_AM_TDMCREATE_IMPORTS_LIST, 'import.php', 'application-view-detail');
+ $admin_menu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'import.php', 'application-view-detail');
$admin_menu->renderButton();
$obj = $import_Handler->create();
@@ -165,7 +162,7 @@
}
if ($import_Handler->insert($obj)) {
- $xoops->redirect('import.php', 3, _AM_TDMCREATE_FORMOK);
+ $xoops->redirect('import.php', 3, TDMCreateLocale::FORM_OK);
}
$xoops->error($obj->getHtmlErrors());
@@ -174,8 +171,8 @@
break;
case 'edit':
- $admin_menu->addItemButton(_AM_TDMCREATE_IMPORT, 'import.php?op=import', 'add');
- $admin_menu->addItemButton(_AM_TDMCREATE_IMPORTS_LIST, 'import.php', 'application-view-detail');
+ $admin_menu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'import.php?op=import', 'add');
+ $admin_menu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'import.php', 'application-view-detail');
$admin_menu->renderButton();
$obj = $import_Handler->get($system->cleanVars($_REQUEST, 'import_id', 0, 'int'));
@@ -192,15 +189,15 @@
$xoops->redirect('import.php', 3, implode(',', $xoops->security()->getErrors()));
}
if ($import_Handler->delete($obj)) {
- $xoops->redirect('import.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_IMPORT));
+ $xoops->redirect('import.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'import.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('import_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'import.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('import_name')) . '<br />');
}
} else {
- $xoops->redirect('import.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('import.php', 1, TDMCreateLocale::E_DATABASE_ERROR);
}
break;
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -50,11 +50,11 @@
$import_color = $tdmcreate_import == 0 ? $r : $g;
$admin_page = new XoopsModuleAdmin();
-$admin_page->addInfoBox(_AM_TDMCREATE_STATISTICS);
-$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NMTOTAL, '<span class="'.$modules_color.'">' . $tdmcreate_modules . '</span>'));
-$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NETOTAL, '<span class="'.$extensions_color.'">' . $tdmcreate_extensions . '</span>'));
-$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NTTOTAL, '<span class="'.$tables_color.'">' . $tdmcreate_tables . '</span>'));
-$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NITOTAL, '<span class="'.$import_color.'">' . $tdmcreate_import . '</span>'));
+$admin_page->addInfoBox(TDMCreateLocale::INDEX_STATISTICS);
+$admin_page->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NMTOTAL, '<span class="'.$modules_color.'">' . $tdmcreate_modules . '</span>'));
+$admin_page->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NETOTAL, '<span class="'.$extensions_color.'">' . $tdmcreate_extensions . '</span>'));
+$admin_page->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NTTOTAL, '<span class="'.$tables_color.'">' . $tdmcreate_tables . '</span>'));
+$admin_page->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NITOTAL, '<span class="'.$import_color.'">' . $tdmcreate_import . '</span>'));
$admin_page->addConfigBoxLine($folder_path, 'folder');
$admin_page->addConfigBoxLine(array($folder_path, '777'), 'chmod');
$admin_page->displayNavigation('index.php');
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -8,7 +8,6 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-
/**
* tdmcreate module
*
@@ -21,35 +20,35 @@
*/
$adminmenu = array();
$i = 0;
-$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU1;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU1;
$adminmenu[$i]['link'] = "admin/index.php";
$adminmenu[$i]['icon'] = 'dashboard.png';
$i++;
-$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU2;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU2;
$adminmenu[$i]['link'] = "admin/modules.php";
$adminmenu[$i]['icon'] = 'addmodule.png';
$i++;
-$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU3;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU3;
$adminmenu[$i]['link'] = "admin/extensions.php";
$adminmenu[$i]['icon'] = 'extensions.png';
$i++;
-$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU4;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU4;
$adminmenu[$i]['link'] = "admin/tables.php";
$adminmenu[$i]['icon'] = 'addtable.png';
$i++;
-$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU5;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU5;
$adminmenu[$i]['link'] = "admin/fields.php";
$adminmenu[$i]['icon'] = 'editfields.png';
$i++;
-$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU6;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU6;
$adminmenu[$i]['link'] = "admin/import.php";
$adminmenu[$i]['icon'] = 'import.png';
$i++;
-$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU7;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU7;
$adminmenu[$i]['link'] = "admin/building.php";
$adminmenu[$i]['icon'] = 'builder.png';
$i++;
-$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU8;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU8;
$adminmenu[$i]['link'] = 'admin/about.php';
$adminmenu[$i]['icon'] = 'about.png';
unset( $i );
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -37,7 +37,7 @@
{
case 'list': http://localhost/xoops-2.6.0-alpha2/htdocs/uploads/tdmcreate/images/modules/
default:
- $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_MODULE, 'modules.php?op=new', 'add');
+ $admin_menu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add');
$admin_menu->renderButton();
// Get modules list
$criteria = new CriteriaCompo();
@@ -73,12 +73,12 @@
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
- $xoops->tpl()->assign('error_message', _AM_TDMCREATE_MODULE_ERROR_NOMODULES);
+ $xoops->tpl()->assign('error_message', TDMCreateLocale::E_NO_MODULES);
}
break;
case 'new':
- $admin_menu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'application-view-detail');
+ $admin_menu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail');
$admin_menu->renderButton();
$obj = $modules_Handler->create();
@@ -106,14 +106,14 @@
'mod_manual_file' => $_POST['mod_manual_file']));
//Form module_image
$uploader = new XoopsMediaUploader( TDMC_MODULES_PATH_IMG, $xoops->getModuleConfig('mimetypes'),
- $xoops->getModuleConfig('maxuploadsize'), null, null);
+ $xoops->getModuleConfig('maxuploadsize'), null, null);
if ($uploader->fetchMedia($_POST['modules_image'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES['modules_image']['name']);
$name_img = 'logo.'.$extension;
$uploader->setPrefix($name_img);
$uploader->fetchMedia($_POST['modules_image'][0]);
if (!$uploader->upload()) {
- redirect_header('javascript:history.go(-1)',3, $uploader->getErrors());
+ $xoops->redirect('javascript:history.go(-1)',3, $uploader->getErrors());
} else {
$obj->setVar('mod_image', $uploader->getSavedFileName());
}
@@ -140,7 +140,7 @@
'mod_subversion' => $_POST['mod_subversion']));
// Insert Data
if ($modules_Handler->insert($obj)) {
- redirect_header('modules.php?op=list', 2, _AM_TDMCREATE_FORMOK);
+ $xoops->redirect('modules.php?op=list', 2, XoopsLocale::S_DATA_INSERTED);
}
// Form Data
$xoops->error($obj->getHtmlErrors());
@@ -149,8 +149,8 @@
break;
case 'edit':
- $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_MODULE, 'modules.php?op=new', 'add');
- $admin_menu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'application-view-detail');
+ $admin_menu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add');
+ $admin_menu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail');
$admin_menu->renderButton();
$obj = $modules_Handler->get($system->cleanVars($_REQUEST, 'mod_id', 0, 'int'));
@@ -159,24 +159,24 @@
break;
case 'delete':
- $id = $system->cleanVars($_REQUEST, 'mod_id', 0, 'int');
- if ($id > 0) {
- $obj = $modules_Handler->get($id);
+ $mid = $system->cleanVars($_REQUEST, 'mod_id', 0, 'int');
+ if ($mid > 0) {
+ $obj = $modules_Handler->get($mid);
if (isset($_POST['ok']) && $_POST['ok'] == 1) {
- if (!$xoops->security()->check()) {
- $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
- }
- if ($modules_Handler->delete($obj)) {
- $xoops->redirect('modules.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_MODULE));
- } else {
- $xoops->error($obj->getHtmlErrors());
- }
- } else {
- $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'modules.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('mod_name')) . '<br />');
+ if (!$xoops->security()->check()) {
+ $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
+ }
+ if ($modules_Handler->delete($obj)) {
+ $xoops->redirect('modules.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::MODULE));
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
+ } else {
+ $xoops->confirm(array('ok' => 1, 'id' => $mid, 'op' => 'delete'), 'modules.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('mod_name')) . '<br />');
}
- } else {
- $xoops->redirect('modules.php', 1, _AM_SYSTEM_DBERROR);
- }
+ } else {
+ $xoops->redirect('modules.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
+ }
break;
}
$xoops->footer();
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -24,6 +24,7 @@
$nb_pager = $xoops->getModuleConfig('adminpager');
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+$table_id = $system->cleanVars($_REQUEST, 'table_id', 0, 'int');
// Get start pager
$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
// heaser
@@ -39,7 +40,7 @@
{
case 'list':
default:
- $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
+ $admin_menu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
$admin_menu->renderButton();
// Get modules list
$criteria = new CriteriaCompo();
@@ -54,7 +55,7 @@
unset($criteria);
// Redirect if there aren't modules
/* if ( $numrows_mods == 0 ) {
- redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
+ $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOTMODULES );
}*/
$criteria = new CriteriaCompo();
$criteria->setSort('table_name');
@@ -111,15 +112,15 @@
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
- $xoops->tpl()->assign('error_message', _AM_TDMCREATE_TABLE_ERROR_NOMODULES);
+ $xoops->tpl()->assign('error_message', TDMCreateLocale::TABLE_ERROR_NOMODULES);
}
break;
case 'new':
- $admin_menu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'application-view-detail');
+ $admin_menu->addItemButton(TDMCreateLocale::TABLES_LIST, 'tables.php', 'application-view-detail');
$admin_menu->renderButton();
- $obj = $tables_Handler->create();
+ $obj = $tables_Handler->create($table_id);
$form = $xoops->getModuleForm($obj, 'tables');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -128,9 +129,9 @@
if (!$xoops->security()->check()) {
$xoops->redirect('tables.php', 3, implode(',', $xoops->security()->getErrors()));
}
- $id = $system->cleanVars($_REQUEST, 'table_id', 0, 'int');
- if ($id > 0) {
- $obj = $tables_Handler->get($id);
+
+ if ($table_id > 0) {
+ $obj = $tables_Handler->get($table_id);
} else {
$obj = $tables_Handler->create();
}
@@ -139,32 +140,26 @@
'table_nbfields' => $_POST['table_nbfields'], 'table_fieldname' => $_POST['table_fieldname']));
//Form table_image
$pathIcon32 = XOOPS_ROOT_PATH . '/media/xoops/images/icons/32';
- if(is_dir($pathIcon32)){
- $uploaddir = $pathIcon32;
- }else{
- $uploaddir = XOOPS_UPLOAD_PATH.'/tdmcreate/images/tables';
- }
-
- $uploader_img = new XoopsMediaUploader($uploaddir, $xoops->getModuleConfig('mimetypes'),
- $xoops->getModuleConfig('maxsize'), null, null);
- if ($uploader_img->fetchMedia('tables_image')) {
- $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['table_image']['name']);
+ $uploaddir = is_dir($pathIcon32) ? $pathIcon32 : TDMC_TABLES_PATH_IMG;
+ $uploader = new XoopsMediaUploader( $uploaddir, $xoops->getModuleConfig('mimetypes'),
+ $xoops->getModuleConfig('maxuploadsize'), null, null);
+ if ($uploader->fetchMedia($_POST['tables_image'][0])) {
+ $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['tables_image']['name']);
$name_img = $_GET['table_name'].'.'.$extension;
- $uploader_img->setPrefix($name_img);
- $uploader_img->fetchMedia('tables_image');
- if (!$uploader_img->upload()) {
- $errors = $uploader_img->getErrors();
- $xoops->redirect('javascript:history.go(-1)', 3, $errors);
- } else {
- $obj->setVar('table_image', $uploaddir . $uploader_img->getSavedFileName());
- }
- } else {
- if ($_POST['tables_image'] == 'blank.gif') {
+ $uploader->setPrefix($name_img);
+ $uploader->fetchMedia($_POST['tables_image'][0]);
+ if (!$uploader->upload()) {
+ $xoops->redirect('javascript:history.go(-1)',3, $uploader->getErrors());
+ } else {
+ $obj->setVar('table_image', $uploader->getSavedFileName());
+ }
+ } else {
+ if ($_POST['tables_image'] == 'blank.gif') {
$obj->setVar('table_image', $_POST['table_image']);
} else {
- $obj->setVar('table_image', $uploaddir . $_POST['table_image']);
+ $obj->setVar('table_image', $_POST['tables_image']);
}
- }
+ }
//Form tables
$obj->setVars(array('table_blocks' => (($_REQUEST['table_blocks'] == 1) ? '1' : '0'),
@@ -176,9 +171,9 @@
'table_notifications' => (($_REQUEST['table_notifications'] == 1) ? '1' : '0')));
if( $tables_Handler->insert($obj) && $obj->isNew() ) {
- redirect_header('fields.php?op=new', 3, _AM_TDMCREATE_FORMOK);
+ $xoops->redirect('fields.php?op=new', 3, XoopsLocale::S_DATA_INSERTED);
} else {
- redirect_header('tables.php?op=list', 3, _AM_TDMCREATE_FORMOK);
+ $xoops->redirect('tables.php?op=list', 3, XoopsLocale::S_DATABASE_UPDATED);
}
$xoops->error($obj->getHtmlErrors());
@@ -187,38 +182,32 @@
break;
case 'edit':
- $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
- $admin_menu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'application-view-detail');
- $admin_menu->renderButton();
-
- $id = $system->cleanVars($_REQUEST, 'table_id', 0, 'int');
- if ($id > 0) {
- $obj = $tables_Handler->get($id);
- $form = $xoops->getModuleForm($obj, 'tables');
- $xoops->tpl()->assign('form', $form->render());
- } else {
- $xoops->redirect('tables.php', 1, _AM_SYSTEM_DBERROR);
- }
+ $admin_menu->addItemButton(TDMCreateLocale::TABLE_ADD, 'tables.php?op=new', 'add');
+ $admin_menu->addItemButton(TDMCreateLocale::TABLES_LIST, 'tables.php', 'application-view-detail');
+ $admin_menu->renderButton();
+
+ $obj = $tables_Handler->get($table_id);
+ $form = $xoops->getModuleForm($obj, 'tables');
+ $xoops->tpl()->assign('form', $form->render());
break;
case 'delete':
- $id = $system->cleanVars($_REQUEST, 'table_id', 0, 'int');
- if ($id > 0) {
- $obj = $tables_Handler->get($id);
+ if ($table_id > 0) {
+ $obj = $tables_Handler->get($table_id);
if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
$xoops->redirect('tables.php', 3, implode(',', $xoops->security()->getErrors()));
}
if ($tables_Handler->delete($obj)) {
- $xoops->redirect('tables.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_TABLE));
+ $xoops->redirect('tables.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::TABLE));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'tables.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('table_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $table_id, 'op' => 'delete'), 'tables.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('table_name')) . '<br />');
}
} else {
- $xoops->redirect('tables.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('tables.php', 1, TDMCreateLocale::E_DATABASE_ERROR);
}
break;
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -28,9 +28,10 @@
*/
public function __construct()
{
- $this->initVar('field_id', XOBJ_DTYPE_INT, null);
+ $this->initVar('field_id', XOBJ_DTYPE_INT, null, true);
$this->initVar('field_tid', XOBJ_DTYPE_INT, null);
$this->initVar('field_name', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('field_numb', XOBJ_DTYPE_INT, null);
$this->initVar('field_type', XOBJ_DTYPE_TXTBOX, null);
$this->initVar('field_value', XOBJ_DTYPE_TXTBOX, null);
$this->initVar('field_attribute', XOBJ_DTYPE_TXTBOX, null);
@@ -45,13 +46,13 @@
$this->initVar('field_search', XOBJ_DTYPE_INT);
$this->initVar('field_required', XOBJ_DTYPE_INT);
// For relationship
- $this->initVar('table_id', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_id', XOBJ_DTYPE_INT, null, true);
$this->initVar('table_module', XOBJ_DTYPE_INT, null);
$this->initVar('table_name', XOBJ_DTYPE_TXTBOX, null);
$this->initVar('table_nbfields', XOBJ_DTYPE_INT, null);
$this->initVar('table_fieldname', XOBJ_DTYPE_TXTBOX, null);
- $this->initVar('fieldtype_id', XOBJ_DTYPE_INT, null);
+ $this->initVar('fieldtype_id', XOBJ_DTYPE_INT, null, true);
$this->initVar('fieldtype_value', XOBJ_DTYPE_TXTBOX, null);
$this->initVar('fieldtype_name', XOBJ_DTYPE_TXTBOX, null);
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/extensions.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/extensions.php 2013-02-13 21:23:28 UTC (rev 11049)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/extensions.php 2013-02-13 22:37:10 UTC (rev 11050)
@@ -30,14 +30,14 @@
{
$xoops = Xoops::getInstance();
- $title = $obj->isNew() ? sprintf(_AM_TDMCREATE_EXTENSION_ADD) : sprintf(_AM_TDMCREATE_EXTENSION_EDIT);
+ $title = $obj->isNew() ? sprintf(TDMCreateLocale::ADD_EXTENSION) : sprintf(TDMCreateLocale::EDIT_EXTENSION);
parent::__construct($title, 'form', 'extensions.php', 'post', true);
$this->setExtra('enctype="multipart/form-data"');
- $this->insertBreak('<div class="center"><b>'._AM_TDMCREATE_EXTENSION_IMPORTANT.'</b></div>','head');
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_NAME, 'ext_name', 50, 255, $obj->getVar('ext_name')), true);
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_VERSION, 'ext_version', 2, 5, $obj->getVar('ext_version')), true);
+ $this->insertBreak('<div class="center"><b>'.TDMCreateLocale::IMPORTANT.'</b></div>','head');
+ $this->addElement(new XoopsFormText(XoopsLocale::C_NAME, 'ext_name', 50, 255, $obj->getVar('ext_name')), true);
+ $this->addElement(new XoopsFormText(XoopsLocale::C_VERSION, 'ext_version', 2, 5, $obj->getVar('ext_version')), true);
$editor_configs=array();
$editor_configs['name'] = 'ext_description';
$editor_configs['value'] = $obj->getVar('ext_description', 'e');
@@ -46,40 +46,40 @@
$editor_configs['width'] = '100%';
$editor_configs['height'] = '400px';
$editor_configs['editor'] = $xoops->getModuleConfig('editor');
- $this->addElement( new XoopsFormEditor(_AM_TDMCREATE_EXTENSION_DESCRIPTION, 'ext_description', $editor_configs), true );
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_AUTHOR, 'ext_author', 50, 255, $obj->getVar('ext_author')), true);
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_LICENSE, 'ext_license', 50, 255, $obj->getVar('ext_license')), true);
- $option_tray = new XoopsFormElementTray(_OPTIONS, ' ');
+ $this->addElement( new XoopsFormEditor(XoopsLocale::C_DESCRIPTION, 'ext_description', $editor_configs), true );
+ $this->addElement(new XoopsFormText(XoopsLocale::C_AUTHOR, 'ext_author', 50, 255, $obj->getVar('ext_author')), true);
+ $this->addElement(new XoopsFormText(TDMCreateLocale::C_LICENSE, 'ext_license', 50, 255, $obj->getVar('ext_license')), true);
+ $option_tray = new XoopsFormElementTray(XoopsLocale::OPTIONS, ' ');
$display_admin = $obj->isNew() ? 0 : $obj->getVar('ext_admin');
$check_display_admin = new XoopsFormCheckBox(' ', 'ext_admin', $display_admin);
- $check_display_admin->addOption(1, _AM_TDMCREATE_EXTENSION_ADMIN);
+ $check_display_admin->addOption(1, TDMCreateLocale::C_ADMIN);
$option_tray->addElement($check_display_admin);
$display_user = $obj->isNew() ? 0 : $obj->getVar('ext_user');
$check_display_user = new XoopsFormCheckBox(' ', 'ext_user', $display_user);
- $check_display_user->addOption(1, _AM_TDMCREATE_EXTENSION_USER);
+ $check_display_user->addOption(1, TDMCreateLocale::C_USER);
$option_tray->addElement($check_display_user);
$display_submenu = $obj->isNew() ? 0 : $obj->getVar('ext_submenu');
$check_display_submenu = new XoopsFormCheckBox(' ', 'ext_submenu', $display_submenu);
- $check_display_submenu->addOption(1, _AM_TDMCREATE_EXTENSION_SUBMENU);
+ $check_display_submenu->addOption(1, TDMCreateLocale::C_SUBMENU);
$option_tray->addElement($check_display_submenu);
$active_search = $obj->isNew() ? 0 : $obj->getVar('ext_search');
$check_active_search = new XoopsFormCheckBox(' ', 'ext_search', $active_search);
- $check_active_search->addOption(1, _AM_TDMCREATE_EXTENSION_SEARCH);
+ $check_active_search->addOption(1, TDMCreateLocale::C_SEARCH);
$option_tray->addElement($check_active_search);
$active_comments = $obj->isNew() ? 0 : $obj->getVar('ext_comments');
$check_active_comments = new XoopsFormCheckBox(' ', 'ext_comments', $active_comments);
- $check_active_comments->addOption(1, _AM_TDMCREATE_EXTENSION_COMMENTS);
+ $check_active_comments->addOption(1, TDMCreateLocale::C_COMMENTS);
$option_tray->addElement($check_active_comments);
$active_notifies = $obj->isNew() ? 0 : $obj->getVar('ext_notifications');
$check_active_notifies = new XoopsFormCheckBox(' ', 'ext_notifications', $active_notifies);
- $check_active_notifies->addOption(1, _AM_TDMCREATE_EXTENSION_NOTIFICATIONS);
+ $check_active_notifies->addOption(1, TDMCreateLocale::C_NOTIFICATIONS);
$option_tray->addElement($check_active_notifies);
$this->addElement($option_tray);
$ext_image = $obj->getVar('ext_image') ? $obj->getVar('ext_image') : 'default_slogo.png';
$uploadir = 'uploads/tdmcreate/images/extensions';
- $imgtray = new XoopsFormElementTray(_AM_TDMCREATE_EXTENSION_IMAGE,'<br />');
- $imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './'.$uploadir.'/');
+ $imgtray = new XoopsFormElementTray(TDMCreateLocale::C_IMAGE,'<br />');
+ $imgpath = sprintf(TDMCreateLocale::CF_IMAGE_PATH, './'.$uploadir.'/');
$imageselect = new X...
[truncated message content] |
