Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12202] XoopsModules/TDMCreate/trunk/TDMCreate
|
From: <be...@us...> - 2013-10-23 02:40:33
|
Revision: 12202
http://sourceforge.net/p/xoops/svn/12202
Author: beckmi
Date: 2013-10-23 02:40:25 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Updating trunk to revision 11504 (timgno: Updated, Work in progress)
Revision Links:
--------------
http://sourceforge.net/p/xoops/svn/11504
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/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_include_common.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/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/xoops_version.php
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -129,7 +129,7 @@
}
// Creation of notifications
if ( isset($table_notifications) ) {
- const_include_notifications($modules, $modules_name, $table_name, $table_fieldname);
+ const_include_notifications($modules, $mod_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:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -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()));
}
@@ -87,26 +87,25 @@
}
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)) {
- $xoopsDB->queryF("DELETE FROM ".$xoopsDB->prefix("tdmcreate_modules")." WHERE mod_id = ".$_REQUEST['mod_id']);
+ if ($modulesHandler->delete($obj)) {
redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
} else {
echo $obj->getHtmlErrors();
@@ -115,18 +114,29 @@
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');
- $mod_arr = $modulesHandler->getall($criteria);
- $numrows_modules = $modulesHandler->getCount();
-
- if ( $numrows_modules > 0 )
+ $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 )
{
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr class="center">';
@@ -160,7 +170,8 @@
echo '</td>';
echo '</tr>';
}
- echo '</table><br><br>';
+ echo '</table><br /><br />';
+ echo '<div class="right">'.$pagenav.'</div><br />';
} else {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr class="center">';
@@ -175,4 +186,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:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -21,7 +21,6 @@
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'])) {
@@ -52,9 +51,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: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';
+ $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';
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
@@ -63,18 +62,15 @@
$uploaddir = $pathIcon32;
}else{
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
- }
-
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
+ }
+ $uploader = new XoopsMediaUploader($uploaddir, 'gif|jpeg|pjpeg|png', 500000, 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()) {
- $errors = $uploader->getErrors();
- redirect_header("javascript:history.go(-1)",3, $errors);
+ redirect_header('javascript:history.go(-1)', 3, $uploader->getErrors());
} else {
$obj->setVar('table_image', $uploader->getSavedFileName());
}
@@ -105,6 +101,8 @@
$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:";
@@ -115,6 +113,8 @@
$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].":" : " :";
@@ -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,12 +373,25 @@
$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">';
@@ -397,16 +410,13 @@
{
$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_image.'" height="30px"></td>';
- echo '<td>'.$mod_display_admin.'</td>';
- echo '<td>'.$mod_display_user.'</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>~</td>';
echo '<td>~</td>';
echo '<td>';
@@ -416,7 +426,7 @@
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('table_mid', $mod_id));
- $criteria->setSort('table_name');
+ $criteria->setSort('table_id');
$criteria->setOrder('ASC');
$table_arr = $tablesHandler->getall($criteria);
$numrows_tables = $tablesHandler->getCount();
@@ -426,23 +436,18 @@
{
$table_name = $table_arr[$i]->getVar('table_name');
$table_image = $table_arr[$i]->getVar('table_image');
- $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 '<tr class="even center toggleHidden">';
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_admin.'</td>';
- echo '<td>'.$table_user.'</td>';
- echo '<td>'.$blocks.'</td>';
- echo '<td>'.$nb_fields.'</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>';
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>';
@@ -450,7 +455,8 @@
}
}
}
- echo '</table>';
+ echo '</table><br /><br />';
+ echo '<div class="right">'.$pagenav.'</div><br />';
} else {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr class="center">';
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -78,13 +78,15 @@
</tr>";
for($i=0; $i<$table_nbfields ; $i++)
{
- $table_id = ( $i == 0 ) ? strtolower($table_fieldname).'_id' : strtolower($table_fieldname).'_';
- $table_primary = ( $i == 0 ) ? "checked" : "";
- $table_value = ( $i == 0 ) ? "8" : "";
+ $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" : "";
$class = ($class == 'even') ? 'odd' : 'even';
echo "<tr class=".$class.">
- <td align='center'><INPUT type='text' size='10' value='".$table_id."' name='fields_name[".$i."]'></td>
+ <td align='center'><INPUT type='text' size='10' value='".$field_id."' name='fields_name[".$i."]'></td>
<td align='center'><SELECT name='fields_type[".$i."]'>
<OPTION VALUE='int'>INT</OPTION>
<OPTION VALUE='tinyint'>TINYINT</OPTION>
@@ -109,7 +111,13 @@
<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='".$table_value."'></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'><SELECT name='fields_attributes[".$i."]'>
<OPTION VALUE=''></OPTION>
<OPTION VALUE='unsigned'>UNSIGNED</OPTION>
@@ -174,6 +182,14 @@
<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>
";
//Afficher la case blocks
if ( $table_blocks == 1 )
@@ -192,19 +208,19 @@
<td align='right' class='even'><INPUT type='radio' value='".$i."' name='fields_param_main_field' ".$checked_main_field."></td>
</tr>";
- //Afficher la case blocks
- if ( $table_blocks == 1 )
+ //Afficher la case search
+ if ( $table_search == 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>
+ <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='fields_param_required_field[".$i."]' checked></td>
+ <td align='right' class='even'><INPUT type='checkbox' size='4' name='param_required_field[".$i."]' checked></td>
</tr>
</table>";
}
@@ -261,6 +277,8 @@
$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] = '';
@@ -271,10 +289,12 @@
$fields_name[$i] = $fields[0];
$fields_type[$i] = $fields[1];
$fields_value[$i] = $fields[2];
- $fields_attributes[$i] = $fields[3];
- $fields_null[$i] = $fields[4];
- $fields_default[$i] = $fields[5];
- $fields_index[$i] = $fields[6];
+ $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];
}
}
//parameters
@@ -284,16 +304,20 @@
$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_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];
+ $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];
}
}
$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;
@@ -431,7 +455,13 @@
}
echo "
</SELECT></td>
- <td align='center'><INPUT type='text' size='2' name='fields_value[".$i."]' value='".$fields_value[$i]."'></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'><SELECT name='fields_attributes[".$i."]'>";
if ( $fields_attributes[$i] == '' ) {
echo "<OPTION VALUE='' selected></OPTION>";
@@ -598,6 +628,26 @@
}
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>";
+ } else {
+ echo "<INPUT type='checkbox' size='4' name='fields_param_form[".$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>
";
//Afficher la case blocks
if ( $table_blocks == 1 )
@@ -631,10 +681,10 @@
<tr>
<td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_SEARCH.",</td>
<td align='right' class='even'>";
- if ( $fields_param_search_field[$i] == 1 ) {
- echo "<INPUT type='checkbox' size='4' name='fields_param_search_field[".$i."]' checked>";
+ if ( $param_search_field[$i] == 1 ) {
+ echo "<INPUT type='checkbox' size='4' name='param_search_field[".$i."]' checked>";
} else {
- echo "<INPUT type='checkbox' size='4' name='fields_param_search_field[".$i."]'>";
+ echo "<INPUT type='checkbox' size='4' name='param_search_field[".$i."]'>";
}
echo "</td>
</tr>";
@@ -643,15 +693,14 @@
<tr>
<td align='left' class='head'>"._AM_TDMCREATE_TABLES_FIELDS_MORE_REQUIRED."</td>
<td align='right' class='even'>";
- if ( $fields_param_required_field[$i] == 1 ) {
- echo "<INPUT type='checkbox' size='4' name='fields_param_required_field[".$i."]' checked>";
+ if ( $param_required_field[$i] == 1 ) {
+ echo "<INPUT type='checkbox' size='4' name='param_required_field[".$i."]' checked>";
} else {
- echo "<INPUT type='checkbox' size='4' name='fields_param_required_field[".$i."]'>";
+ echo "<INPUT type='checkbox' size='4' name='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:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -52,13 +52,26 @@
//Afficher dans l'admin
if( $i == 0 ) {
$fpa[$i] = '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]);
$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
+ $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
+ $fps[$i] = $param[7]; // fps = fields parameters search
+ $fpr[$i] = $param[8]; // fpr = fields parameters required field
+ if ( $param[6] == 1 ) {
+ $fpm = $fields[0]; // fpm = fields parameters main field
}
}
}
@@ -80,7 +93,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, $fpa, $fpt, $language, '', 0);
+ $fcn = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpu, $fpb, $fps, $fpt, $language, '', 0);
if ( $table_category != 1 )
{
$text .='
@@ -100,7 +113,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, $fpa, $fpt, $language, '', 1);
+ $fields_data = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpu, $fpb, $fps, $fpt, $language, '', 1);
$text .= $fields_data.'
echo "<td class=\'center width5\'>
@@ -135,7 +148,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, $fpa, $fpt, $language, '', 1);
+ $fields_data = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpu, $fpb, $fps, $fpt, $language, '', 1);
$text .= ''.$fields_data.'
echo "<td class=\'center width5\'>
@@ -162,7 +175,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, $fpa, $fpt, $language, '', 0);
+ $fcn = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpu, $fpb, $fps, $fpt, $language, '', 0);
$text .= $fcn.'
<th class=\'center width5\'>".'.$language.'_FORMACTION."</th>
</tr>";
@@ -178,7 +191,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, $fpa, $fpt, $language, 1, 1);
+ $fields_data = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpu, $fpb, $fps, $fpt, $language, 1, 1);
$text .= ''.$fields_data.'
echo "<td class=\'center width5\'>
@@ -204,7 +217,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, $fpa, $fpt, $language, '', 0);
+ $fcn = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpu, $fpb, $fps, $fpt, $language, '', 0);
$text .= $fcn.'
<th class=\'center width5\'>".'.$language.'_FORMACTION."</th>
</tr>
@@ -237,7 +250,7 @@
';
- $fields_save = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, '', 2);
+ $fields_save = const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpu, $fpb, $fps, $fpt, $language, '', 2);
$text .= ''.$fields_save.'
@@ -271,7 +284,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(\''.$fpmf.'\')));
+ xoops_confirm(array(\'ok\' => 1, \''.$field_id.'\' => $_REQUEST[\''.$field_id.'\'], \'op\' => \'delete\'), $_SERVER[\'REQUEST_URI\'], sprintf('.$language.'_FORMSUREDEL, $obj->getVar(\''.$fpm.'\')));
}
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:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_architecture.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -48,7 +48,11 @@
// 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');
+ 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');
//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:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -37,22 +37,28 @@
{
$fields = explode(':', $fields_total[$i]);
//Afficher dans les elements du formulaire et choisir le type
- 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
- }
+ if( $i == 0 ) {
+ $fpaif = $fields[0]; // fpaif = fields parameters auto_increment field
+ $fpt[$i] = '0';
+ $fpa[$i] = '0';
+ $fpu[$i] = '0';
+ $fpf[$i] = '0';
+ $fpl[$i] = '0';
+ $fpr[$i] = '0';
+ } else {
+ $param = explode(':', $parameters_total[$i-1]);
+ //print_r($param);
+ $fpt[$i] = $param[0]; // fpt = fields parameters types
+ $fpa[$i] = $param[1]; // fpdf = fields parameters display form
+ $fpu[$i] = $param[2]; // fpdf = fields parameters display form
+ $fpf[$i] = $param[3]; // fpdf = fields parameters display form
+ $fpl[$i] = $param[4]; // fpdf = fields parameters display form
+ $fpr[$i] = $param[8]; // fprf = fields parameters required field
+ if ( $param[6] == 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\')) {
@@ -84,7 +90,7 @@
$form->setExtra(\'enctype="multipart/form-data"\');
';
- $text .= $form;
+ $text .= const_fields($mod_name, $table_name, $table_fieldname, $table_category, $table_fields, $language, $fpt, $fpr, 1);
if( $category == 1) {
$up_mod_name = strtoupper($mod_name);
@@ -135,7 +141,7 @@
{
function __construct(&$db)
{
- parent::__construct($db, \'mod_'.$mod_name.'_'.$table_name.'\', \''.$mod_name.'_'.$table_name.'\', \''.$fpif.'\', \''.$fpmf.'\');
+ parent::__construct($db, \'mod_'.$mod_name.'_'.$table_name.'\', \''.$mod_name.'_'.$table_name.'\', \''.$fpaif.'\', \''.$fpmf.'\');
}
}
?>';
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_common.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_common.php 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_common.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -30,16 +30,21 @@
if (!defined(\''.$stu_mn.'_MODULE_PATH\')) {
define(\''.$stu_mn.'_DIRNAME\', \''.$stl_mn.'\');
define(\''.$stu_mn.'_PATH\', XOOPS_ROOT_PATH.\'/modules/\'.'.$stu_mn.'_DIRNAME);
- define(\''.$stu_mn.'_URL\', XOOPS_URL.\'/modules/\'.'.$stu_mn.'_DIRNAME);
+ define(\''.$stu_mn.'_URL\', XOOPS_URL.\'/modules/\'.'.$stu_mn.'_DIRNAME);
define(\''.$stu_mn.'_UPLOAD_PATH\', XOOPS_UPLOAD_PATH.\'/\'.'.$stu_mn.'_DIRNAME);
define(\''.$stu_mn.'_UPLOAD_URL\', XOOPS_UPLOAD_URL.\'/\'.'.$stu_mn.'_DIRNAME);
+ define(\''.$stu_mn.'IMAGE_PATH\', '.$stu_mn.'_PATH.\'/images\');
+ define(\''.$stu_mn.'IMAGE_URL\', '.$stu_mn.'_URL.\'/images/\');
define(\''.$stu_mn.'_ADMIN\', '.$stu_mn.'_URL . \'/admin/index.php\');
- $logo = '.$stu_mn.'_URL . \'/images/'.str_replace(" ", "", strtolower($mods_a_w_name)).'_logo.png\';
- if(file_exists($logo)) {
- define(\''.$stu_mn.'_AUTHOR_LOGOIMG\', $logo);
+ $dir_images = '.$stu_mn.'IMAGE_URL;
+ $local_logo = '.$stu_mn.'IMAGE_URL . \'/'.str_replace(" ", "", strtolower($mods_a_w_name)).'_logo.png\';
+ $xoops_logo = XOOPS_URL . \'/Frameworks/moduleclasses/icons/32/xoopsmicrobutton.gif\';
+ if(is_dir($dir_images) && file_exists($local_logo)) {
+ $logo = $local_logo;
} else {
- define(\''.$stu_mn.'_AUTHOR_LOGOIMG\', XOOPS_URL . \'/Frameworks/moduleclasses/icons/32/xoopsmicrobutton.gif\');
+ $logo = $xoops_logo;
}
+ define(\''.$stu_mn.'_AUTHOR_LOGOIMG\', $logo);
}
// module information
$copyright = "<a href=\''.$mods_a_w_url.'\' title=\''.$mods_a_w_name.'\' target=\'_blank\'>
@@ -48,5 +53,4 @@
createFile($path_file, $text,
_AM_TDMCREATE_CONST_OK_INCLUDES,
_AM_TDMCREATE_CONST_NOTOK_INCLUDES, $file);
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_search.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_search.php 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_search.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -45,39 +45,39 @@
//Afficher dans les elements du formulaire et choisir le type
if( $j != 0 )
{
- $parameters1 = explode(":", $parameters_total[$j-1]);
- if ( $parameters1[5] == 1 )
+ $param = explode(":", $parameters_total[$j-1]);
+ if ( $param[7] == 1 )
{
- $fields_param_search_field[$k] = $fields[0];
+ $fpsf[$k] = $fields[0];
$k++;
}
- if ( $parameters1[4] == 1 ) {
- $fields_param_main_field = $fields[0];
+ if ( $param[6] == 1 ) {
+ $fpmf = $fields[0];
}
}
}
- function search_field($fields_param_search_field, $options)
+ /*function const_search_field($fpsf, $options)
{
- $nb_fields_param_search_field = count($fields_param_search_field);
+ $nb_fpsf = count($fpsf);
$sql = '(';
- for($l=0; $l<$nb_fields_param_search_field; $l++)
+ for($l=0; $l<$nb_fpsf; $l++)
{
- if ( $l != $nb_fields_param_search_field - 1 ) {
- $sql .= ''.$fields_param_search_field[$l].' LIKE \'%$queryarray['.$options.']%\' OR ';
+ if ( $l != $nb_fpsf - 1 ) {
+ $sql .= ''.$fpsf[$l].' LIKE \'%$queryarray['.$options.']%\' OR ';
} else {
- $sql .= ''.$fields_param_search_field[$l].' LIKE \'%$queryarray[0]%\'';
+ $sql .= ''.$fpsf[$l].' LIKE \'%$queryarray[0]%\'';
}
}
$sql .= ')';
return $sql;
- }
+ } */
$text = '<?php'.const_header($modules, $file).'
function '.$mod_name.'_search($queryarray, $andor, $limit, $offset, $userid)
{
global $xoopsDB;
- $sql = "SELECT '.$table_fieldname.'_id, '.$fields_param_main_field.' FROM ".$xoopsDB->prefix(\'mod_'.$table_name.'\')." WHERE '.$table_fieldname.'_online = 1";
+ $sql = "SELECT '.$table_fieldname.'_id, '.$fpmf.' FROM ".$xoopsDB->prefix(\'mod_'.$table_name.'\')." WHERE '.$table_fieldname.'_online = 1";
if ( $userid != 0 ) {
$sql .= " AND '.$table_fieldname.'_submitter=".intval($userid)." ";
@@ -86,14 +86,33 @@
if ( is_array($queryarray) && $count = count($queryarray) )
{
$sql .= " AND (';
- $text .= ''.search_field($fields_param_search_field, 0).'";
-
- for($i=1;$i<$count;$i++)
+ $nb_fpsf = count($fpsf);
+ $text .= $sql = '(';
+ for($l=0; $l<$nb_fpsf; $l++)
+ {
+ if ( $l != $nb_fpsf - 1 ) {
+ $sql .= ''.$fpsf[$l].' LIKE \'%$queryarray[0]%\' OR ';
+ } else {
+ $sql .= ''.$fpsf[$l].' LIKE \'%$queryarray[0]%\'';
+ }
+ }
+ $sql .= ')';
+ $text .= '
+ for($i = 1; $i < $count; $i++)
{
$sql .= " $andor ";
';
- $text .= '$sql .= "'.search_field($fields_param_search_field, '$i').'";
- }
+ $text .= '$sql .= "'.$sql = '(';
+ for($l = 0; $l < $nb_fpsf; $l++)
+ {
+ if ( $l != $nb_fpsf - 1 ) {
+ $sql .= ''.$fpsf[$l].' LIKE \'%$queryarray[$i]%\' OR ';
+ } else {
+ $sql .= ''.$fpsf[$l].' LIKE \'%$queryarray[0]%\'';
+ }
+ }
+ $sql .= ')';
+ $text .= '}
$sql .= ")";
}
@@ -105,7 +124,7 @@
{
$ret[$i][\'image\'] = "images/icons/'.$img_search.'";
$ret[$i][\'link\'] = "'.$table_name.'.php?'.$table_fieldname.'_id=".$myrow[\''.$table_fieldname.'_id\'];
- $ret[$i][\'title\'] = $myrow[\''.$fields_param_main_field.'\'];
+ $ret[$i][\'title\'] = $myrow[\''.$fpmf.'\'];
$i++;
}
return $ret;
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_sql.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_sql.php 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_sql.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -23,7 +23,7 @@
{
$file = 'mysql.sql';
$path_file = TDM_CREATE_MURL.'/'.$mod_name.'/sql/'.$file;
- $text = const_fields($mod_name, $table_name, $table_fieldname, $table_category, $table_fields, '', 0, 0, 0, 2);
+ $text = const_fields($mod_name, $table_name, $table_fieldname, $table_category, $table_fields, '', 0, 0, 2);
createFile($path_file, $text,
_AM_TDMCREATE_CONST_OK_SQL,
_AM_TDMCREATE_CONST_NOTOK_SQL, $file);
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_footer.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_footer.php 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_footer.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -22,7 +22,7 @@
function const_templates_footer($modules, $mod_name, $comments = null, $notifications = null)
{
$language = '_MA_'.strtoupper($mod_name).'_';
- $file = ''.$modules_name.'_footer.html';
+ $file = ''.$mod_name.'_footer.html';
$template_path_file = TDM_CREATE_MURL.'/'.$mod_name.'/templates/'.$file;
$text = '<{if $social_bookmarks != 0}>
<{include file="db:system_social_bookmarks.html"}>
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_user_pages.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_user_pages.php 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_user_pages.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -52,18 +52,33 @@
{
if( $i == 0 ) {
$fpt[$i] = '0';
+ $fpa[$i] = '0';
+ $fpu[$i] = '0';
+ $fpb[$i] = '0';
+ $fps[$i] = '0';
} else {
$param = explode(':', $parameters_total[$i-1]);
$fpt[$i] = $param[0]; // fpt = fields parameters type
+ $fpa[$i] = $param[1]; // fpa = fields parameters admin
+ $fpu[$i] = $param[2]; // fpu = fields parameters user
+ $fpb[$i] = $param[3]; // fpb = fields parameters block
+ $fps[$i] = $param[5]; // fps = fields parameters search
}
- $structure_fields = explode(':', $fields[$i]);
-
- if ( $fpt[$i] == 'XoopsFormDhtmlTextArea' || $fpt[$i] == 'XoopsFormTextArea' ) {
- $text .= '
- $'.$table_fieldname.'[\''.$structure_fields[0].'\'] = strip_tags($'.$table_name.'_arr[$i]->getVar(\''.$structure_fields[0].'\'));';
- } else {
- $text .= '
- $'.$table_fieldname.'[\''.$structure_fields[0].'\'] = $'.$table_name.'_arr[$i]->getVar(\''.$structure_fields[0].'\');';
+ $field_name = explode(':', $fields[$i]);
+ if ( $fpa[$i] == 1 || $fpu[$i] == 1 || $fpb[$i] == 1 || $fps[$i] == 1 ) {
+ if ( $fpt[$i] == 'XoopsFormDhtmlTextArea' || $fpt[$i] == 'XoopsFormTextArea' ) {
+ $text .= '
+ $'.$table_fieldname.'[\''.$field_name[0].'\'] = strip_tags($'.$table_name.'_arr[$i]->getVar(\''.$field_name[0].'\'));';
+ } elseif ( $fpt[$i] == 'XoopsFormTextDateSelect' ) {
+ $text .= '
+ $'.$table_fieldname.'[\''.$field_name[0].'\'] = formatTimeStamp($'.$table_name.'_arr[$i]->getVar(\''.$field_name[0].'\'),"S");';
+ } elseif ( $fpt[$i] == 'XoopsFormSelectUser' ) {
+ $text .= '
+ $'.$table_fieldname.'[\''.$field_name[0].'\'] = XoopsUser::getUnameFromId($'.$table_name.'_arr[$i]->getVar(\''.$field_name[0].'\'),"S");';
+ } else {
+ $text .= '
+ $'.$table_fieldname.'[\''.$field_name[0].'\'] = $'.$table_name.'_arr[$i]->getVar(\''.$field_name[0].'\');';
+ }
}
}
$text .= '
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/docs/changelog.txt
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/docs/changelog.txt 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/docs/changelog.txt 2013-10-23 02:40:25 UTC (rev 12202)
@@ -1,4 +1,17 @@
=================================
+2013/04/04: Version 1.39 Beta 4
+=================================
+
+- added: notifications file, function and code
+- added: grouppermissions file, function and code
+- added: jquery toggle function on admin/tables.php
+- added: pagenav.php class in admin/modules.php and admin/tables.php
+- added: break separator for config module in preferences
+- added: html <table /> in template files const
+- fixed bugs for categories
+- changed category with categories(table_name) and cat(table_fieldname)
+
+=================================
2013/03/28: Version 1.39 Beta 3
=================================
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -27,7 +27,7 @@
include_once TDM_CREATE_URL.'/const/const_header.php';
-function const_fields($mod_name, $table_name, $table_fieldname, $table_category, $table_fields, $lng, $fpdf = 0, $flds_prm_elms = 0, $flds_prm_req_fld = 0, $option = 0)
+function const_fields($mod_name, $table_name, $table_fieldname, $table_category, $table_fields, $lng, $fpt = 0, $fprf = 0, $option = 0)
{
// fpdf = fields_param_display_form
$text = '';
@@ -80,7 +80,7 @@
if ( $i != 0 ) {
$struct = explode(':', $fields[$i]);
$lng_form = $lng.strtoupper($struct[0]);
- $text .= form_elements($i, $mod_name, $table_name, $table_fieldname, $table_category, $flds_prm_elms, $flds_prm_req_fld, $lng_form, $struct[0]);
+ $text .= form_elements($i, $mod_name, $table_name, $table_fieldname, $table_category, $fpt = 0, $fprf = 0, $lng_form, $struct[0]);
}
}
} else if ( $option == 2 ) {
@@ -200,7 +200,7 @@
}
//
-function const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $fields_id, $nb_fields, $fields, $fpda, $fields_param_type, $lng, $prefix = '', $option = 0)
+function const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $fields_id, $nb_fields, $fields, $fpt, $fpa, $fpu, $fpf, $fpl, $fpb, $fps, $lng, $prefix = '', $option = 0)
{
$text = '';
@@ -219,64 +219,61 @@
//Donn\xE9es du tableau
for($i=0; $i<$nb_fields; $i++)
{
- if ( $fpda[$i] == 1 ) {
+ if ( $fpa[$i] == 1 || $fpu[$i] == 1 || $fpf[$i] == 1 || $fpl[$i] == 1|| $fpb[$i] == 1 || $fps[$i] == 1 ) {
if ( $i == $nb_fields )// - 1
{
if(isset($_REQUEST['table_online']) == 1) {
$text .= '
$online = $'.$table_name.'_arr[$i]->getVar("'.$fields[$i].'");
if( $online == 1 ) {
- echo "<td class=\'center\'><a href=\'./'.$table_name.'.php?op=update_online&'.$fields_id.'=".$'.$table_name.'_arr[$i]->getVar("'.$fields_id.'")."&'.$table_fieldname.'_online=0\'><img src=".$pathIcon16."/on.png border=\'0\' alt=\'"._ON."\' title=\'"._ON."\'></a></td>";
+ echo "<td class=\'center\'><a href=\'./'.$table_name.'.php?op=update_online&'.$fields_id.'=".$'.$table_name.'_arr[$i]->getVar("'.$fields_id.'")."&'.$table_fieldname.'_online=0\'><img src=".$pathIcon16."/on.png border=\'0\' alt=\'"._ON."\' title=\'"._ON."\' /></a></td>";
} else {
- echo "<td class=\'center\'><a href=\'./'.$table_name.'.php?op=update_online&'.$fields_id.'=".$'.$table_name.'_arr[$i]->getVar("'.$fields_id.'")."&'.$table_fieldname.'_online=1\'><img src=".$pathIcon16."/off.png border=\'0\' alt=\'"._OFF."\' title=\'"._OFF."\'></a></td>";
+ echo "<td class=\'center\'><a href=\'./'.$table_name.'.php?op=update_online&'.$fields_id.'=".$'.$table_name.'_arr[$i]->getVar("'.$fields_id.'")."&'.$table_fieldname.'_online=1\'><img src=".$pathIcon16."/off.png border=\'0\' alt=\'"._OFF."\' title=\'"._OFF."\' /></a></td>";
}'; }
} else if ( $fields[$i] == $table_fieldname.'_title' ) {
if ( $prefix != '' ) {
$text .= 'echo "<td class=\'left\'> ".$prefix." ".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\')."</td>";
';
} else {
- $text .= 'echo "<td class=\'left\'><img src=\'".'.strtoupper($mod_name).'_URL."/images/icons/16/arrow.gif\'> ".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\')."</td>";
+ $text .= 'echo "<td class=\'left\'><img src=\'".'.strtoupper($mod_name).'_URL."/images/icons/16/arrow.gif\' /> ".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\')."</td>";
';
}
- } else if ( $fields_param_type[$i] == 'XoopsFormUploadImage' ) {
+ } else if ( $fpt[$i] == 'XoopsFormUploadImage' ) {
$text .= '$'.$table_fieldname.'_image = $'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\');
- if(file_exists($image = XOOPS_UPLOAD_URL."/'.$mod_name.'/images/'.$table_name.'/".$'.$table_fieldname.'_image)) {
- echo "<td class=\'center\'><img src=\'".$image."\' height=\'30px\' alt=\''.$fields[$i].'\'></td>";
- } else {
- echo "<td class=\'center\'><img src=\'../images/'.$table_name.'/".$'.$table_fieldname.'_image."\' height=\'30px\' alt=\''.$fields[$i].'\'></td>";
- }
+ $image = '.strtoupper($mod_name).'_UPLOAD_URL."/images/'.$table_name.'/".$'.$table_fieldname.'_image;
+ echo "<td class=\'center\'><img src=\'".$image."\' height=\'30px\' alt=\''.$fields[$i].'\'></td>";
';
- } else if ( $fields_param_type[$i] == 'XoopsFormUploadFile' )
+ } else if ( $fpt[$i] == 'XoopsFormUploadFile' )
{
$text .= 'echo "<td class=\'center\'>".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\')."</td>";
';
- } else if ( $fields_param_type[$i] == 'XoopsFormColorPicker' )
+ } else if ( $fpt[$i] == 'XoopsFormColorPicker' )
{
$text .= 'echo "<td class=\'center\'><span style=\'background-color:".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\')."\'> </span> -> ".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\')."</td>";
';
- } else if ( $fields_param_type[$i] == 'XoopsFormTextDateSelect' )
+ } else if ( $fpt[$i] == 'XoopsFormTextDateSelect' )
{
$text .= 'echo "<td class=\'center\'>".formatTimeStamp($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\'),"S")."</td>";
';
- } else if ( $fields_param_type[$i] == 'XoopsFormCategory' )
+ } else if ( $fpt[$i] == 'XoopsFormCategory' )
{
$text .= '$'.$table_fieldname.'1 = $categoriesHandler->get($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\'));
$'.$table_fieldname.'_categories1 = $'.$table_fieldname.'1->getVar(\''.$table_fieldname.'_title\');
echo "<td class=\'center\'>".$'.$table_fieldname.'_categories1."</td>";
';
- } else if ( $fields_param_type[$i] == 'XoopsFormSelectUser' )
+ } else if ( $fpt[$i] == 'XoopsFormSelectUser' )
{
$text .= 'echo "<td class=\'center\'>".XoopsUser::getUnameFromId($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\'),"S")."</td>";
';
- } else if ( $fields_param_type[$i] == 'XoopsFormText' || $fields_param_type[$i] == 'XoopsFormDhtmlTextArea' || $fields_param_type[$i] == 'XoopsFormTextArea' ) {
+ } else if ( $fpt[$i] == 'XoopsFormText' || $fpt[$i] == 'XoopsFormDhtmlTextArea' || $fpt[$i] == 'XoopsFormTextArea' ) {
$text .= 'echo "<td class=\'center\'>".strip_tags($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\'))."</td>";
';
- } else if ( $fields_param_type[$i] == 'XoopsFormCheckBox' || $fields_param_type[$i] == 'XoopsFormRadioYN' ) {
+ } else if ( $fpt[$i] == 'XoopsFormCheckBox' || $fpt[$i] == 'XoopsFormRadioYN' ) {
$text .= 'echo "<td class=\'center\'>".( ($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\') == 1 ) ? _YES : _NO)."</td>";
';
} else {
- $data = explode("-", $fields_param_type[$i]);
+ $data = explode("-", $fpt[$i]);
// Handler select table
$tablesHandler =& xoops_getModuleHandler('TDMCreate_tables', 'TDMCreate');
$criteria = new CriteriaCompo();
@@ -284,56 +281,51 @@
$tables_select_arr = $tablesHandler->getall($criteria);
foreach (array_keys($tables_select_arr) as $k)
- {
- $tables_select_fields = $tables_select_arr[$k]->getVar('table_fields');
- $tables_select_parameters = $tables_select_arr[$k]->getVar('table_parameters');
-
+ {
// Fields
- $fields_total_select = explode("|", $tables_select_fields);
+ $fields_total_select = explode('|', $tables_select_arr[$k]->getVar('table_fields'));
$nb_fields_select = count($fields_total_select);
// Parameters
- $parameters_total_select = explode("|", $tables_select_parameters);
+ $parameters_total_select = explode('|', $tables_select_arr[$k]->getVar('table_parameters'));
// Recovery fields names
for($l = 0; $l < $nb_fields_select; $l++)
{
// Fields names
- $fields_select1 = explode(":", $fields_total_select[$l]);
+ $fields_select1 = explode(':', $fields_total_select[$l]);
$fields_select[$l] = $fields_select1[0];
// Show in admin
if( $l != 0 ) {
- $parameters_select = explode(":", $parameters_total_select[$l-1]);
- if ( $parameters_select[4] == 1 ) {
- $fields_param_main_field = $fields_select1[0];
+ $parameters_select = explode(':', $parameters_total_select[$l-1]);
+ if ( $parameters_select[6] == 1 ) {
+ $fpmf = $fields_select1[0];
}
}
}
-
$text .= '
$'.$data[1].' =& $'.$data[1].'Handler->get($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\'));
- $'.$table_name.'_'.$data[1].' = $'.$data[1].'->getVar(\''.$fields_param_main_field.'\');
+ $'.$table_name.'_'.$data[1].' = $'.$data[1].'->getVar(\''.$fpmf.'\');
echo "<td class=\'center\'>".$'.$table_name.'_'.$data[1].'."</td>";
';
- }
-
+ }
}
}
}
} elseif ( $option == 2 ) {
$text .= '// Form save fields';
- for($i=0; $i < $nb_fields; $i++)
+ for($i = 0; $i < $nb_fields; $i++)
{
if ( $i != 0 )
{
- if ( $fields_param_type[$i] == 'XoopsFormTextDateSelect' )
+ if ( $fpt[$i] == 'XoopsFormTextDateSelect' )
{
$text .= '
$obj->setVar(\''.$fields[$i].'\', strtotime($_REQUEST[\''.$fields[$i].'\']));';
- } else if ( $fields_param_type[$i] == 'XoopsFormCheckBox' || $fields_param_type[$i] == 'XoopsFormRadioYN' ) {
+ } else if ( $fpt[$i] == 'XoopsFormCheckBox' || $fpt[$i] == 'XoopsFormRadioYN' ) {
$text .= '
$obj->setVar(\''.$fields[$i].'\', (($_REQUEST[\''.$fields[$i].'\'] == 1) ? \'1\' : \'0\'));';
- } else if ( $fields_param_type[$i] == 'XoopsFormUploadImage' ) {
+ } else if ( $fpt[$i] == 'XoopsFormUploadImage' ) {
$text .= '
include_once XOOPS_ROOT_PATH.\'/class/uploader.php\';
@@ -353,7 +345,7 @@
$obj->setVar(\''.$fields[$i].'\', $_REQUEST[\''.$fields[$i].'\']);
}
';
- } else if ( $fields_param_type[$i] == 'XoopsFormUploadFile' ) {
+ } else if ( $fpt[$i] == 'XoopsFormUploadFile' ) {
$text .= '
include_once XOOPS_ROOT_PATH.\'/class/uploader.php\';
$uploaddir = XOOPS_UPLOAD_PATH.\'/'.$mod_name.'/files/'.$table_name.'/\';
@@ -380,12 +372,12 @@
return $text;
}
-function form_elements($i, $mod_name, $table_name, $table_fieldname, $table_category, $flds_prm_elms, $flds_prm_req_fld, $lng_form, $struct0)
+function form_elements($i, $mod_name, $table_name, $table_fieldname, $table_category, $fpt, $fprf, $lng_form, $struct0)
{
$lng = '_AM_'.strtoupper($mod_name).'_';
- $required_field = ( $flds_prm_req_fld[$i] == 1) ? 'true' : 'false';
+ $required_field = ( $fprf[$i] == 1) ? 'true' : 'false';
$text = '';
- switch ($flds_prm_elms[$i])
+ switch ($fpt[$i])
{
case "0":
break;
@@ -501,7 +493,7 @@
case "default":
default:
- $data = explode('-', $flds_prm_elms[$i]);
+ $data = explode('-', $fpt[$i]);
$text .= '// '.ucfirst($struct0).'
$'.$data[1].'Handler =& xoops_getModuleHandler(\''.$mod_name.'_'.$data[1].'\', \''.$mod_name.'\');
$'.$data[1].'_id_select = new XoopsFormSelect('.$lng_form.', \''.$struct0.'\', $this->getVar(\''.$struct0.'\'));
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/js/functions.js
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/js/functions.js 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/js/functions.js 2013-10-23 02:40:25 UTC (rev 12202)
@@ -55,7 +55,7 @@
obj.src = !(obj.src == img_minus) ? img_minus : img_plus;
}
-$(document).ready( function() {
+$(document).ready( function() {
$('.toggleTables').click( function(e) {
e.preventDefault();
$(this).nextAll('tr').each( function() {
@@ -64,5 +64,5 @@
}
$(this).toggle();
});
- });
+ });
});
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/language/english/admin.php 2013-10-23 02:38:48 UTC (rev 12201)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/language/english/admin.php 2013-10-23 02:40:25 UTC (rev 12202)
@@ -32,8 +32,10 @@
define('_AM_TDMCREATE_TABLES_FIELDS_MORE_ELEMENTS', "Forms: Elements");
define('_AM_TDMCREATE_TABLES_FIELDS_MORE_PARENT_ID', "Parent: Category id");
-define('_AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_ADMIN', "Page: Show admin");
+define('_AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_ADMIN', "Page: Show Admin");
define('_AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_USER', "Page: View User");
+define('_AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_FORM', "Page: View in Form");
+define('_AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_LIST', "Page: View in List");
define('_AM_TDMCREATE_TABLES_FIELDS_MORE_BLOC', "Block: View");
define('_AM_TDMCREATE_TABLES_FIELDS_MORE_MAIN_FIELD', "Table: Main Field");
define('_AM_TDMCREATE_TABLES_FIELDS_MORE_SEARCH', "Search: Index");
@@ -56,11 +58,11 @@
define('_AM_TDMCREATE_ID', "ID");
define('_AM_TDMCREATE_NAME', "Name");
define('_AM_TDMCREATE_BLOCKS', "Blocks");
-define('_AM_TDMCREATE_NB_FIELDS', "Number of fields");
+define('_AM_TDMCREATE_NB_FIELDS', "N° fields");
define('...
[truncated message content] |
