|
From: <be...@us...> - 2013-10-23 02:51:04
|
Revision: 12211
http://sourceforge.net/p/xoops/svn/12211
Author: beckmi
Date: 2013-10-23 02:51:02 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Updating trunk to revision 12183 (timgno: Fixed bugs)
Revision Links:
--------------
http://sourceforge.net/p/xoops/svn/12183
Modified Paths:
--------------
XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php 2013-10-23 02:50:09 UTC (rev 12210)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php 2013-10-23 02:51:02 UTC (rev 12211)
@@ -25,9 +25,11 @@
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/include/common.php';
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, $fpe = 0, $fprf = 0, $option = 0)
+function const_fields($mod_name, $table_name, $table_fieldname, $table_fields, $lng, $fpda = 0, $fpe = 0, $fprf = 0, $option = 0)
{
- // fpdf = fields_param_display_form
+ // fpda = fields parameter display admin
+ // fpe = fields parameter element
+ // fprf = fields parameter required field
$mod_name = strtolower($mod_name);
$table_name = strtolower($table_name);
$table_fieldname = strtolower($table_fieldname);
@@ -76,12 +78,12 @@
}
} else if ( $option == 1 ) {
// Creation form
- for ($i=0; $i<$nb_fields; $i++)
+ for ($i=0; $i < $nb_fields; $i++)
{
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, $fpe, $fprf, $lng_form, $struct[0]);
+ $text .= form_elements($i, $mod_name, $table_name, $table_fieldname, $fpe, $fprf, $lng_form, $struct[0]);
}
}
} else if ( $option == 2 ) {
@@ -201,12 +203,12 @@
}
//
-function const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $fields_id, $nb_fields, $fields, $fpda, $fpt, $fpmf, $lng, $prefix = '', $option = 0)
+function const_show_fields_parameters($mod_name, $table_name, $table_fieldname, $nb_fields, $fields, $fields_id, $fpda, $fpe, $fpmf, $lng, $prefix = '', $option = 0)
{
$text = '';
- $mod_name = strtolower($mod_name);
- $table_name = strtolower($table_name);
- $table_fieldname = strtolower($table_fieldname);
+ $stl_mod_name = strtolower($mod_name);
+ $stl_table_name = strtolower($table_name);
+ $stl_table_fieldname = strtolower($table_fieldname);
if ( $option == 0 ) {
// Name column of the table
for($i = 0; $i < $nb_fields; $i++)
@@ -241,43 +243,43 @@
$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 ( $fpt[$i] == 'XoopsFormUploadImage' ) {
+ } else if ( $fpe[$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 ( $fpt[$i] == 'XoopsFormUploadFile' )
+ } else if ( $fpe[$i] == 'XoopsFormUploadFile' )
{
$text .= 'echo "<td class=\'center\'>".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\')."</td>";
';
- } else if ( $fpt[$i] == 'XoopsFormColorPicker' )
+ } else if ( $fpe[$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 ( $fpt[$i] == 'XoopsFormTextDateSelect' )
+ } else if ( $fpe[$i] == 'XoopsFormTextDateSelect' )
{
$text .= 'echo "<td class=\'center\'>".formatTimeStamp($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\'),"S")."</td>";
';
- } else if ( $fpt[$i] == 'XoopsFormCategory' )
+ } else if ( $fpe[$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 ( $fpt[$i] == 'XoopsFormSelectUser' )
+ } else if ( $fpe[$i] == 'XoopsFormSelectUser' )
{
$text .= 'echo "<td class=\'center\'>".XoopsUser::getUnameFromId($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\'),"S")."</td>";
';
- } else if ( $fpt[$i] == 'XoopsFormText' ) {
+ } else if ( $fpe[$i] == 'XoopsFormText' ) {
$text .= 'echo "<td class=\'center\'>".$'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\')."</td>";
';
- } else if ( $fpt[$i] == 'XoopsFormDhtmlTextArea' || $fpt[$i] == 'XoopsFormTextArea' ) {
+ } else if ( $fpe[$i] == 'XoopsFormDhtmlTextArea' || $fpe[$i] == 'XoopsFormTextArea' ) {
$text .= 'echo "<td class=\'center\'>".strip_tags($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\'))."</td>";
';
- } else if ( $fpt[$i] == 'XoopsFormCheckBox' || $fpt[$i] == 'XoopsFormRadioYN' ) {
+ } else if ( $fpe[$i] == 'XoopsFormCheckBox' || $fpe[$i] == 'XoopsFormRadioYN' ) {
$text .= 'echo "<td class=\'center\'>".( ($'.$table_name.'_arr[$i]->getVar(\''.$fields[$i].'\') == 1 ) ? _YES : _NO)."</td>";
';
} else {
- $data = explode("-", $fpt[$i]);
+ $data = explode("-", $fpe[$i]);
// Handler select table
$tablesHandler =& xoops_getModuleHandler('tables', 'TDMCreate');
$criteria = new CriteriaCompo();
@@ -324,18 +326,18 @@
{
if ( $i != 0 )
{
- if ( $fpt[$i] == 'XoopsFormTextDateSelect' )
+ if ( $fpe[$i] == 'XoopsFormTextDateSelect' )
{
$text .= '
- $obj->setVar(\''.$fields[$i].'\', strtotime($_REQUEST[\''.$fields[$i].'\']));';
- } else if ( $fpt[$i] == 'XoopsFormCheckBox' || $fpt[$i] == 'XoopsFormRadioYN' ) {
+ $'.$table_name.'_obj->setVar(\''.$fields[$i].'\', strtotime($_REQUEST[\''.$fields[$i].'\']));';
+ } else if ( $fpe[$i] == 'XoopsFormCheckBox' || $fpe[$i] == 'XoopsFormRadioYN' ) {
$text .= '
- $obj->setVar(\''.$fields[$i].'\', (($_REQUEST[\''.$fields[$i].'\'] == 1) ? \'1\' : \'0\'));';
- } else if ( $fpt[$i] == 'XoopsFormUploadImage' ) {
+ $'.$table_name.'_obj->setVar(\''.$fields[$i].'\', (($_REQUEST[\''.$fields[$i].'\'] == 1) ? \'1\' : \'0\'));';
+ } else if ( $fpe[$i] == 'XoopsFormUploadImage' ) {
$text .= '
include_once XOOPS_ROOT_PATH.\'/class/uploader.php\';
- $uploaddir = XOOPS_UPLOAD_PATH.\'/'.$mod_name.'/images/'.$table_name.'/\';
+ $uploaddir = XOOPS_UPLOAD_PATH.\'/'.$stl_mod_name.'/images/'.$stl_table_name.'/\';
$uploader = new XoopsMediaUploader($uploaddir, xoops_getModuleOption(\'mimetypes\', \''.$mod_name.'\'),
xoops_getModuleOption(\'maxsize\', \''.$mod_name.'\'), null, null);
if ($uploader->fetchMedia($_POST[\'xoops_upload_file\'][0])) {
@@ -345,16 +347,16 @@
$errors = $uploader->getErrors();
redirect_header(\'javascript:history.go(-1)\', 3, $errors);
} else {
- $obj->setVar(\''.$fields[$i].'\', $uploader->getSavedFileName());
+ $'.$table_name.'_obj->setVar(\''.$fields[$i].'\', $uploader->getSavedFileName());
}
} else {
- $obj->setVar(\''.$fields[$i].'\', $_REQUEST[\''.$fields[$i].'\']);
+ $'.$table_name.'_obj->setVar(\''.$fields[$i].'\', $_REQUEST[\''.$fields[$i].'\']);
}
';
- } else if ( $fpt[$i] == 'XoopsFormUploadFile' ) {
+ } else if ( $fpe[$i] == 'XoopsFormUploadFile' ) {
$text .= '
include_once XOOPS_ROOT_PATH.\'/class/uploader.php\';
- $uploaddir = XOOPS_UPLOAD_PATH.\'/'.$mod_name.'/files/'.$table_name.'/\';
+ $uploaddir = XOOPS_UPLOAD_PATH.\'/'.$stl_mod_name.'/files/'.$stl_table_name.'/\';
$uploader = new XoopsMediaUploader($uploaddir, xoops_getModuleOption(\'mimetypes\', \''.$mod_name.'\'),
xoops_getModuleOption(\'maxsize\', \''.$mod_name.'\'), null, null);
if ($uploader->fetchMedia($_POST[\'xoops_upload_file\'][0])) {
@@ -364,13 +366,13 @@
$errors = $uploader->getErrors();
redirect_header(\'javascript:history.go(-1)\', 3, $errors);
} else {
- $obj->setVar("'.$fields[$i].'", $uploader->getSavedFileName());
+ $'.$table_name.'_obj->setVar("'.$fields[$i].'", $uploader->getSavedFileName());
}
}
';
} else {
$text .= '
- $obj->setVar(\''.$fields[$i].'\', $_REQUEST[\''.$fields[$i].'\']);';
+ $'.$table_name.'_obj->setVar(\''.$fields[$i].'\', $_REQUEST[\''.$fields[$i].'\']);';
}
}
}
@@ -378,33 +380,24 @@
return $text;
}
-function form_elements($i, $mod_name, $table_name, $table_fieldname, $table_category, $fpe, $fprf, $lng_form, $struct0)
+function form_elements($i, $mod_name, $table_name, $table_fieldname, $fpe, $fprf, $lng_form, $struct0)
{
- $mod_name = strtolower($mod_name);
- $table_name = strtolower($table_name);
- $table_fieldname = strtolower($table_fieldname);
+ $stl_mod_name = strtolower($mod_name);
+ $stl_table_name = strtolower($table_name);
+ $stl_table_fieldname = strtolower($table_fieldname);
$lng = '_AM_'.strtoupper($mod_name).'_';
$required_field = ( $fprf[$i] == 1) ? 'true' : 'false';
$text = '';
- switch ($fpe[$i])
- {
- case "0":
- break;
-
- case "XoopsFormText":
- $text .= '// '.ucfirst($struct0).'
+ if ($fpe[$i] == "XoopsFormText") {
+ $text .= '// '.ucfirst($struct0).'
$form->addElement(new XoopsFormText('.$lng_form.', \''.$struct0.'\', 50, 255, $this->getVar(\''.$struct0.'\')), '.$required_field.');
';
- break;
-
- case "XoopsFormTextArea":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormTextArea") {
+ $text .= '// '.ucfirst($struct0).'
$form->addElement(new XoopsFormTextArea('.$lng_form.', \''.$struct0.'\', $this->getVar(\''.$struct0.'\'), 4, 47), '.$required_field.');
';
- break;
-
- case "XoopsFormDhtmlTextArea":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormDhtmlTextArea") {
+ $text .= '// '.ucfirst($struct0).'
$editor_configs = array();
$editor_configs[\'name\'] = \''.$struct0.'\';
$editor_configs[\'value\'] = $this->getVar(\''.$struct0.'\', \'e\');
@@ -412,31 +405,25 @@
$editor_configs[\'cols\'] = 40;
$editor_configs[\'width\'] = \'100%\';
$editor_configs[\'height\'] = \'400px\';
- $editor_configs[\'editor\'] = xoops_getModuleOption(\''.$mod_name.'_editor\', \''.$mod_name.'\');
+ $editor_configs[\'editor\'] = xoops_getModuleOption(\''.$stl_mod_name.'_editor\', \''.$mod_name.'\');
$form->addElement( new XoopsFormEditor('.$lng_form.', \''.$struct0.'\', $editor_configs), true );
';
- break;
-
- case "XoopsFormCheckBox":
+ } else if ($fpe[$i] == "XoopsFormCheckBox") {
$text .= '// '.ucfirst($struct0).'
$'.$struct0.' = $this->isNew() ? 0 : $this->getVar(\''.$struct0.'\');
$check_'.$struct0.' = new XoopsFormCheckBox('.$lng_form.', \''.$struct0.'\', $'.$struct0.');
$check_'.$struct0.'->addOption(1, " ");
$form->addElement($check_'.$struct0.');
';
- break;
-
- case "XoopsFormHidden":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormHidden") {
+ $text .= '// '.ucfirst($struct0).'
$form->addElement(new XoopsFormHidden(\''.$struct0.'\', $this->getVar(\''.$struct0.'\')));
';
- break;
-
- case "XoopsFormUploadImage":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormUploadImage") {
+ $text .= '// '.ucfirst($struct0).'
$'.$struct0.' = $this->getVar(\''.$struct0.'\') ? $this->getVar(\''.$struct0.'\') : \'blank.gif\';
- $uploadir = \'/uploads/'.$mod_name.'/images/'.$table_name.'\';
+ $uploadir = \'/uploads/'.$stl_mod_name.'/images/'.$stl_table_name.'\';
$imgtray = new XoopsFormElementTray('.$lng_form.',\'<br />\');
$imgpath = sprintf('.$lng.'FORMIMAGE_PATH, $uploadir);
$imageselect = new XoopsFormSelect($imgpath, \''.$struct0.'\', $'.$struct0.');
@@ -453,28 +440,20 @@
$imgtray->addElement($fileseltray);
$form->addElement($imgtray);
';
- break;
-
- case "XoopsFormUploadFile":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormUploadFile") {
+ $text .= '// '.ucfirst($struct0).'
$form->addElement(new XoopsFormFile('.$lng_form.', \''.$struct0.'\', $xoopsModuleConfig[\'maxsize\']), '.$required_field.');
';
- break;
-
- case "XoopsFormColorPicker":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormColorPicker") {
+ $text .= '// '.ucfirst($struct0).'
$form->addElement(new XoopsFormColorPicker('.$lng_form.', \''.$struct0.'\', $this->getVar(\''.$struct0.'\')), '.$required_field.');
';
- break;
-
- case "XoopsFormSelectUser":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormSelectUser") {
+ $text .= '// '.ucfirst($struct0).'
$form->addElement(new XoopsFormSelectUser('.$lng_form.', \''.$struct0.'\', false, $this->getVar(\''.$struct0.'\'), 1, false), '.$required_field.');
';
- break;
-
- case "XoopsFormCategory":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormCategory") {
+ $text .= '// '.ucfirst($struct0).'
include_once(XOOPS_ROOT_PATH . \'/class/tree.php\');
$categoriesHandler = xoops_getModuleHandler(\'categories\', \''.$mod_name.'\' );
$criteria = new CriteriaCompo();
@@ -485,32 +464,23 @@
$form->addElement( new XoopsFormLabel ( '.$lng_form.', $cat_pid ) );
}
';
- break;
-
- case "XoopsFormRadioYN":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormRadioYN") {
+ $text .= '// '.ucfirst($struct0).'
$'.$struct0.' = $this->isNew() ? 0 : $this->getVar(\''.$struct0.'\');
$form->addElement(new XoopsFormRadioYN('.$lng_form.', \''.$struct0.'\', $'.$struct0.'), '.$required_field.');
';
- break;
-
- case "XoopsFormTextDateSelect":
- $text .= '// '.ucfirst($struct0).'
+ } else if ($fpe[$i] == "XoopsFormTextDateSelect") {
+ $text .= '// '.ucfirst($struct0).'
$form->addElement(new XoopsFormTextDateSelect('.$lng_form.', \''.$struct0.'\', \'\', $this->getVar(\''.$struct0.'\')));
';
- break;
-
- case "default":
- case "XoopsFormTables-".$table_name:
- default:
- $data = explode('-', $fpe[$i]);
+ } else if ($fpe[$i] == "XoopsFormTables-".$stl_table_name) {
+ $data = explode('-', $fpe[$i]);
$text .= '// '.ucfirst($struct0).'
$'.$data[1].'Handler =& xoops_getModuleHandler(\''.$data[1].'\', \''.$mod_name.'\');
$'.$data[1].'_id_select = new XoopsFormSelect('.$lng_form.', \''.$struct0.'\', $this->getVar(\''.$struct0.'\'));
$'.$data[1].'_id_select->addOptionArray($'.$data[1].'Handler->getList());
$form->addElement($'.$data[1].'_id_select, true);
';
- break;
}
return $text;
}
@@ -524,27 +494,48 @@
//parameters
$parameters_total = explode('|', $table_parameters);
- //Recuperation des parameters affichage dans le formulaire
- for($i=0; $i<$nb_fields; $i++)
+ // Recovery of parameters display in the form
+ for($i = 0; $i < $nb_fields; $i++)
{
$fields = explode(':', $fields_total[$i]);
- //$fields[$i] = $fields1[0];
- //Afficher dans les elements du formulaire et choisir le type
+ // $fields[$i] = $fields1[0];
+ // View in the elements of the form and choose the type
if( $i == 0 ) {
+ $fpif = $fields[0]; // fpif = fields parameters auto_increment field
$fpe[$i] = '0';
- $fpdf[$i] = '0';
- $fpif = $fields[0]; // fpif = fields parameters auto_increment field
+ $fpda[$i] = '0';
+ $fpdu[$i] = '0';
+ $fpdb[$i] = '0';
+ $fpds[$i] = '0';
+ $fprf[$i] = '0';
} 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(isset($param[0])) {
+ $fpe[$i] = $param[0]; // fpe = fields parameters elements
+ }
+ if(isset($param[1])) {
+ $fpda[$i] = $param[1]; // fpdf = fields parameters display admin
}
+ if(isset($param[2])) {
+ $fpdu[$i] = $param[2]; // fpdf = fields parameters display user
+ }
+ if(isset($param[3])) {
+ $fpdb[$i] = $param[3]; // fpdf = fields parameters display block
+ }
+ if(isset($param[4])) {
+ if ( $param[4] == 1 ) {
+ $fpmf = $fields[0]; // fpmf = fields parameters main field
+ }
+ }
+ if(isset($param[5])) {
+ $fpds[$i] = $param[5]; // fpdf = fields parameters display search
+ }
+ if(isset($param[0])) {
+ $fprf[$i] = $param[6]; // fprf = fields parameters required field
+ }
}
}
+ return array($fpif, $fpe, $fpda, $fpdu, $fpdb, $fpmf, $fpds, $fprf);
}
function search_field($fpsf, $options)
|