Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12208] XoopsModules/TDMCreate/trunk/TDMCreate
|
From: <be...@us...> - 2013-10-23 02:47:42
|
Revision: 12208
http://sourceforge.net/p/xoops/svn/12208
Author: beckmi
Date: 2013-10-23 02:47:39 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Updating trunk to revision 12105 (timgno: Updated)
Revision Links:
--------------
http://sourceforge.net/p/xoops/svn/12105
Modified Paths:
--------------
XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php
XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_header.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_pages.php
XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php 2013-10-23 02:46:52 UTC (rev 12207)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php 2013-10-23 02:47:39 UTC (rev 12208)
@@ -104,12 +104,16 @@
// Creation of pages and templates user
if ( $table_user == 1 && $table_name != null ) {
const_user_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
- const_templates_pages($modules, $table_name, $table_fieldname, $table_fields);
+ const_templates_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
}
// Creation of search
if ( $table_search == 1 ) {
const_include_search($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $table_image);
- }
+ }
+ // Creation of admin permissions.php
+ if ( $table_permissions == 1) {
+ const_admin_permissions($modules, $table_name, $table_fields, $table_parameters);
+ }
// Creation of notifications
if ( $table_notifications == 1 ) {
const_include_notifications($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
@@ -122,11 +126,7 @@
const_blocks($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $category);
//Creation of template per blocks
const_blocks_templates($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
- }
- // Creation of admin permissions.php
- if ( $table_permissions == 1) {
- const_admin_permissions($modules, $table_name, $table_fields, $table_parameters);
- }
+ }
}
$table_name = isset($table_name) ? $table_name : null;
$table_comments = isset($table_comments) ? $table_comments : null;
@@ -137,14 +137,15 @@
$table_fields = isset($table_fields) ? $table_fields : null;
$table_blocks = isset($table_blocks) ? $table_blocks : null;
$table_image = isset($table_image) ? $table_image : null;
+ $table_permissions = isset($table_permissions) ? $table_permissions : null;
$table_notifications = isset($table_notifications) ? $table_notifications : null;
//Creation of architecture of more fields and data
//const_architecture(null, null, $table_admin, $table_blocks, $table_admin, $table_blocks );
// Creation of comments
if ( $table_comments == 1 ) {
const_include_comments($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
- }
-
+ }
+
if ( $table_waiting == 1 ) {
// Creation of Waiting Plugin
const_waiting($modules, $tables_arr);
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-23 02:46:52 UTC (rev 12207)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-23 02:47:39 UTC (rev 12208)
@@ -20,6 +20,7 @@
*/
include_once 'header.php';
$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
+$table_id = TDMCreate_CleanVars( $_REQUEST, 'table_id', 0 );
echo $adminMenu->addNavigation('tables.php');
switch ($op) {
case 'save_table':
@@ -357,7 +358,7 @@
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=table_list', 'list');
echo $adminMenu->renderButton();
- $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE table_name = 'categories'");
+ $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("mod_tdmcreate_tables")." WHERE table_name = 'categories'");
list( $category ) = $xoopsDB->fetchRow($result);
$obj =& $tablesHandler->get($_REQUEST['table_id']);
if ( $category >= 0 ) {
@@ -375,19 +376,24 @@
$GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
// Remove unnecessary tables
- $sql = "SELECT table_id FROM ".$xoopsDB->prefix("tdmcreate_tables")." WHERE table_mid = 0";
+ /*$sql = "SELECT table_id FROM ".$xoopsDB->prefix("mod_tdmcreate_tables")." WHERE table_mid = 0";
$result = $xoopsDB->queryF($sql);
while ( $myrow = $xoopsDB->fetchArray($result) )
{
- $sql_del = "DELETE FROM ".$xoopsDB->prefix("tdmcreate_tables")." WHERE table_id = ".$myrow['table_id']."";
+ $sql_del = "DELETE FROM ".$xoopsDB->prefix("mod_tdmcreate_tables")." WHERE table_id = ".$myrow['table_id']."";
$xoopsDB->queryF($sql_del);
+ }*/
+ $obj =& $tablesHandler->get($table_id);
+ if ($tablesHandler->deleteAll($obj)) {
+ redirect_header('tables.php', 3, _AM_TDMCREATE_FORMDELOK);
}
$criteria = new CriteriaCompo();
+ $criteria->add( new Criteria('mod_id', 0, '!=') );
$criteria->setSort('mod_id');
$criteria->setOrder('ASC');
- $mod_arr = $modulesHandler->getall($criteria);
- $numrows_modules = $modulesHandler->getCount();
+ $mod_arr = $modulesHandler->getAll($criteria);
+ $numrows_modules = $modulesHandler->getCount($criteria);
if ( $numrows_modules > 0 )
{
@@ -472,7 +478,7 @@
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><td class="errorMsg" colspan="8">There are no modules</td></tr>';
echo '</tr></table><br><br>';
}
break;
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php 2013-10-23 02:46:52 UTC (rev 12207)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php 2013-10-23 02:47:39 UTC (rev 12208)
@@ -88,7 +88,7 @@
\$numrows = \${$table_name}Handler->getCount();
\${$table_name}_arr = \${$table_name}Handler->getAll(\$criteria);
EOT;
- $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, $fpt, $fpmf, $language, '', 0);
if ( $table_category != 1 )
{
$text .= <<<EOT
@@ -110,7 +110,7 @@
echo "<tr class='".\$class."'>";
\$class = (\$class == "even") ? "odd" : "even";\n
EOT;
- $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, $fpt, $fpmf, $language, '', 1);
$text .= $fields_data;
$text .= <<<EOT
@@ -148,7 +148,7 @@
\$cat_weight = \$categories_arr[\$i]->getVar('cat_weight');
echo "<tr class='".\$class."'>";\n
EOT;
- $text .= const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, '', 1);
+ $text .= const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $fpmf, $language, '', 1);
$text .= <<<EOT
\n\t\t\t\t\techo "<td class='center width5'>
<a href='{$table_name}.php?op=edit&{$field_id}=".\$i"'><img src=".\$sysPathIcon16."/edit.png alt='"._EDIT."' title='"._EDIT."'></a>
@@ -175,7 +175,7 @@
echo "<table width='100%' cellspacing='1' class='outer'>
<tr>
EOT;
- $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, $fpt, $fpmf, $language, '', 0);
$text .= $fcn;
$text .= <<<EOT
\n\t\t\t\t\t<th class='center width5'>".{$language}_FORMACTION."</th>
@@ -192,7 +192,7 @@
\$category_weight = \${$table_name}_arr[\$i]->getVar('{$table_fieldname}_weight');
echo "<tr class='".\$class."'>";\n
EOT;
- $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, $fpt, $fpmf, $language, 1, 1);
$text .= $fields_data;
$text .= <<<EOT
@@ -220,7 +220,7 @@
echo "<table width='100%' cellspacing='1' class='outer'>
<tr>
EOT;
- $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, $fpt, $fpmf, $language, '', 0);
$text .= $fcn;
$text .= <<<EOT
\n\t\t\t\t\t<th class='center width5'>".{$language}_FORMACTION."</th>
@@ -252,7 +252,7 @@
\$obj =& \${$table_name}Handler->create();
}
EOT;
- $text .= const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $language, '', 2);
+ $text .= const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $field_id, $nb_fields, $fields, $fpa, $fpt, $fpmf, $language, '', 2);
$text .= <<<EOT
\n\t\tif (\${$table_name}Handler->insert(\$obj)) {
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php 2013-10-23 02:46:52 UTC (rev 12207)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php 2013-10-23 02:47:39 UTC (rev 12208)
@@ -168,7 +168,6 @@
}
}
EOT;
-
createFile( $tdmcreate_path, $text,
_AM_TDMCREATE_CONST_OK_CLASSES,
_AM_TDMCREATE_CONST_NOTOK_CLASSES, $file);
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_header.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_header.php 2013-10-23 02:46:52 UTC (rev 12207)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_header.php 2013-10-23 02:47:39 UTC (rev 12208)
@@ -22,7 +22,8 @@
{
$mod_name = $module->getVar('mod_name');
$mod_version = $module->getVar('mod_version');
- $mod_min_xoops = $module->getVar('mod_min_xoops');
+ $mod_since = $module->getVar('mod_since');
+ //$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');
@@ -47,11 +48,10 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license {$mod_license}
* @package {$mod_name}
- * @since {$mod_min_xoops}
+ * @since {$mod_since}
* @author {$mod_author} <{$mod_a_m}> - <{$mod_a_w_url}>
* @version \$Id: {$mod_version} {$filename} {$mod_subversion} {$date}Z {$mod_credits} \$
*/
-EOT
-;
+EOT;
return $text;
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_pages.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_pages.php 2013-10-23 02:46:52 UTC (rev 12207)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_pages.php 2013-10-23 02:47:39 UTC (rev 12208)
@@ -19,7 +19,7 @@
* @version $Id: const_templates_pages.php 11084 2013-02-23 15:44:20Z timgno $
*/
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/include/functions_const.php';
-function const_templates_pages($modules, $table_name, $table_fieldname, $table_fields)
+function const_templates_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters)
{
$mod_name = $modules->getVar('mod_name');
$language = '_MA_'.strtoupper($mod_name).'_';
@@ -29,32 +29,64 @@
//fields
$fields = explode('|', $table_fields);
$nb_fields = count($fields);
+ //parameters
+ $parameters_total = explode('|', $table_parameters);
+ //Recuperation des parameters affichage dans le formulaire
+ for($i=0; $i<$nb_fields; $i++)
+ {
+ $fields_list = explode(':', $fields[$i]);
+ //$fields[$i] = $fields1[0];
+ //Afficher dans les elements du formulaire et choisir le type
+ if( $i == 0 ) {
+ $fpe[$i] = '0';
+ $fpdf[$i] = '0';
+ $fpif = $fields_list[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_list[0]; // fpmf = fields parameters main field
+ }
+ }
+ }
+
$text = '<{include file="db:'.$mod_name.'_header.html"}>';
if($table_name != null)
{
$text .= '
<div class="outer">
- <table class="'.$mod_name.'" cellpadding="0" cellspacing="0" width="100%">
+ <table class="'.$table_name.'" cellpadding="0" cellspacing="0" width="100%">
<tr class="head">
';
for ($i = 0; $i < $nb_fields; $i++)
{
$structure_fields = explode(':', $fields[$i]);
-$text .= ' <th class="fields"><{$smarty.const.'.$language.strtoupper($structure_fields[0]).'}></th>
- ';
+$text .= ' <th class="center"><{$smarty.const.'.$language.strtoupper($structure_fields[0]).'}></th>
+ ';
}
$text .= '</tr>
<{foreach item='.$table_fieldname.' from=$'.$table_name.'}>
- <tr class="<{cycle values=\'odd, even\'}>">
-';
+ <tr class="<{cycle values=\'odd, even\'}>">
+ ';
for ($i = 0; $i < $nb_fields; $i++)
{
- $structure_fields = explode(':', $fields[$i]);
-$text .= ' <td class="fields"><{$'.$table_fieldname.'.'.$structure_fields[0].'}></td>
- ';
+ $structure_fields = explode(':', $fields[$i]);
+ if( $fpe[$i] == 'XoopsFormUploadImage' ) {
+$text .= ' <td class="center"><img src="<{$xoops_url}>/uploads/'.$mod_name.'/images/'.$table_name.'/<{$'.$table_fieldname.'.'.$structure_fields[0].'}>" alt="'.$table_name.'"></td>
+ ';
+ } else if( $fpe[$i] == 'XoopsFormColorPicker' ) {
+$text .= ' <td class="center"><span style="background-color: <{$'.$table_fieldname.'.'.$structure_fields[0].'}>;"> </span></td>
+ ';
+ } else {
+$text .= ' <td class="center"><{$'.$table_fieldname.'.'.$structure_fields[0].'}></td>
+ ';
+ }
}
-$text .= ' </tr>
+$text .= '</tr>
<{/foreach}>
</table>
</div>';
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php 2013-10-23 02:46:52 UTC (rev 12207)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php 2013-10-23 02:47:39 UTC (rev 12208)
@@ -185,10 +185,10 @@
for ($i=0; $i < $j; $i++)
{
if ( $i != $j - 1 ) {
- $key .= ''.$comma[$i].',
+ $key .= $comma[$i].',
';
} else {
- $key .= ''.$comma[$i].'
+ $key .= $comma[$i].'
';
}
}
@@ -200,10 +200,10 @@
}
//
-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, $fpda, $fpt, $fpmf, $lng, $prefix = '', $option = 0)
{
$text = '';
-
+
if ( $option == 0 ) {
// Name column of the table
for($i = 0; $i < $nb_fields; $i++)
@@ -230,53 +230,51 @@
} 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>";
}'; }
- } else if ( $fields[$i] == $table_fieldname.'_title' ) {
+ } else if ( $fields[$i] == $fpmf ) {
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>";
';
- }
-
- } else if ( $fields_param_type[$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>";
}
+ } else if ( $fpt[$i] == 'XoopsFormUploadImage' ) {
+ $text .= '$image = XOOPS_UPLOAD_URL."/'.$mod_name.'/images/'.$table_name.'/".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\');
+ 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' ) {
+ $text .= 'echo "<td class=\'center\'>".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\')."</td>";
+ ';
+ } else if ( $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('tables', 'TDMCreate');
$criteria = new CriteriaCompo();
@@ -289,21 +287,21 @@
$tables_select_parameters = $tables_select_arr[$k]->getVar('table_parameters');
// Fields
- $fields_total_select = explode("|", $tables_select_fields);
+ $fields_total_select = explode('|', $tables_select_fields);
$nb_fields_select = count($fields_total_select);
// Parameters
- $parameters_total_select = explode("|", $tables_select_parameters);
+ $parameters_total_select = explode('|', $tables_select_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]);
+ $parameters_select = explode(':', $parameters_total_select[$l-1]);
if ( $parameters_select[4] == 1 ) {
$fields_param_main_field = $fields_select1[0];
}
@@ -326,14 +324,14 @@
{
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 +351,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.'/\';
@@ -500,6 +498,7 @@
break;
case "default":
+ case "XoopsFormTables-".$table_name:
default:
$data = explode('-', $fpe[$i]);
$text .= '// '.ucfirst($struct0).'
@@ -513,16 +512,17 @@
return $text;
}
-function search_field($fields_param_search_field, $options)
+function search_field($fpsf, $options)
{
- $nb_fields_param_search_field = count($fields_param_search_field);
+ // fpsf = fields parameters 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 .= ')';
|
