Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12461] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate
|
From: <txm...@us...> - 2014-04-19 16:37:01
|
Revision: 12461
http://sourceforge.net/p/xoops/svn/12461
Author: txmodxoops
Date: 2014-04-19 16:36:55 +0000 (Sat, 19 Apr 2014)
Log Message:
-----------
Updated
Pleace Mamba, Test for http://xoops.org/modules/newbb/viewtopic.php?post_id=357443
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -26,6 +26,7 @@
} else {
$modules =& $modulesHandler;
}
+$mod_name = $modules->getVar('mod_name');
$from_dir = TDMC_UPLOAD_MODULES_PATH.'/'.strtolower($mod_name);
$to_dir = XOOPS_ROOT_PATH.'/modules/'.strtolower($mod_name);
switch ($op) {
@@ -33,7 +34,9 @@
$template_main = 'tdmcreate_building.html';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
// Clear repertory of new module if there are
- TDMCreate_clearDir(TDMC_UPLOAD_MODULES_PATH . '/' . $modules->getVar('mod_name'));
+ TDMCreate_clearDir($from_dir);
+ // Clear repertory of new module if there are in root/modules
+ TDMCreate_clearDir($to_dir);
// Debut
/************************************************/
/*Structure*/
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -27,7 +27,7 @@
$table_nbfields = TDMCreate_CleanVars($_REQUEST, 'table_nbfields');
$table_fieldname = TDMCreate_CleanVars($_REQUEST, 'table_fieldname', '', 'string');
// Get field Variables
-$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id', 0);
+$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id');
$field_mid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
$field_tid = TDMCreate_CleanVars($_REQUEST, 'field_tid');
$field_numb = TDMCreate_CleanVars($_REQUEST, 'field_numb');
@@ -58,6 +58,7 @@
// Get the list of tables
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('table_mid', $table_mid));
+ $criteria->add(new Criteria('table_id', $table_id));
$criteria->setSort('table_id ASC, table_name');
$criteria->setOrder('ASC');
$nb_tables = $tablesHandler->getCount($criteria);
@@ -85,7 +86,7 @@
$table['permissions'] = $tables_arr[$t]->getVar('table_permissions');
// Get the list of tables
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_mid', $field_mid));
+ $criteria->add(new Criteria('field_mid', $table_mid));
$criteria->add(new Criteria('field_tid', $t));
$criteria->setSort('field_id ASC, field_name');
$criteria->setOrder('ASC');
@@ -136,43 +137,49 @@
case 'save':
if ( !$GLOBALS['xoopsSecurity']->check() ) {
redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($field_id)) {
+ }
+
+ if (isset($field_id)) {
$obj =& $fieldsHandler->get($field_id);
} else {
$obj =& $fieldsHandler->create();
- }
- $datas = array();
- for( $i = 0; $i < $table_nbfields; $i++ ) {
- $datas = array('field_mid' => $table_mid[$i],
- 'field_tid' => $table_id[$i],
- 'field_numb' => $table_nbfields[$i],
- 'field_name' => $_POST['field_name'][$i],
- 'field_type' => $_POST['field_type'][$i],
- 'field_value' => $_POST['field_value'][$i],
- 'field_attribute' => $_POST['field_attribute'][$i],
- 'field_null' => $_POST['field_null'][$i],
- 'field_default' => $_POST['field_default'][$i],
- 'field_key' => $_POST['field_key'][$i],
- 'field_autoincrement' => (($_REQUEST['field_autoincrement'][$i] == 1) ? '1' : '0'),
- 'field_element' => $_POST['field_element'][$i],
- 'field_inlist' => (($_REQUEST['field_inlist'][$i] == 1) ? '1' : '0'),
- 'field_inform' => (($_REQUEST['field_inform'][$i] == 1) ? '1' : '0'),
- 'field_admin' => (($_REQUEST['field_admin'][$i] == 1) ? '1' : '0'),
- 'field_user' => (($_REQUEST['field_user'][$i] == 1) ? '1' : '0'),
- 'field_block' => (($_REQUEST['field_block'][$i] == 1) ? '1' : '0'),
- 'field_main' => (($i == $_REQUEST['field_main']) ? '1' : '0'),
- 'field_search' => (($_REQUEST['field_search'][$i] == 1) ? '1' : '0'),
- 'field_required' => (($_REQUEST['field_required'][$i] == 1) ? '1' : '0')
- );
-
- }
- foreach ($datas as $data => $value) {
- $obj->setVars(array($data, $value));
+ }
+ if ($table_nbfields > 0) {
+ $datas = array();
+ for( $i = 0; $i < $table_nbfields; $i++ ) {
+ $datas[$i] = array('field_mid' => $table_mid[$i],
+ 'field_tid' => $table_id[$i],
+ 'field_numb' => $table_nbfields[$i],
+ 'field_name' => $_POST['field_name'][$i],
+ 'field_type' => $_POST['field_type'][$i],
+ 'field_value' => $_POST['field_value'][$i],
+ 'field_attribute' => $_POST['field_attribute'][$i],
+ 'field_null' => $_POST['field_null'][$i],
+ 'field_default' => $_POST['field_default'][$i],
+ 'field_key' => $_POST['field_key'][$i],
+ 'field_autoincrement' => (($_REQUEST['field_autoincrement'][$i] == 1) ? '1' : '0'),
+ 'field_element' => $_POST['field_element'][$i],
+ 'field_inlist' => (($_REQUEST['field_inlist'][$i] == 1) ? '1' : '0'),
+ 'field_inform' => (($_REQUEST['field_inform'][$i] == 1) ? '1' : '0'),
+ 'field_admin' => (($_REQUEST['field_admin'][$i] == 1) ? '1' : '0'),
+ 'field_user' => (($_REQUEST['field_user'][$i] == 1) ? '1' : '0'),
+ 'field_block' => (($_REQUEST['field_block'][$i] == 1) ? '1' : '0'),
+ 'field_main' => (($i == $_REQUEST['field_main']) ? '1' : '0'),
+ 'field_search' => (($_REQUEST['field_search'][$i] == 1) ? '1' : '0'),
+ 'field_required' => (($_REQUEST['field_required'][$i] == 1) ? '1' : '0')
+ );
+ }
+ foreach ($datas as $data => $value) {
+ $obj->setVars(array($data, $value));
+ $fieldsHandler->insert($obj);
+ }
+ }
+ if ($obj->isNew()) {
+ redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_SAVED_OK, $_REQUEST['table_name']));
+ } else {
+ redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_UPDATED_OK, $_REQUEST['table_name']));
}
- if ($fieldsHandler->insert($obj)) {
- redirect_header('fields.php', 2, _AM_TDMCREATE_FORMOK);
- }
+ //
$GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors());
$form = $obj->getForm($field_mid, $field_tid, $field_numb, $field_name);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -137,7 +137,7 @@
} else {
$obj =& $tablesHandler->create();
}
- // Verification if name table exist
+ // Checking if table name exist
$table_name_search = $tablesHandler->getObjects(null);
foreach (array_keys($table_name_search) as $t)
{
@@ -188,9 +188,9 @@
if( $obj->isNew() ) {
$table_iid = $GLOBALS['xoopsDB']->getInsertId();
$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, 3, _AM_TDMCREATE_FORMOK);
+ redirect_header('fields.php?op=new'.$table_action, 3, sprintf(_AM_TDMCREATE_TABLE_FORM_SAVED_OK, $_POST['table_name']));
} else {
- redirect_header('tables.php', 3, _AM_TDMCREATE_FORMOK);
+ redirect_header('tables.php', 3, sprintf(_AM_TDMCREATE_TABLE_FORM_UPDATED_OK, $_POST['table_name']));
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -132,7 +132,7 @@
// Index ID
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$i.'</td>'));
// Field Name
- $field_name = $isNew ? $f_name . '_' : $this->getVar('field_name');
+ $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, $field_name);
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
// Field Type
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -152,6 +152,8 @@
define('_AM_TDMCREATE_TABLE_PERMISSIONS', "Permissions for this table");
// v1.38
define('_AM_TDMCREATE_TABLE_IMAGE_DESC', "<span class='red bold'>WARNING</span>: If you want to choose a new image, is best to name it with the module name before and follow with the name of the image so as not to overwrite any images with the same name, in the <span class='bold'>Frameworks/moduleclasses/moduleadmin/icons/32/</span>. Otherwise an other solution, would be to insert the images in the module, a new folder is created, with the creation of the same module - <span class='bold'>images/32</span>.");
+define('_AM_TDMCREATE_TABLE_FORM_SAVED_OK', "The table <b class='green'>%s</b> is successfully saved");
+define('_AM_TDMCREATE_TABLE_FORM_UPDATED_OK', "The table <b class='green'>%s</b> is successfully updated");
//Form2
define('_AM_TDMCREATE_FIELD_ADD', "Add fields");
@@ -177,6 +179,9 @@
define('_AM_TDMCREATE_FIELD_REQUIRED', "Field: Required");
define('_AM_TDMCREATE_ADMIN_SUBMIT', "Send");
+define('_AM_TDMCREATE_FIELD_FORM_SAVED_OK', "Fields of table %s successfully saved");
+define('_AM_TDMCREATE_FIELD_FORM_UPDATED_OK', "Fields of table %s successfully updated");
+
//Modules.php
//Form
define('_AM_TDMCREATE_MODULES_ADD', "Add a new module");
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -411,5 +411,5 @@
$modversion['config'][$i]['description'] = "";
$modversion['config'][$i]['formtype'] = "textbox";
$modversion['config'][$i]['valuetype'] = "text";
-$modversion['config'][$i]['default'] = '12443';
+$modversion['config'][$i]['default'] = '12458';
unset($i);
\ No newline at end of file
|
