Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12204] XoopsModules/TDMCreate/trunk/TDMCreate
|
From: <be...@us...> - 2013-10-23 02:42:55
|
Revision: 12204
http://sourceforge.net/p/xoops/svn/12204
Author: beckmi
Date: 2013-10-23 02:42:50 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Updating trunk to revision 11534 (timgno: Updated to RC 1
Added more field:
min_php textbox in admin/modules.php
min_xoops textbox in admin/modules.php
min_admin textbox in admin/modules.php
min_mysql textbox in admin/modules.php
Is needed a new installation of the module
For more experienced users just create 4 more fields in the table txmcreate_modules after uploading the files if you overwrite the beta 4
Revision Links:
--------------
http://sourceforge.net/p/xoops/svn/11534
Modified Paths:
--------------
XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php
XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/constArchitecture.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_architecture.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_header.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_comments.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_search.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_sql.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_footer.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_user_pages.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_xoopsversion.php
XoopsModules/TDMCreate/trunk/TDMCreate/docs/changelog.txt
XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php
XoopsModules/TDMCreate/trunk/TDMCreate/js/functions.js
XoopsModules/TDMCreate/trunk/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/english/modinfo.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/update language 1.38 to 1.39.txt
XoopsModules/TDMCreate/trunk/TDMCreate/sql/mysql.sql
XoopsModules/TDMCreate/trunk/TDMCreate/xoops_version.php
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -104,7 +104,7 @@
}
// Creation of classes
if ( $table_admin == 1 || $table_user == 1) {
- const_class($modules, $mod_name, $table_name, $table_fieldname, $table_fields, $table_parameters, $category);
+ const_class($modules, $mod_name, $table_name, $table_fieldname, $category, $table_fields, $table_parameters, $category);
}
// Creation of permissions
if ( $table_category == 1) {
@@ -129,7 +129,7 @@
}
// Creation of notifications
if ( isset($table_notifications) ) {
- const_include_notifications($modules, $mod_name, $table_name, $table_fieldname);
+ const_include_notifications($modules, $modules_name, $table_name, $table_fieldname);
}
// Creation of the file mysql.sql
const_sql($mod_name, $table_name, $table_fieldname, $category, $table_fields);
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -23,7 +23,7 @@
echo $adminMenu->addNavigation('modules.php');
switch ($op)
{
- case 'save':
+ case "save":
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
@@ -55,10 +55,10 @@
//remove all spaces from the new name
$obj->setVar('mod_name', preg_replace('/\s+/', '', $_POST['mod_name']));
$obj->setVar('mod_version', $_POST['mod_version']);
- $obj->setVar('mod_min_php', $_POST['mod_min_php']);
- $obj->setVar('mod_min_xoops', $_POST['mod_min_xoops']);
- $obj->setVar('mod_min_admin', $_POST['mod_min_admin']);
- $obj->setVar('mod_min_db', $_POST['mod_min_db']);
+ $obj->setVar('mod_min_php', $_POST['mod_min_php']);
+ $obj->setVar('mod_min_xoops' => $_POST['mod_min_xoops']);
+ $obj->setVar('mod_min_admin' => $_POST['mod_min_admin']);
+ $obj->setVar('mod_min_mysql' => $_POST['mod_min_mysql']);
$obj->setVar('mod_description', $_POST['mod_description']);
$obj->setVar('mod_author', $_POST['mod_author']);
$obj->setVar('mod_author_mail', $_POST['mod_author_mail']);
@@ -91,25 +91,26 @@
}
break;
- case 'new':
+ case "new":
$adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=list', 'list');
echo $adminMenu->renderButton();
$obj =& $modulesHandler->create();
$form = $obj->getForm();
break;
- case 'edit':
+ case "edit":
$obj =& $modulesHandler->get($_REQUEST['mod_id']);
$form = $obj->getForm();
break;
- case 'delete':
+ case "delete":
$obj =& $modulesHandler->get($_REQUEST['mod_id']);
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1)
{
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- if ($modulesHandler->delete($obj)) {
+ if ($modulesHandler->delete($obj)) {
+ $xoopsDB->queryF("DELETE FROM ".$xoopsDB->prefix("tdmcreate_modules")." WHERE mod_id = ".$_REQUEST['mod_id']);
redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
} else {
echo $obj->getHtmlErrors();
@@ -118,29 +119,18 @@
xoops_confirm(array('ok' => 1, 'mod_id' => $_REQUEST['mod_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('mod_name')));
}
break;
- case 'list':
+ case "list":
default:
$adminMenu->addItemButton(_AM_TDMCREATE_MODULES_NEW, 'modules.php?op=new', 'add');
echo $adminMenu->renderButton();
-
- $limit = $GLOBALS['xoopsModuleConfig']['adminpager'];
- $start = TDMCreate_CleanVars( $_REQUEST, 'start', 0 );
$criteria = new CriteriaCompo();
$criteria->setSort('mod_id');
$criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $mod_arr = $modulesHandler->getall($criteria);
- $numrows = $modulesHandler->getCount();
- if ( $numrows > $limit ) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $pagenav = $pagenav->renderNav(4);
- } else {
- $pagenav = '';
- }
- if ( $numrows > 0 )
+ $mod_arr = $modulesHandler->getall($criteria);
+ $numrows_modules = $modulesHandler->getCount();
+
+ if ( $numrows_modules > 0 )
{
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr class="center">';
@@ -174,8 +164,7 @@
echo '</td>';
echo '</tr>';
}
- echo '</table><br /><br />';
- echo '<div class="right">'.$pagenav.'</div><br />';
+ echo '</table><br><br>';
} else {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr class="center">';
@@ -190,4 +179,4 @@
}
break;
}
-include_once 'admin_footer.php';
\ No newline at end of file
+include_once "admin_footer.php";
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -21,6 +21,7 @@
include_once 'admin_header.php';
$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
echo $adminMenu->addNavigation('tables.php');
+$GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
switch ($op) {
case 'save_table':
if (isset($_REQUEST['table_id'])) {
@@ -51,9 +52,9 @@
$obj->setVar('table_notifications', 0);
$obj->setVar('table_nbfields', 7);
- $table_fields = 'cat_id:int:8: : :unsigned:NOT NULL: :primary|cat_pid:int:5: : :unsigned:NOT NULL:0:unique|cat_title:varchar:255: : : :NOT NULL: :unique|cat_desc:text: : : : :NOT NULL: :|cat_image:varchar:255: : : :NOT NULL: :|cat_weight:int:5: : :unsigned:NOT NULL:0:|cat_color:varchar:10: : : :NULL: :';
+ $table_fields = 'cat_id:int:8:unsigned:NOT NULL: :primary|cat_pid:int:5:unsigned:NOT NULL:0:unique|cat_title:varchar:255: :NOT NULL: :unique|cat_desc:text: : :NOT NULL: :|cat_image:varchar:255: :NOT NULL: :|cat_weight:int:5:unsigned:NOT NULL:0:|cat_color:varchar:10: :NULL: :';
- $table_parameters = 'XoopsFormCategory:0:0:0:0:0:0:0:1|XoopsFormText:1:1:0:0:0:1:0:1|XoopsFormTextArea:0:1:0:0:0:0:0:1|XoopsFormUploadImage:1:1:0:0:0:0:0:0|XoopsFormText:1:1:0:0:0:0:0:0|XoopsFormColorPicker:1:1:0:0:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:0:0:1';
+ $table_parameters = 'XoopsFormCategory:0:0:0:0:0:1|XoopsFormText:1:1:0:1:0:1|XoopsFormTextArea:0:1:0:0:0:1|XoopsFormUploadImage:1:1:0:0:0:0|XoopsFormText:1:1:0:0:0:0|XoopsFormColorPicker:1:1:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1';
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
@@ -62,15 +63,18 @@
$uploaddir = $pathIcon32;
}else{
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
- }
- $uploader = new XoopsMediaUploader($uploaddir, 'gif|jpeg|pjpeg|png', 500000, null, null);
+ }
+
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile1']['name']) ;
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
$name_img = 'category.'.$extension;
$uploader->setTargetFileName($name_img);
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
- redirect_header('javascript:history.go(-1)', 3, $uploader->getErrors());
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
} else {
$obj->setVar('table_image', $uploader->getSavedFileName());
}
@@ -101,8 +105,6 @@
$table_parameters .= ( !empty($_REQUEST['fields_param_elements'][$i]) ) ? "".$_REQUEST['fields_param_elements'][$i].":" : " :";
$table_parameters .= ( !empty($_REQUEST['fields_param_admin'][$i]) ) ? "1:" : "0:";
$table_parameters .= ( !empty($_REQUEST['fields_param_user'][$i]) ) ? "1:" : "0:";
- $table_parameters .= ( !empty($_REQUEST['fields_param_form'][$i]) ) ? "1:" : "0:";
- $table_parameters .= ( !empty($_REQUEST['fields_param_list'][$i]) ) ? "1:" : "0:";
$table_parameters .= ( !empty($_REQUEST['fields_param_blocks'][$i]) ) ? "1:" : "0:";
$table_parameters .= ( $i == $_REQUEST['fields_param_main_field']) ? "1:" : "0:";
$table_parameters .= ( !empty($_REQUEST['fields_param_search_field'][$i]) ) ? "1:" : "0:";
@@ -113,8 +115,6 @@
$table_fields .= (!empty($_REQUEST['fields_name'][$i])) ? $_REQUEST['fields_name'][$i].":" : " :";
$table_fields .= (!empty($_REQUEST['fields_type'][$i])) ? $_REQUEST['fields_type'][$i].":" : " :";
$table_fields .= (!empty($_REQUEST['fields_value'][$i])) ? $_REQUEST['fields_value'][$i].":" : " :";
- $table_fields .= (!empty($_REQUEST['fields_value_size'][$i])) ? $_REQUEST['fields_value_size'][$i].":" : " :";
- $table_fields .= (!empty($_REQUEST['fields_value_maxlength'][$i])) ? $_REQUEST['fields_value_maxlength'][$i].":" : " :";
$table_fields .= (!empty($_REQUEST['fields_attributes'][$i])) ? $_REQUEST['fields_attributes'][$i].":" : " :";
$table_fields .= (!empty($_REQUEST['fields_null'][$i])) ? strtoupper($_REQUEST['fields_null'][$i]).":" : " :";
$table_fields .= (!empty($_REQUEST['fields_default'][$i])) ? $_REQUEST['fields_default'][$i].":" : " :";
@@ -146,7 +146,7 @@
}
if ( isset($_REQUEST['table_online']) ) {
if ( $_REQUEST['table_online'] == 1 ) {
- $table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_online:tinyint:1:unsigned:NOT NULL:0:'; $table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
+ $table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_online:tinyint:1: unsigned:NOT NULL:0:'; $table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
}
} else {
$table_fields .= '';
@@ -229,14 +229,14 @@
$newname = strtolower($_REQUEST['table_fieldname']);
//echo $count_parameters;
//fields
- for($i = 0; $i < $count_fields; $i++)
+ for($i=0; $i<$count_fields; $i++)
{
- $fields = explode(':', $fields_total[$i]);
+ $fields = explode(":", $fields_total[$i]);
$fields[0] = $newname . substr($fields[0], stripos($fields[0], '_'));
$newfields[$i] = implode(":", $fields);
}
- $newTableFields=implode('|',$newfields);
+ $newTableFields=implode("|",$newfields);
$obj->setVar('table_fields', $newTableFields);
if ($tablesHandler->insert($obj)) {
@@ -273,7 +273,7 @@
case "table_fields":
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=table_list', 'list');
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=table_fields', 'add');
- echo $adminMenu->renderButton();
+ echo $adminMenu->renderButton();
//fields existe deja ?
$criteria = new CriteriaCompo();
@@ -373,50 +373,40 @@
$xoopsDB->queryF($sql_del);
}
- $limit = $GLOBALS['xoopsModuleConfig']['adminpager'];
- $start = TDMCreate_CleanVars( $_REQUEST, 'start', 0 );
- $GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/style.css' );
- $GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
-
$criteria = new CriteriaCompo();
$criteria->setSort('mod_id');
$criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($limit);
$mod_arr = $modulesHandler->getall($criteria);
$numrows_modules = $modulesHandler->getCount();
- if ( $numrows_modules > $limit ) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $pagenav = $pagenav->renderNav(4);
- } else {
- $pagenav = '';
- }
+
if ( $numrows_modules > 0 )
{
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr>';
- echo '<th class="center width1">'._AM_TDMCREATE_ID.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_NAME.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_IMAGE.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_BLOCKS.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_NB_FIELDS.'</th>';
- echo '<th class="center width5">'._AM_TDMCREATE_FORMACTION.'</th>';
+ echo '<th align="center" width="1%">'._AM_TDMCREATE_ID.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_NAME.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_BLOCKS.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_NB_FIELDS.'</th>';
+ echo '<th align="center" width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
echo '</tr>';
$class = 'odd';
foreach (array_keys($mod_arr) as $i)
{
$mod_id = $mod_arr[$i]->getVar('mod_id');
$mod_name = $mod_arr[$i]->getVar('mod_name');
+ $mod_image = $mod_arr[$i]->getVar('mod_image');
+ $mod_display_admin = ($mod_arr[$i]->getVar('mod_display_admin') == 1) ? _YES : _NO;
+ $mod_display_user = ($mod_arr[$i]->getVar('mod_display_user') == 1) ? _YES : _NO;
echo '<tr class="odd center toggleTables">';
echo '<td class="width5"><b>'.$i.'</b><br /><img src="../images/icons/16/toggle.png" alt="Toggle" title="Toggle" /></td>';
$nbsps = ' ';
echo '<td class="left">'.$nbsps.'<img src="../images/icons/16/arrow.gif" alt="Arrow" />'.$nbsps.'<b>'.$mod_name.'</b></td>';
- echo '<td><img src="../images/uploads/modules/'.$mod_arr[$i]->getVar('mod_image').'" height="30px"></td>';
- echo '<td>'.(($mod_arr[$i]->getVar('mod_display_admin') == 1) ? _YES : _NO).'</td>';
- echo '<td>'.(($mod_arr[$i]->getVar('mod_display_user') == 1) ? _YES : _NO).'</td>';
+ echo '<td><img src="../images/uploads/modules/'.$mod_image.'" height="30px"></td>';
+ echo '<td>'.$mod_display_admin.'</td>';
+ echo '<td>'.$mod_display_user.'</td>';
echo '<td>~</td>';
echo '<td>~</td>';
echo '<td>';
@@ -426,7 +416,7 @@
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('table_mid', $mod_id));
- $criteria->setSort('table_id');
+ $criteria->setSort('table_name');
$criteria->setOrder('ASC');
$table_arr = $tablesHandler->getall($criteria);
$numrows_tables = $tablesHandler->getCount();
@@ -436,18 +426,23 @@
{
$table_name = $table_arr[$i]->getVar('table_name');
$table_image = $table_arr[$i]->getVar('table_image');
- echo '<tr class="even center toggleHidden">';
+ $table_blocks = $table_arr[$i]->getVar('table_blocks');
+ $table_admin = (($table_arr[$i]->getVar('table_admin') == 1) ? _YES : _NO);
+ $table_user = (($table_arr[$i]->getVar('table_user') == 1) ? _YES : _NO);
+ $nb_fields = $table_arr[$i]->getVar('table_nbfields');
+ $blocks = ($table_blocks == 1) ? _YES : _NO;
+ echo '<tr class="even center">';
echo '<td class="center">'.$i.'</b></a></td>';
- echo '<td class="left"> <b>» '.$table_name.'</b></a></td>';
+ echo '<td class="left"> <b>- '.$table_name.'</b></a></td>';
if(file_exists($image = $pathIcon32.'/'.$table_image)) {
echo '<td><img src="'.$image.'" height="25px"></td>';
} else {
echo '<td><img src="../images/uploads/tables/'.$table_image.'" height="25px"></td>';
}
- echo '<td>'.(($table_arr[$i]->getVar('table_admin') == 1) ? _YES : _NO).'</td>';
- echo '<td>'.(($table_arr[$i]->getVar('table_user') == 1) ? _YES : _NO).'</td>';
- echo '<td>'.(($table_arr[$i]->getVar('table_blocks') == 1) ? _YES : _NO).'</td>';
- echo '<td>'.$table_arr[$i]->getVar('table_nbfields').'</td>';
+ echo '<td>'.$table_admin.'</td>';
+ echo '<td>'.$table_user.'</td>';
+ echo '<td>'.$blocks.'</td>';
+ echo '<td>'.$nb_fields.'</td>';
echo '<td>';
echo '<a href="tables.php?op=edit_table&table_id='.$i.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_fields&table_id='.$i.'"><img src="'. $pathIcon16 .'/inserttable.png" alt="'._AM_TDMCREATE_FORMFIELDS.'" title="'._AM_TDMCREATE_FORMFIELDS.'" /></a> <a href="tables.php?op=delete_table&table_id='.$i.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
echo '</td>';
@@ -455,19 +450,18 @@
}
}
}
- echo '</table><br /><br />';
- echo '<div class="right">'.$pagenav.'</div><br />';
+ echo '</table>';
} else {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr class="center">';
- echo '<th class="center width1">'._AM_TDMCREATE_ID.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_NAME.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_IMAGE.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_BLOCKS.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_NB_FIELDS.'</th>';
- echo '<th class="center width5">'._AM_TDMCREATE_FORMACTION.'</th>';
+ echo '<th width="1%">'._AM_TDMCREATE_ID.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_BLOCKS.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_NB_FIELDS.'</th>';
+ echo '<th width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
echo '<tr><td class="errorMsg" colspan="8">No modules</td></tr>';
echo '</tr></table><br><br>';
}
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/class/constArchitecture.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/class/constArchitecture.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/class/constArchitecture.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -24,110 +24,109 @@
}
class constArchitecture {
- /*
- *
- *
- */
- var $module_name = '';
- /*
- *
- *
- */
- var $folder_name = null;
- /*
- *
- *
- */
- var $file_name = null;
- /*
- *
- *
- */
- var $path = null;
- /*
- *
- *
- */
- var $copieFile;
- /*
- * @pubblic function constructor class
- * @param string $path
- */
- function __construct($path) {
- $this->path = $path;
- }
- /*
- * @pubblic function class
- * @param string $path
- */
- function constArchitecture($path)
- {
- $this->__construct($path);
- }
- /*
- * @pubblic function makeDir
- * @param string $path
- */
- function makeDir($path)
- {
- $this->path = $path;
- if(!is_dir($this->path)) {
- mkdir($this->path, 0705);
- chmod($this->path, 0705);
- }
- }
- /*
- * @pubblic function makeDirModule
- * @param string $folder_name
- */
- function makeDirInModule($folder_name)
- {
- $this->folder_name = $folder_name;
- $fname = $this->path . "/" .$this->module_name. "/" .$this->folder_name;
- if(!is_dir($fname)) {
- mkdir($fname, 0705);
- chmod($fname, 0705);
- }
- }
- /*
- * @pubblic function makeDir & copy file
- * @param string $folder_name
- * @param string $copieFile
- * @param string $file
- */
- function makeDirAndCopyFile($folder_name, $copieFile, $file)
- {
- $this->file_name = $file;
- $this->folder_name = $folder_name;
- $this->copieFile = $copieFile;
- $fname = $this->path . "/" .$this->module_name. "/" .$this->folder_name;
- if(!is_dir($fname)) {
- mkdir($fname, 0705);
- chmod($fname, 0705);
- $this->copyFile($this->folder_name, $this->copieFile, $this->file_name);
- } else {
- $this->copyFile($this->folder_name, $this->copieFile, $this->file_name);
- }
- }
- /*
- * @pubblic function copy file
- * @param string $folder_name
- * @param string $copieFile
- * @param string $file
- */
- function copyFile($folder_name, $copieFile, $file)
- {
- $this->file_name = $file;
- $this->folder_name = $folder_name;
- $this->copieFile = $copieFile;
- $fname = $this->path . "/" .$this->module_name. "/" .$this->folder_name. "/". $this->file_name;
- /*if(!file_exists($fname)) {
+ /*
+ *
+ *
+ */
+ var $module_name = '';
+ /*
+ *
+ *
+ */
+ var $folder_name = null;
+ /*
+ *
+ *
+ */
+ var $file_name = null;
+ /*
+ *
+ *
+ */
+ var $path = null;
+ /*
+ *
+ *
+ */
+ var $copieFile;
+ /*
+ * @pubblic function constructor class
+ * @param string $path
+ */
+ function __construct($path) {
+ $this->path = $path;
+ }
+ /*
+ * @pubblic function class
+ * @param string $path
+ */
+ function constArchitecture($path)
+ {
+ $this->__construct($path);
+ }
+ /*
+ * @pubblic function makeDir
+ * @param string $path
+ */
+ function makeDir($path)
+ {
+ $this->path = $path;
+ if(!is_dir($this->path)) {
+ mkdir($this->path, 0755);
+ chmod($this->path, 0755);
+ }
+ }
+ /*
+ * @pubblic function makeDirModule
+ * @param string $folder_name
+ */
+ function makeDirInModule($folder_name)
+ {
+ $this->folder_name = $folder_name;
+ $fname = $this->path . "/" .$this->module_name. "/" .$this->folder_name;
+ if(!is_dir($fname)) {
+ mkdir($fname, 0755);
+ chmod($fname, 0755);
+ }
+ }
+ /*
+ * @pubblic function makeDir & copy file
+ * @param string $folder_name
+ * @param string $copieFile
+ * @param string $file
+ */
+ function makeDirAndCopyFile($folder_name, $copieFile, $file)
+ {
+ $this->file_name = $file;
+ $this->folder_name = $folder_name;
+ $this->copieFile = $copieFile;
+ $fname = $this->path . "/" .$this->module_name. "/" .$this->folder_name;
+ if(!is_dir($fname)) {
+ mkdir($fname, 0755);
+ chmod($fname, 0755);
+ $this->copyFile($this->folder_name, $this->copieFile, $this->file_name);
+ } else {
+ $this->copyFile($this->folder_name, $this->copieFile, $this->file_name);
+ }
+ }
+ /*
+ * @pubblic function copy file
+ * @param string $folder_name
+ * @param string $copieFile
+ * @param string $file
+ */
+ function copyFile($folder_name, $copieFile, $file)
+ {
+ $this->file_name = $file;
+ $this->folder_name = $folder_name;
+ $this->copieFile = $copieFile;
+ $fname = $this->path . "/" .$this->module_name. "/" .$this->folder_name. "/". $this->file_name;
+ /*if(!file_exists($fname)) {
chmod($fname, 0777);
- copy($this->copieFile, $fname);
- } else {*/
- copy($this->copieFile, $fname);
- //}
-
- }
+ copy($this->copieFile, $fname);
+ } else {*/
+ copy($this->copieFile, $fname);
+ //}
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -36,7 +36,7 @@
$this->initVar('mod_min_php',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['min_php'],false);
$this->initVar('mod_min_xoops',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['min_xoops'],false);
$this->initVar('mod_min_admin',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['min_admin'],false);
- $this->initVar('mod_min_db',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['min_db'],false);
+ $this->initVar('mod_min_mysql',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['min_mysql'],false);
$this->initVar('mod_description',XOBJ_DTYPE_TXTAREA, $GLOBALS['xoopsModuleConfig']['description'], false);
$this->initVar('mod_author',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['author'], false);
$this->initVar('mod_author_mail',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['author_email'],false);
@@ -82,11 +82,11 @@
$form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_IMPORTANT.'</b></div>','head');
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_NAME, 'mod_name', 50, 255, $this->getVar('mod_name')), true);
- $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'mod_version', 10, 25, $this->getVar('mod_version')), true);
+ $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'mod_version', 50, 255, $this->getVar('mod_version')), true);
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MIN_PHP, 'mod_min_php', 10, 25, $this->getVar('mod_min_php')), true);
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MIN_XOOPS, 'mod_min_xoops', 10, 25, $this->getVar('mod_min_xoops')), true);
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MIN_ADMIN, 'mod_min_admin', 10, 25, $this->getVar('mod_min_admin')), true);
- $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MIN_DB, 'mod_min_db', 10, 25, $this->getVar('mod_min_db')), true);
+ $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MIN_MYSQL, 'mod_min_mysql', 10, 25, $this->getVar('mod_min_mysql')), true);
// Name description
$editor_configs=array();
$editor_configs['name'] = 'mod_description';
@@ -240,7 +240,7 @@
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_RELEASE, 'mod_release', 50, 255, $this->getVar('mod_release')));
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_STATUS, 'mod_status', 50, 255, $this->getVar('mod_status')));
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_PAYPAL_BUTTON, 'mod_donations', 50, 255, $this->getVar('mod_donations')));
- $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_SUBVERSION, 'mod_subversion', 20, 25, $this->getVar('mod_subversion')));
+ $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_SUBVERSION, 'mod_subversion', 50, 255, $this->getVar('mod_subversion')));
$form->addElement(new XoopsFormHidden('op', 'save'));
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -78,15 +78,13 @@
</tr>";
for($i=0; $i<$table_nbfields ; $i++)
{
- $field_id = ( $i == 0 ) ? strtolower($table_fieldname).'_id' : strtolower($table_fieldname).'_';
- $field_primary = ( $i == 0 ) ? "checked" : "";
- $field_value = ( $i == 0 ) ? "8" : "";
- $field_value_size = ( $i != 0 ) ? "40" : "";
- $field_value_maxlength = ( $i != 0 ) ? "255" : "";
+ $table_id = ( $i == 0 ) ? strtolower($table_fieldname).'_id' : strtolower($table_fieldname).'_';
+ $table_primary = ( $i == 0 ) ? "checked" : "";
+ $table_value = ( $i == 0 ) ? "8" : "";
$class = ($class == 'even') ? 'odd' : 'even';
echo "<tr class=".$class.">
- <td align='center'><INPUT type='text' size='10' value='".$field_id."' name='fields_name[".$i."]'></td>
+ <td align='center'><INPUT type='text' size='10' value='".$table_id."' name='fields_name[".$i."]'></td>
<td align='center'><SELECT name='fields_type[".$i."]'>
<OPTION VALUE='int'>INT</OPTION>
<OPTION VALUE='tinyint'>TINYINT</OPTION>
@@ -111,13 +109,7 @@
<OPTION VALUE='time'>TIME</OPTION>
<OPTION VALUE='year'>YEAR</OPTION>
</SELECT></td>
- <td align='center'>
- <INPUT type='text' size='2' name='fields_value[".$i."]' value='".$field_value."'>";
- if($i != 0) {
- echo "<br /><INPUT type='text' size='2' name='fields_value_size[".$i."]' value='".$field_value_size."'><br />
- <INPUT type='text' size='2' name='fields_value_maxlength[".$i."]' value='".$field_value_maxlength."'>";
- }
- echo "</td>
+ <td align='center'><INPUT type='text' size='2' name='fields_value[".$i."]' value='".$table_value."'></td>
<td align='center'><SELECT name='fields_attributes[".$i."]'>
<OPTION VALUE=''></OPTION>
<OPTION VALUE='unsigned'>UNSIGNED</OPTION>
@@ -137,7 +129,7 @@
</SELECT></td>
<td align='center'>";
if ( $i != 0 ) {
- echo "<table border='0' style='border-color:#555'; width='100%' cellspacing='1' class='outer'>
+ echo "<table border='0' style='border-color:#666666'; width='100%' cellspacing='1' class='outer'>
<tr>
<td align='left' class='head' width='95%'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_ELEMENTS."</td>
<td align='right' class='even' width='5%'>
@@ -182,36 +174,37 @@
<td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_USER."</td>
<td align='right' class='even'><INPUT type='checkbox' size='4' name='fields_param_user[".$i."]' checked></td>
</tr>
- <tr>
- <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_FORM."</td>
- <td align='right' class='even'><INPUT type='checkbox' size='4' name='fields_param_form[".$i."]' checked></td>
- </tr>
- <tr>
- <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_LIST."</td>
- <td align='right' class='even'><INPUT type='checkbox' size='4' name='fields_param_list[".$i."]' checked></td>
- </tr>
";
- //Pour l'affichage dans les blocks
- $checked_blocks = ( $i == 1 || $i == 2 ) ? "checked" : "";
- echo "<tr>
- <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_BLOCK."</td>
- <td align='right' class='even'><INPUT type='checkbox' size='4' name='fields_param_blocks[".$i."]' ".$checked_blocks."></td>
- </tr>";
+ //Afficher la case blocks
+ if ( $table_blocks == 1 )
+ {
+ //Pour l'affichage dans les blocks
+ $checked_blocks = ( $i == 1 || $i == 2 ) ? "checked" : "";
+ echo "<tr>
+ <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_BLOC."</td>
+ <td align='right' class='even'><INPUT type='checkbox' size='4' name='fields_param_blocks[".$i."]' ".$checked_blocks."></td>
+ </tr>";
+ }
$checked_main_field = ( $i == 1 ) ? "checked" : "";
echo "
<tr>
<td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_MAIN_FIELD."</td>
<td align='right' class='even'><INPUT type='radio' value='".$i."' name='fields_param_main_field' ".$checked_main_field."></td>
- </tr>";
+ </tr>";
+
+ //Afficher la case blocks
+ if ( $table_blocks == 1 )
+ {
+ echo "
+ <tr>
+ <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_SEARCH."</td>
+ <td align='right' class='even'><INPUT type='checkbox' size='4' name='fields_param_search_field[".$i."]' checked></td>
+ </tr>";
+ }
echo "
<tr>
- <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_SEARCH."</td>
- <td align='right' class='even'><INPUT type='checkbox' size='4' name='param_search_field[".$i."]' checked></td>
- </tr>";
- echo "
- <tr>
<td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_REQUIRED."</td>
- <td align='right' class='even'><INPUT type='checkbox' size='4' name='param_required_field[".$i."]' checked></td>
+ <td align='right' class='even'><INPUT type='checkbox' size='4' name='fields_param_required_field[".$i."]' checked></td>
</tr>
</table>";
}
@@ -268,8 +261,6 @@
$fields_name[$i] = '';
$fields_type[$i] = '';
$fields_value[$i] = '';
- $fields_value_size[$i] = '';
- $fields_value_maxlength[$i] = '';
$fields_attributes[$i] = '';
$fields_null[$i] = '';
$fields_default[$i] = '';
@@ -280,12 +271,10 @@
$fields_name[$i] = $fields[0];
$fields_type[$i] = $fields[1];
$fields_value[$i] = $fields[2];
- $fields_value_size[$i] = $fields[3];
- $fields_value_maxlength[$i] = $fields[4];
- $fields_attributes[$i] = $fields[5];
- $fields_null[$i] = $fields[6];
- $fields_default[$i] = $fields[7];
- $fields_index[$i] = $fields[8];
+ $fields_attributes[$i] = $fields[3];
+ $fields_null[$i] = $fields[4];
+ $fields_default[$i] = $fields[5];
+ $fields_index[$i] = $fields[6];
}
}
//parameters
@@ -295,20 +284,16 @@
$param_elements[$i] = '0';
$param_display_admin[$i] = '0';
$param_display_user[$i] = '0';
- $param_display_form[$i] = '0';
- $param_display_list[$i] = '0';
$param_display_blocks[$i] = '0';
} else {
$parameters = explode(":", $parameters_total[$i-1]);
$param_elements[$i] = $parameters[0];
$param_display_admin[$i] = $parameters[1];
$param_display_user[$i] = $parameters[2];
- $param_display_form[$i] = $parameters[3];
- $param_display_list[$i] = $parameters[4];
- $param_display_blocks[$i] = $parameters[5];
- $param_display_main_field[$i] = $parameters[6];
- $param_search_field[$i] = $parameters[7];
- $param_required_field[$i] = $parameters[8];
+ $param_display_blocks[$i] = $parameters[3];
+ $param_display_main_field[$i] = $parameters[4];
+ $fields_param_search_field[$i] = $parameters[5];
+ $fields_param_required_field[$i] = $parameters[6];
}
}
$table_action = $table_mid.'&table_id='.$table_id.'&table_name='.$table_name.'&table_fieldname='.$table_fieldname.'&table_blocks='.$table_blocks.'&table_display_admin='.$table_admin.'&table_display_user='.$table_user.'&table_status='.$table_status.'&table_waiting='.$table_waiting.'&table_online='.$table_online.'&table_search='.$table_search.'&table_comments='.$table_comments.'&table_notifications='.$table_notifications.'&table_nbfields='.$table_nbfields.'&select='.$select;
@@ -446,13 +431,7 @@
}
echo "
</SELECT></td>
- <td align='center'>";
- echo "<INPUT type='text' size='2' name='fields_value[".$i."]' value='".$fields_value[$i]."'>";
- if ($i != 0) {
- echo "<br /><INPUT type='text' size='2' name='fields_value_size[".$i."]' value='".$fields_value_size[$i]."'><br />
- <INPUT type='text' size='2' name='fields_value_maxlength[".$i."]' value='".$fields_value_maxlength[$i]."'>";
- }
- echo "</td>
+ <td align='center'><INPUT type='text' size='2' name='fields_value[".$i."]' value='".$fields_value[$i]."'></td>
<td align='center'><SELECT name='fields_attributes[".$i."]'>";
if ( $fields_attributes[$i] == '' ) {
echo "<OPTION VALUE='' selected></OPTION>";
@@ -619,37 +598,21 @@
}
echo "</td>
</tr>
- <tr>
- <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_FORM."</td>
- <td align='right' class='even'>";
- if ( $param_display_user[$i] == 1 ) {
- echo "<INPUT type='checkbox' size='4' name='fields_param_form[".$i."]' checked>";
+ ";
+ //Afficher la case blocks
+ if ( $table_blocks == 1 )
+ {
+ echo "<tr>
+ <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_BLOC."</td>
+ <td align='right' class='even'>";
+ if ( $param_display_blocks[$i] == 1 ) {
+ echo "<INPUT type='checkbox' size='4' name='fields_param_blocks[".$i."]' checked>";
} else {
- echo "<INPUT type='checkbox' size='4' name='fields_param_form[".$i."]'>";
+ echo "<INPUT type='checkbox' size='4' name='fields_param_blocks[".$i."]'>";
}
echo "</td>
- </tr>
- <tr>
- <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_LIST."</td>
- <td align='right' class='even'>";
- if ( $param_display_user[$i] == 1 ) {
- echo "<INPUT type='checkbox' size='4' name='fields_param_list[".$i."]' checked>";
- } else {
- echo "<INPUT type='checkbox' size='4' name='fields_param_list[".$i."]'>";
- }
- echo "</td>
- </tr>
- ";
- echo "<tr>
- <td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_BLOCK."</td>
- <td align='right' class='even'>";
- if ( $param_display_blocks[$i] == 1 ) {
- echo "<INPUT type='checkbox' size='4' name='fields_param_blocks[".$i."]' checked>";
- } else {
- echo "<INPUT type='checkbox' size='4' name='fields_param_blocks[".$i."]'>";
+ </tr>";
}
- echo "</td>
- </tr>";
echo "
<tr>
<td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_MAIN_FIELD."</td>
@@ -660,30 +623,35 @@
echo "<INPUT type='radio' value='".$i."' name='fields_param_main_field'>";
}
echo "</td>
- </tr>";
+ </tr>";
+ //Afficher la case recherche
+ if ( $table_search == 1 )
+ {
echo "
<tr>
<td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_SEARCH.",</td>
<td align='right' class='even'>";
- if ( $param_search_field[$i] == 1 ) {
- echo "<INPUT type='checkbox' size='4' name='param_search_field[".$i."]' checked>";
+ if ( $fields_param_search_field[$i] == 1 ) {
+ echo "<INPUT type='checkbox' size='4' name='fields_param_search_field[".$i."]' checked>";
} else {
- echo "<INPUT type='checkbox' size='4' name='param_search_field[".$i."]'>";
+ echo "<INPUT type='checkbox' size='4' name='fields_param_search_field[".$i."]'>";
}
echo "</td>
- </tr>";
+ </tr>";
+ }
echo "
<tr>
<td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_REQUIRED."</td>
<td align='right' class='even'>";
- if ( $param_required_field[$i] == 1 ) {
- echo "<INPUT type='checkbox' size='4' name='param_required_field[".$i."]' checked>";
+ if ( $fields_param_required_field[$i] == 1 ) {
+ echo "<INPUT type='checkbox' size='4' name='fields_param_required_field[".$i."]' checked>";
} else {
- echo "<INPUT type='checkbox' size='4' name='param_required_field[".$i."]'>";
+ echo "<INPUT type='checkbox' size='4' name='fields_param_required_field[".$i."]'>";
}
echo "</td>
- </tr>
- </table>";
+ </tr>
+
+ </table>";
}
echo "</td></tr>";
}
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -50,34 +50,21 @@
$fields1 = explode(':', $fields_total[$i]);
$fields[$i] = $fields1[0];
//Afficher dans l'admin
- if( $i == 0 ) {
- $fpe[$i] = $fields[0];
- $fpa[$i] = '0';
- $fpu[$i] = '0';
- $fpf[$i] = '0';
- $fpl[$i] = '0';
- $fpb[$i] = '0';
- $fpm[$i] = '0';
- $fps[$i] = '0';
- $fpr[$i] = '0';
- } else {
- $param = explode(':', $parameters_total[$i-1]);
- $fpe[$i] = $param[0]; // fpe = fields parameters element
- $fpa[$i] = $param[1]; // fpa = fields parameters admin
- $fpu[$i] = $param[2]; // fpu = fields parameters user
- $fpf[$i] = $param[3]; // fpf = fields parameters form
- $fpl[$i] = $param[4]; // fpl = fields parameters list
- $fpb[$i] = $param[5]; // fpb = fields parameters block
- if ( $param[6] == 1 ) {
- $fpm[$i] = $fields[0]; // fpm = fields parameters main field
- }
- $fps[$i] = $param[7]; // fps = fields parameters search
- $fpr[$i] = $param[8]; // fpr = fields parameters required field
- }
+ if( $i == 0 ) {
+ $fpa[$i] = '0';
+ } else {
+ $param = explode(':', $parameters_total[$i-1]);
+ $fpt[$i] = $param[0]; // fpt = fields parameters type
+ $fpa[$i] = $param[2]; // fpa = fields parameters admin
+ $fprf[$i] = $param[6]; // fprf = fields parameters required field
+ if ( $param[4] == 1 ) {
+ $fpmf = $fields[0]; // fpmf = fields parameters main field
+ }
+ }
}
$field_id = $fields[0];
-$field_name = $fields[1];
+$fields_name = $fields[1];
$text .= '
echo $adminMenu->addNavigation(\''.$table_name.'.php\');
@@ -93,7 +80,7 @@
$numrows = $'.$table_name.'Handler->getCount();
$'.$table_name.'_arr = $'.$table_name.'Handler->getAll($criteria);
';
- $fcn = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpe, $fpa, $fpu, $fpf, $fpl, $fpb, $fps, $language, '', 0);
+ $fcn = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, '', 0);
if ( $table_category != 1 )
{
$text .='
@@ -113,7 +100,7 @@
echo "<tr class=\'".$class."\'>";
$class = ($class == "even") ? "odd" : "even";
';
- $fields_data = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpe, $fpa, $fpu, $fpf, $fpl, $fpb, $fps, $language, '', 1);
+ $fields_data = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, '', 1);
$text .= $fields_data.'
echo "<td class=\'center width5\'>
@@ -148,7 +135,7 @@
$cat_weight = $categories_arr[$i]->getVar(\'cat_weight\');
echo "<tr class=\'".$class."\'>";
';
- $fields_data = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpe, $fpa, $fpu, $fpf, $fpl, $fpb, $fps, $language, '', 1);
+ $fields_data = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, '', 1);
$text .= ''.$fields_data.'
echo "<td class=\'center width5\'>
@@ -175,7 +162,7 @@
{
echo "<table width=\'100%\' cellspacing=\'1\' class=\'outer\'>
<tr>';
- $fcn = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpe, $fpa, $fpu, $fpf, $fpl, $fpb, $fps, $language, '', 0);
+ $fcn = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, '', 0);
$text .= $fcn.'
<th class=\'center width5\'>".'.$language.'_FORMACTION."</th>
</tr>";
@@ -191,7 +178,7 @@
$category_weight = $'.$table_name.'_arr[$i]->getVar(\''.$table_fieldname.'_weight\');
echo "<tr class=\'".$class."\'>";
';
- $fields_data = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpe, $fpa, $fpu, $fpf, $fpl, $fpb, $fps, $language, 1, 1);
+ $fields_data = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, 1, 1);
$text .= ''.$fields_data.'
echo "<td class=\'center width5\'>
@@ -217,7 +204,7 @@
} else {
echo "<table width=\'100%\' cellspacing=\'1\' class=\'outer\'>
<tr>';
- $fcn = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpe, $fpa, $fpu, $fpf, $fpl, $fpb, $fps, $language, '', 0);
+ $fcn = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, '', 0);
$text .= $fcn.'
<th class=\'center width5\'>".'.$language.'_FORMACTION."</th>
</tr>
@@ -250,7 +237,7 @@
';
- $fields_save = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpe, $fpa, $fpu, $fpf, $fpl, $fpb, $fps, $language, '', 2);
+ $fields_save = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, '', 2);
$text .= ''.$fields_save.'
@@ -284,7 +271,7 @@
echo $obj->getHtmlErrors();
}
} else {
- xoops_confirm(array(\'ok\' => 1, \''.$field_id.'\' => $_REQUEST[\''.$field_id.'\'], \'op\' => \'delete\'), $_SERVER[\'REQUEST_URI\'], sprintf('.$language.'_FORMSUREDEL, $obj->getVar(\''.$fpm.'\')));
+ xoops_confirm(array(\'ok\' => 1, \''.$field_id.'\' => $_REQUEST[\''.$field_id.'\'], \'op\' => \'delete\'), $_SERVER[\'REQUEST_URI\'], sprintf('.$language.'_FORMSUREDEL, $obj->getVar(\''.$fpmf.'\')));
}
break;';
if(isset($_REQUEST['table_online']) == 1) {
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_architecture.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_architecture.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_architecture.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -48,11 +48,7 @@
// Creation of "css" folder and index.html file
echo $css_index = $classArch->makeDirAndCopyFile('css', $indexFile, 'index.html');
// Creation of "images" folder and index.html file
- echo $images_index = $classArch->makeDirAndCopyFile('images', $indexFile, 'index.html');
- // Creation of "js" folder and index.html file
- echo $images_index = $classArch->makeDirAndCopyFile('js', $indexFile, 'index.html');
- // Creation of "preloads" folder and index.html file
- echo $images_index = $classArch->makeDirAndCopyFile('preloads', $indexFile, 'index.html');
+ echo $images_index = $classArch->makeDirAndCopyFile('images', $indexFile, 'index.html');
//Copy the logo of the module
echo $logo_image = $classArch->CopyFile('images', $fimages.'/uploads/modules/'.$mod_image, strtolower($mod_image));
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -19,12 +19,12 @@
* @version $Id: const_class.php 11084 2013-02-23 15:44:20Z timgno $
*/
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/include/functions_const.php';
-function const_class($modules, $mod_name, $table_name, $table_fieldname, $table_fields, $table_parameters, $category)
+function const_class($modules, $mod_name, $table_name, $table_fieldname, $table_category, $table_fields, $table_parameters, $category)
{
$language = '_AM_'.strtoupper($mod_name).'_';
$file = $mod_name.'_'.$table_name. '.php';
$path_file = TDM_CREATE_MURL.'/'.$mod_name.'/class/'.$file;
- $constructor = const_fields($mod_name, $table_name, $table_fieldname, $table_fields, $language, 0, 0, 0);
+ $constructor = const_fields($mod_name, $table_name, $table_fieldname, $table_category, $table_fields, $language, 0, 0, 0, 0);
//fields
$fields_total = explode('|', $table_fields);
$nb_fields = count($fields_total);
@@ -37,29 +37,22 @@
{
$fields = explode(':', $fields_total[$i]);
//Afficher dans les elements du formulaire et choisir le type
- if( $i == 0 ) {
- $fpaif = $fields[0]; // fpaif = fields parameters auto_increment field
- $fpe[$i] = '0';
- $fpa[$i] = '0';
- $fpu[$i] = '0';
- $fpf[$i] = '0';
- $fpl[$i] = '0';
- $fpr[$i] = '0';
- $fpmf[$i] = '0';
- } else {
- $param = explode(':', $parameters_total[$i-1]);
- //print_r($param);
- $fpe[$i] = $param[0]; // fpe = fields parameters elements
- $fpa[$i] = $param[1]; // fpa = fields parameters display admin
- $fpu[$i] = $param[2]; // fpu = fields parameters display user
- $fpf[$i] = $param[3]; // fpf = fields parameters display form
- $fpl[$i] = $param[4]; // fpl = fields parameters display list
- $fpr[$i] = $param[8]; // fpr = fields parameters required field
- if ( $param[6] == 1 ) {
- $fpmf[$i] = $fields[0]; // fpmf = fields parameters main field
+ if( $i == 0 ) {
+ $fpe[$i] = '0';
+ $fpdf[$i] = '0';
+ $fpif = $fields[0]; // fpif = fields parameters auto_increment field
+ } else {
+ $param = explode(':', $parameters_total[$i-1]);
+ //print_r($param);
+ $fpdf[$i] = $param[3]; // fpdf = fields parameters display form
+ $fpe[$i] = $param[0]; // fpe = fields parameters elements
+ $fprf[$i] = $param[6]; // fprf = fields parameters required field
+ if ( $param[4] == 1 ) {
+ $fpmf = $fields[0]; // fpmf = fields parameters main field
+ }
}
- }
}
+ $form = const_fields($mod_name, $table_name, $table_fieldname, $table_category, $table_fields, $language, $fpdf, $fpe, $fprf, 1);
$text = '<?php'.const_header($modules, $file).'
if (!defined(\'XOOPS_ROOT_PATH\')) {
@@ -91,7 +84,7 @@
$form->setExtra(\'enctype="multipart/form-data"\');
';
- $text .= const_fields($mod_name, $table_name, $table_fieldname, $table_fields, $language, $fpe, $fpr, 1);
+ $text .= $form;
if( $category == 1) {
$up_mod_name = strtoupper($mod_name);
@@ -142,7 +135,7 @@
{
function __construct(&$db)
{
- parent::__construct($db, \'mod_'.$mod_name.'_'.$table_name.'\', \''.$mod_name.'_'.$table_name.'\', \''.$fpaif.'\', \''.$fpmf.'\');
+ parent::__construct($db, \'mod_'.$mod_name.'_'.$table_name.'\', \''.$mod_name.'_'.$table_name.'\', \''.$fpif.'\', \''.$fpmf.'\');
}
}
?>';
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_header.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_header.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_header.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -14,26 +14,25 @@
* @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
+ * @since 2.5.5
* @author Txmod Xoops http://www.txmodxoops.org
* @version $Id: const_header.php 11084 2013-02-23 15:44:20Z timgno $
*/
function const_header($module, $filename)
{
-$text = '';
-$mod_name = $module->getVar('mod_name');
-$mod_version = $module->getVar('mod_version');
-$mod_min_xoops = $module->getVar('mod_min_xoops');
-$mod_revision = $module->getVar('mod_revision');
-$mod_author = $module->getVar('mod_author');
-$mod_credits = $module->getVar('mod_credits');
-$mod_a_m = $module->getVar('mod_author_mail');
-$mod_a_w_url = $module->getVar('mod_author_website_url');
-$mod_license = $module->getVar('mod_license');
-$mod_subversion = $module->getVar('mod_subversion');
-$date = date('D Y/m/d G:i:s');
+ $text = '';
+ $mod_name = $module->getVar('mod_name');
+ $mod_version = $module->getVar('mod_version');
+ $mod_min_xoops = $module->getVar('mod_min_xoops');
+ $mod_author = $module->getVar('mod_author');
+ $mod_credits = $module->getVar('mod_credits');
+ $mod_a_m = $module->getVar('mod_author_mail');
+ $mod_a_w_url = $module->getVar('mod_author_website_url');
+ $mod_license = $module->getVar('mod_license');
+ $mod_subversion = $module->getVar('mod_subversion');
+ $date = date('D Y/m/d G:i:s');
-$text .= '
+ $text .= '
/*
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
@@ -55,5 +54,6 @@
* @version $Id: '.$mod_version.' '.$filename.' '.$mod_subversion.' '.$date.'Z '.$mod_credits.' $
*/
';
-return $text;
-}
\ No newline at end of file
+ return $text;
+}
+?>
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_comments.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_comments.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_comments.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -77,13 +77,12 @@
{
$fields = explode(':', $fields_total[$j]);
//Afficher dans les elements du formulaire et choisir le type
- if( $j == 0 ) {
- $fpmf = 0;
- } else {
+ if( $j != 0 )
+ {
$parameters1 = explode(':', $parameters_total[$j-1]);
if ( $parameters1[4] == 1 )
{
- $fpmf = $fields[0];
+ $fields_param_main_field = $fields[0];
}
}
}
@@ -97,7 +96,7 @@
if ($com_itemid > 0) {
$'.$table_name.'Handler =& xoops_getModuleHandler(\''.$table_name.'\', \''.$mod_name.'\');
$'.$table_name.' = $'.$table_name.'handler->get($com_itemid);
- $com_replytitle = $'.$table_name.'->getVar(\''.$fpmf.'\');
+ $com_replytitle = $'.$table_name.'->getVar(\''.$fields_param_main_field.'\');
include XOOPS_ROOT_PATH.\'/include/comment_new.php\';
}
?>';
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_search.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_search.php 2013-10-23 02:41:30 UTC (rev 12203)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_search.php 2013-10-23 02:42:50 UTC (rev 12204)
@@ -32,55 +32,52 @@
}
//fields
- $fields_total = explode('|', $table_fields);
+ $fields_total = explode("|", $table_fields);
$nb_fields = count($fields_total);
//print_r($fields_total);
//parameters
- $parameters_total = explode('|', $table_parameters);
+ $parameters_total = explode("|", $table_parameters);
$k = 0;
//Recuperation des parameters affichage dans le formulaire
for($j=0; $j<$nb_fields; $j++)
{
- $fields = explode(':', $fields_total[$j]);
-
+ $fields = explode(":", $fields_total[$j]);
//Afficher dans les elements du formulaire et choisir le type
- if( $j == 0 ) {
- $fpsf[$k] = 0;
- $fpmf = 0;
- } else {
- $param = explode(':', $parameters_total[$j-1]);
- if ( $param[7] == 1 )
+ if( $j != 0 )
+ {
+ $parameters1 = explode(":", $parameters_total[$j-1]);
+ if ( $parameters1[5] == 1 )
{
- $fpsf[$k] = $fields[0];
+ $fields_param_search_field[$k] = $fields[0];
$k++;
}
- if ( $param[6] == 1 ) {
- $fpmf = $fields[0];
+ if ( $parameters1[4] == 1 ) {
+ $fields_param_main_field = $fields[0];
}
}
}
- /*function const_search_field($fpsf, $options)
+ function search_field($fields_param_search_field, $options)
{
- $nb_fpsf = count($fpsf);
+ $nb_fields_param_search_field = count($fields_param_search_field);
$sql = '(';
- for($l=0; $l<$nb_fpsf; $l++)
+ for($l=0; $l<$nb_fields_param_search_field; $l++)
{
- if ( $l != $nb_fpsf - 1 ) {
- $sql .= ''.$fpsf[$l].' LIKE \'%$queryarray['.$options.']%\' OR ';
+ if ( $l != $nb_fields_param_search_field - 1 ) {
+ $sql .= ''.$fields_param_search_field[$l].' LIKE \'%$queryarray['.$options.']%\' OR ';
} else {
- $sql .= ''.$fpsf[$l].' LIKE \'%$queryarray[0]%\'';
+ $sql .= ''.$fields_param_search_field[$l].' LIKE \'%$queryarray[0]%\'';
}
}
$sql .= ')';
return $sql;
- } */
+ }
$text = '<?php'.const_header($modules, $file).'
function '.$mod_name.'_search($quer...
[truncated message content] |
