Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12197] XoopsModules/TDMCreate/trunk/TDMCreate
|
From: <be...@us...> - 2013-10-23 01:55:22
|
Revision: 12197
http://sourceforge.net/p/xoops/svn/12197
Author: beckmi
Date: 2013-10-23 01:55:18 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Updating trunk to revision 9042 (timgno): Deleted unnecessary code
Revision Links:
--------------
http://sourceforge.net/p/xoops/svn/9042
Modified Paths:
--------------
XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/italian/admin.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/update language 1.38 to 1.39.txt
XoopsModules/TDMCreate/trunk/TDMCreate/sql/mysql.sql
XoopsModules/TDMCreate/trunk/TDMCreate/xoops_version.php
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-23 01:53:35 UTC (rev 12196)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-23 01:55:18 UTC (rev 12197)
@@ -43,154 +43,55 @@
$modules =& $modsHandler->get($_REQUEST['tables_modules']);
$modules_name = $modsHandler->getVar('modules_name');
- $obj->setVar('tables_modules', $_REQUEST['tables_modules']);
+ $obj->setVar('tables_modules', $_REQUEST['tables_modules']);
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
+ $obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
+ $obj->setVar('tables_name_empty', $_REQUEST['tables_name_empty']);
+ $obj->setVar('tables_blocks', $_REQUEST['tables_blocks']);
+ $obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']);
+ $obj->setVar('tables_display_user', $_REQUEST['tables_display_user']);
+ $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']);
+ $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']);
+ $obj->setVar('tables_created', $_REQUEST['tables_created']);
+ $obj->setVar('tables_published', $_REQUEST['tables_published']);
+ $obj->setVar('tables_expired', $_REQUEST['tables_expired']);
+ $obj->setVar('tables_status', $_REQUEST['tables_status']);
+ $obj->setVar('tables_online', $_REQUEST['tables_online']);
+ $obj->setVar('tables_pending', $_REQUEST['tables_pending']);
+ $obj->setVar('tables_search', $_REQUEST['tables_search']);
+ $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
+ $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
- if ( $_REQUEST['select'] == 1 )
- {
- $obj->setVar('tables_module_table', strtolower($modules_name.'_topic'));
- $obj->setVar('tables_name', 'topic');
- $obj->setVar('tables_blocks', 0);
- $obj->setVar('tables_display_admin', 0);
- $obj->setVar('tables_display_user', 0);
- $obj->setVar('tables_submitter', 0);
- $obj->setVar('tables_publisher', 0);
- $obj->setVar('tables_created', 0);
- $obj->setVar('tables_published', 0);
- $obj->setVar('tables_expired', 0);
- $obj->setVar('tables_status', 0);
- $obj->setVar('tables_online', 0);
- $obj->setVar('tables_pending', 0);
- $obj->setVar('tables_search', 0);
- $obj->setVar('tables_coms', 0);
- $obj->setVar('tables_nb_champs', 15);
-
- $tables_champs = 'topic_id:int:11:unsigned:NOT NULL: :|topic_pid:int:5:unsigned:NOT NULL:0:|topic_title:varchar:255: :NOT NULL: :|topic_desc:text: : :NOT NULL: :|topic_img:varchar:255: :NOT NULL: :|topic_weight:int:5: :NOT NULL:0:|topic_color:varchar:10: :NULL: :';
-
- // Options Extra Champs
- if ( isset($_REQUEST['tables_submitter']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_submitter:int:11: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_publisher']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_publisher:text: :NOT NULL: :';
- if ( isset($_REQUEST['tables_created']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_created:int:10: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_published']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_published:int:10: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_expired']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_expired:int:10: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_status']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_status:tinyint:2: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_online']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_pending']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_pending:tinyint:1: :NOT NULL:0:';
-
- $tables_parametres = 'XoopsFormTopic:0:0:0:0:0:0|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:1|XoopsFormColorPicker:1:1:0:0:0:0|XoopsFormSelect:0:0:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1';
-
- //Image
- include_once XOOPS_ROOT_PATH.'/class/uploader.php';
-
- if(is_dir($pathImageAdmin)){
- $uploaddir = $pathImageAdmin;
- }else{
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/";
- }
-
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
- $name_img = $_GET['tables_name'].'.'.$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);
- } else {
- $obj->setVar('tables_img', $uploader->getSavedFileName());
- }
+ $tables_champs = '';
+ $tables_parametres = '';
+ for($i=0; $i<$_REQUEST['tables_nb_champs']; $i++)
+ {
+ //Coupure entre les champs et coupre entre les parametres
+ if ( $i != $_REQUEST['tables_nb_champs'] - 1) {
+ $tables_champs .= '|';
+ if ( $i != 0 )
+ $tables_parametres .= '|';
} else {
- $obj->setVar('tables_img', $_REQUEST['tables_img1']);
+ // Options Extra Champs
+ if ( isset($_REQUEST['tables_submitter']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_submitter:int:11: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_publisher']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_publisher:text: :NOT NULL: :';
+ if ( isset($_REQUEST['tables_created']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_created:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_published']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_published:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_expired']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_expired:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_status']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_status:tinyint:2: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_online']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_pending']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_pending:tinyint:1: :NOT NULL:0:';
+ // Parameters
+ $tables_parametres .= '|XoopsFormSelectUser:1:1:1:0:0:1|XoopsFormTextDateSelect:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1';
}
- } else {
-
- $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
- $obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
- $obj->setVar('tables_blocks', $_REQUEST['tables_blocks']);
- $obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']);
- $obj->setVar('tables_display_user', $_REQUEST['tables_display_user']);
- if ( isset($_REQUEST['tables_submitter']) )
- $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']);
- if ( isset($_REQUEST['tables_publisher']) )
- $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']);
- if ( isset($_REQUEST['tables_created']) )
- $obj->setVar('tables_created', $_REQUEST['tables_created']);
- if ( isset($_REQUEST['tables_published']) )
- $obj->setVar('tables_published', $_REQUEST['tables_published']);
- if ( isset($_REQUEST['tables_expired']) )
- $obj->setVar('tables_expired', $_REQUEST['tables_expired']);
- if ( isset($_REQUEST['tables_status']) )
- $obj->setVar('tables_status', $_REQUEST['tables_status']);
- if ( isset($_REQUEST['tables_online']) )
- $obj->setVar('tables_online', $_REQUEST['tables_online']);
- if ( isset($_REQUEST['tables_pending']) )
- $obj->setVar('tables_pending', $_REQUEST['tables_pending']);
- if ( isset($_REQUEST['tables_search']) )
- $obj->setVar('tables_search', $_REQUEST['tables_search']);
- if ( isset($_REQUEST['tables_coms']) )
- $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
- $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
-
- $tables_champs = '';
- $tables_parametres = '';
- for($i=0; $i<$_REQUEST['tables_nb_champs']; $i++)
- {
- //Repare of parameters: text:on:off: ...
- if ( $i != 0 ) {
- $tables_parametres .= ( !empty($_REQUEST['champs_param_elements'][$i]) ) ? $_REQUEST['champs_param_elements'][$i].":" : " :";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_display_admin'][$i]) ) ? "1:" : "0:";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_display_user'][$i]) ) ? "1:" : "0:";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_display_blocks'][$i]) ) ? "1:" : "0:";
- $tables_parametres .= ( $i == $_REQUEST['champs_param_main_field']) ? "1:" : "0:";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_search_field'][$i]) ) ? "1:" : "0:";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_required_field'][$i]) ) ? "1" : "0";
- }
-
- //Repare of champs: test:int:4: ...
- $tables_champs .= (!empty($_REQUEST['champs_name'][$i])) ? $_REQUEST['champs_name'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_type'][$i])) ? $_REQUEST['champs_type'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_valeur'][$i])) ? $_REQUEST['champs_valeur'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_attributs'][$i])) ? $_REQUEST['champs_attributs'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_null'][$i])) ? strtoupper($_REQUEST['champs_null'][$i]).":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_default'][$i])) ? $_REQUEST['champs_default'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_clef'][$i])) ? $_REQUEST['champs_clef'][$i]."" : " ";
-
- //Coupure entre les champs et coupre entre les parametres
- if ( $i != $_REQUEST['tables_nb_champs'] - 1) {
- $tables_champs .= '|';
- if ( $i != 0 )
- $tables_parametres .= '|';
- } else {
- // Options Extra Champs
- if ( isset($_REQUEST['tables_submitter']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_submitter:int:11: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_publisher']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_publisher:text: :NOT NULL: :';
- if ( isset($_REQUEST['tables_created']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_created:int:10: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_published']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_published:int:10: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_expired']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_expired:int:10: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_status']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_status:tinyint:2: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_online']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:';
- if ( isset($_REQUEST['tables_pending']) == 1 )
- $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_pending:tinyint:1: :NOT NULL:0:';
- // Parameters
- $tables_parametres .= '|XoopsFormSelectUser:1:1:1:0:0:1|XoopsFormTextDateSelect:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1';
- }
- }
}
$obj->setVar('tables_champs', $tables_champs);
$obj->setVar('tables_parametres', $tables_parametres);
@@ -215,32 +116,17 @@
}
//Name of the module
$modules =& $modulesHandler->get($_REQUEST['tables_modules']);
- $modules_name = $modules->getVar('modules_name');
-
- $tables_blocks = (isset($_REQUEST['tables_blocks'])) ? $_REQUEST['tables_blocks'] : '0';
- $tables_display_admin = (isset($_REQUEST['tables_display_admin'])) ? $_REQUEST['tables_display_admin'] : '0';
- $tables_display_user = (isset($_REQUEST['tables_display_user'])) ? $_REQUEST['tables_display_user'] : '0';
- $tables_submitter = (isset($_REQUEST['tables_submitter'])) ? $_REQUEST['tables_submitter'] : '0';
- $tables_publisher = (isset($_REQUEST['tables_publisher'])) ? $_REQUEST['tables_publisher'] : '0';
- $tables_created = (isset($_REQUEST['tables_created'])) ? $_REQUEST['tables_created'] : '0';
- $tables_published = (isset($_REQUEST['tables_published'])) ? $_REQUEST['tables_published'] : '0';
- $tables_expired = (isset($_REQUEST['tables_expired'])) ? $_REQUEST['tables_expired'] : '0';
- $tables_status = (isset($_REQUEST['tables_status'])) ? $_REQUEST['tables_status'] : '0';
- $tables_online = (isset($_REQUEST['tables_online'])) ? $_REQUEST['tables_online'] : '0';
- $tables_pending = (isset($_REQUEST['tables_pending'])) ? $_REQUEST['tables_pending'] : '0';
- $tables_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0';
- $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0';
- $select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0';
+ $modules_name = $modules->getVar('modules_name');
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- if(is_dir($pathImageAdmin)){
+ if(is_dir($pathImageAdmin)){
$uploaddir = $pathImageAdmin;
}else{
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/";
}
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
+ $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']["img_mimetypes"],
+ $GLOBALS['xoopsModuleConfig']["img_size"], null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
$name_img = $_GET['tables_name'].'.'.$extension;
@@ -259,33 +145,24 @@
$obj->setVar('tables_modules', strtolower($_REQUEST['tables_modules']));
$obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
$obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
+ $obj->setVar('tables_name_empty', $_REQUEST['tables_name_empty']);
$obj->setVar('tables_blocks', $_REQUEST['tables_blocks']);
$obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']);
$obj->setVar('tables_display_user', $_REQUEST['tables_display_user']);
- if ( isset($_REQUEST['tables_submitter']) )
- $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']);
- if ( isset($_REQUEST['tables_publisher']) )
- $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']);
- if ( isset($_REQUEST['tables_created']) )
- $obj->setVar('tables_created', $_REQUEST['tables_created']);
- if ( isset($_REQUEST['tables_published']) )
- $obj->setVar('tables_published', $_REQUEST['tables_published']);
- if ( isset($_REQUEST['tables_expired']) )
- $obj->setVar('tables_expired', $_REQUEST['tables_expired']);
- if ( isset($_REQUEST['tables_status']) )
- $obj->setVar('tables_status', $_REQUEST['tables_status']);
- if ( isset($_REQUEST['tables_online']) )
- $obj->setVar('tables_online', $_REQUEST['tables_online']);
- if ( isset($_REQUEST['tables_pending']) )
- $obj->setVar('tables_pending', $_REQUEST['tables_pending']);
- if ( isset($_REQUEST['tables_search']) )
- $obj->setVar('tables_search', $_REQUEST['tables_search']);
- if ( isset($_REQUEST['tables_coms']) )
- $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
+ $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']);
+ $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']);
+ $obj->setVar('tables_created', $_REQUEST['tables_created']);
+ $obj->setVar('tables_published', $_REQUEST['tables_published']);
+ $obj->setVar('tables_expired', $_REQUEST['tables_expired']);
+ $obj->setVar('tables_status', $_REQUEST['tables_status']);
+ $obj->setVar('tables_online', $_REQUEST['tables_online']);
+ $obj->setVar('tables_pending', $_REQUEST['tables_pending']);
+ $obj->setVar('tables_search', $_REQUEST['tables_search']);
+ $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
$obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
if ($tblsHandler->insert($obj)) {
- redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ redirect_header('tables.php?op=tables_list', 2, _AM_TDMCREATE_FORMOK);
}
break;
@@ -324,8 +201,9 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
+ $modules_id = TDMCreate_CleanVars( $_REQUEST, 'modules_id', 0, 'int' );
if (isset($_REQUEST['modules_id'])) {
- $obj =& $modsHandler->get($_REQUEST['modules_id']);
+ $obj =& $modsHandler->get($modules_id);
} else {
$obj =& $modsHandler->create();
}
@@ -333,11 +211,11 @@
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/modules/";
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
+ $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']["img_mimetypes"],
+ $GLOBALS['xoopsModuleConfig']["img_size"], null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']);
- $name_img = $_REQUEST['modules_name'].'_slogo.'.$extension;
+ $name_img = $_GET['modules_name'].'_slogo.'.$extension;
$uploader->setTargetFileName($name_img);
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
@@ -404,103 +282,86 @@
}
break;
- case "tables_champs":
- //Champs existe deja ?
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('tables_name', $_REQUEST['tables_name']));
- $nb_tables1 = $tblsHandler->getCount($criteria);
-
- if ( $nb_tables1 < 1 )
- {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($_REQUEST['tables_id'])) {
- $obj =& $tblsHandler->get($_REQUEST['tables_id']);
+ case "tables_champs":
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ $tables_id = TDMCreate_CleanVars( $_REQUEST, 'tables_id', 0, 'int' );
+ if (isset($_REQUEST['tables_id'])) {
+ $obj =& $tblsHandler->get($tables_id);
+ } else {
+ $obj =& $tblsHandler->create();
+ }
+
+ for($i=0; $i<$_GET['tables_nb_champs']; $i++)
+ {
+ $obj->setVar('champ_id', $_POST['champ_id'][$i]);
+ $obj->setVar('champ_name', $_POST['champ_name'][$i]);
+ $obj->setVar('champ_tables_nb_champs', $_POST['champ_tables_nb_champs'][$i]);
+ $obj->setVar('champ_tables_champs', $_POST['champ_tables_champs'][$i]);
+ $obj->setVar('champ_type', $_POST['champ_type'][$i]);
+ $obj->setVar('champ_value', $_POST['champ_value'][$i]);
+ $obj->setVar('champ_attribute', $_POST['champ_attribute'][$i]);
+ $obj->setVar('champ_null', $_POST['champ_null'][$i]);
+ $obj->setVar('champ_default', $_POST['champ_default'][$i]);
+ $obj->setVar('champ_key', $_POST['champ_key'][$i]);
+ $obj->setVar('champ_parameters', $_POST['champ_parameters'][$i]);
+ $obj->setVar('champ_elements_id', $_POST['champ_elements_id'][$i]);
+ $obj->setVar('champ_elements_value', $_POST['champ_elements_value'][$i]);
+ $obj->setVar('champ_elements_name', $_POST['champ_elements_name'][$i]);
+ $obj->setVar('champ_elements_admin', $_POST['champ_elements_admin'][$i]);
+ $obj->setVar('champ_elements_user', $_POST['champ_elements_block'][$i]);
+ $obj->setVar('champ_elements_mfield', $_POST['champ_elements_mfield'][$i]);
+ $obj->setVar('champ_elements_search', $_POST['champ_elements_search'][$i]);
+ $obj->setVar('champ_elements_required', $_POST['champ_elements_required'][$i]);
+ }
+
+ //Image
+ /*include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ if(!is_dir($pathImageAdmin)){
+ $uploaddir = $pathImageAdmin;
+ }else{
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/";
+ }
+ $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']["img_mimetypes"],
+ $GLOBALS['xoopsModuleConfig']["img_size"], null, null);
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
+ $name_img = $_GET['tables_name'].'.'.$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);
} else {
- $obj =& $tblsHandler->create();
+ $obj->setVar('tables_img', $uploader->getSavedFileName());
}
- $tables_blocks = (isset($_REQUEST['tables_blocks'])) ? $_REQUEST['tables_blocks'] : '0';
- $tables_display_admin = (isset($_REQUEST['tables_display_admin'])) ? $_REQUEST['tables_display_admin'] : '0';
- $tables_display_user = (isset($_REQUEST['tables_display_user'])) ? $_REQUEST['tables_display_user'] : '0';
- $tables_submitter = (isset($_REQUEST['tables_submitter'])) ? $_REQUEST['tables_submitter'] : '0';
- $tables_publisher = (isset($_REQUEST['tables_publisher'])) ? $_REQUEST['tables_publisher'] : '0';
- $tables_created = (isset($_REQUEST['tables_created'])) ? $_REQUEST['tables_created'] : '0';
- $tables_published = (isset($_REQUEST['tables_published'])) ? $_REQUEST['tables_published'] : '0';
- $tables_expired = (isset($_REQUEST['tables_expired'])) ? $_REQUEST['tables_expired'] : '0';
- $tables_status = (isset($_REQUEST['tables_status'])) ? $_REQUEST['tables_status'] : '0';
- $tables_online = (isset($_REQUEST['tables_online'])) ? $_REQUEST['tables_online'] : '0';
- $tables_pending = (isset($_REQUEST['tables_waiting'])) ? $_REQUEST['tables_waiting'] : '0';
- $tables_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0';
- $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0';
- $select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0';
-
- //Image
- include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- if(!is_dir($pathImageAdmin)){
- $uploaddir = $pathImageAdmin;
- }else{
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/";
- }
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+ } else {
+ $obj->setVar('tables_img', $_REQUEST['tables_img']);
+ }*/
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
- $name_img = $_REQUEST['tables_name'].'.'.$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);
- } else {
- $obj->setVar('tables_img', $uploader->getSavedFileName());
- }
- } else {
- $obj->setVar('tables_img', $_REQUEST['tables_img']);
- }
-
- if ($tblsHandler->insert($obj)) {
- $tables_id = $GLOBALS['xoopsDB']->getInsertId();
- $obj = $tblsHandler->get($tables_id);
- $form = $obj->_getFormChamps();
- $form->display();
- }
- } else {
- redirect_header('tables.php?op=tables_list', 2, _AM_TDMCREATE_TABLES_EXIST);
- }
+ if ($tblsHandler->insert($obj)) {
+ $tables_id = $GLOBALS['xoopsDB']->getInsertId();
+ $obj = $tblsHandler->get($tables_id);
+ $form = $obj->getFormChamps();
+ $form->display();
+ }
break;
case "tables_create":
- echo $tablesAdmin->addNavigation('tables.php');
- $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_TOPICS, 'tables.php?op=topics_create', 'add');
+ echo $tablesAdmin->addNavigation('tables.php');
$tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=tables_list', 'list');
echo $tablesAdmin->renderButton();
$obj =& $tblsHandler->create();
$form = $obj->getFormTable();
$form->display();
- break;
+ break;
- case "topics_create":
- echo $tablesAdmin->addNavigation('tables.php');
- $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_create', 'add');
- $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=tables_list', 'list');
- echo $tablesAdmin->renderButton();
-
- $result = $GLOBALS['xoopsDB']->queryF("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("tdmcreate_tables")." WHERE tables_name = 'topic'");
- list( $topic ) = $GLOBALS['xoopsDB']->fetchRow($result);
- $obj =& $tblsHandler->get($_REQUEST['tables_id']);
- if ( $topic >= 0 ) {
- $form = $obj->getFormTopic();
- $form->display();
- }
- break;
-
case "tables_list":
default:
echo $tablesAdmin->addNavigation('tables.php');
- $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_create', 'add');
- $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_TOPICS, 'tables.php?op=topics_create', 'add');
+ $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_create', 'add');
echo $tablesAdmin->renderButton();
//Retirer les tables inutiles
@@ -513,8 +374,8 @@
}
$criteria = new CriteriaCompo();
- $criteria->setSort('modules_name');
- $criteria->setOrder('ASC');
+ $criteria->setSort('modules_id');
+ $criteria->setOrder('DESC');
$numrows_modules = $modsHandler->getCount();
if (isset($_REQUEST['limit'])) {
$criteria->setLimit($_REQUEST['limit']);
@@ -558,78 +419,86 @@
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr>';
echo '<th align="center" width="1%">'._AM_TDMCREATE_ID.'</th>';
- echo '<th align="center" width="20%">'._AM_TDMCREATE_NAME.'</th>';
- echo '<th align="center" width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
+ echo '<th align="center" width="12%">'._AM_TDMCREATE_NAME.'</th>';
+ echo '<th align="center" width="8%">'._AM_TDMCREATE_IMAGE.'</th>';
echo '<th align="center" width="10%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
echo '<th align="center" width="10%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
echo '<th align="center" width="10%">'._AM_TDMCREATE_BLOCKS.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_SEARCH.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_COM.'</th>';
echo '<th align="center" width="10%">'._AM_TDMCREATE_NB_CHAMPS.'</th>';
- echo '<th align="center" width="20%">'._AM_TDMCREATE_FORMACTION.'</th>';
+ echo '<th align="center" width="7%">'._AM_TDMCREATE_FORMACTION.'</th>';
echo '</tr>';
$class = 'odd';
foreach (array_keys($mods_arr) as $i)
{
- $mods_id = $mods_arr[$i]->getVar('modules_id');
- $mods_name = $mods_arr[$i]->getVar('modules_name');
- $mods_image = $mods_arr[$i]->getVar('modules_image');
- $mods_display_admin = $mods_arr[$i]->getVar('modules_display_admin');
- $mods_display_user = $mods_arr[$i]->getVar('modules_display_user');
- $mods_display_admin = ($mods_display_admin == 1) ? _YES : _NO;
- $mods_display_user = ($mods_display_user == 1) ? _YES : _NO;
- echo '<tr class="odd center">';
- echo '<td class="center"><b>'.$mods_id.'</b></td>';
- echo '<td class="left"><b>'.$mods_name.'</b></td>';
- echo '<td><img src="../images/uploads/modules/'.$mods_image.'" height="30px"></td>';
- echo '<td>'.$mods_display_admin.'</td>';
- echo '<td>'.$mods_display_user.'</td>';
- echo '<td> </td>';
- echo '<td> </td>';
- echo '<td class="center width5">';
- echo '<a href="tables.php?op=edit_modules&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=delete_modules&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
- echo '</td>';
- echo '</tr>';
-
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('tables_modules', $mods_id));
- $criteria->setSort('tables_name');
- $criteria->setOrder('ASC');
- $tbls_arr = $tblsHandler->getall($criteria);
- $numrows_tables = $tblsHandler->getCount();
- if ( $numrows_tables != 0 )
+ $mods_id = $mods_arr[$i]->getVar('modules_id');
+ $mods_name = $mods_arr[$i]->getVar('modules_name');
+ $mods_image = $mods_arr[$i]->getVar('modules_image');
+ $mods_display_admin = $mods_arr[$i]->getVar('modules_display_admin');
+ $mods_display_user = $mods_arr[$i]->getVar('modules_display_user');
+ $mods_display_admin = ($mods_display_admin == 1) ? _YES : _NO;
+ $mods_display_user = ($mods_display_user == 1) ? _YES : _NO;
+ echo '<tr class="odd center">';
+ echo '<td class="center big red"><b>'.$mods_id.'</b></td>';
+ echo '<td class="left big green"><b>'.$mods_name.'</b></td>';
+ echo '<td><img src="../images/uploads/modules/'.$mods_image.'" height="30px"></td>';
+ echo '<td>'.$mods_display_admin.'</td>';
+ echo '<td>'.$mods_display_user.'</td>';
+ echo '<td> </td>';
+ echo '<td> </td>';
+ echo '<td> </td>';
+ echo '<td> </td>';
+ echo '<td class="center width5">';
+ echo '<a href="tables.php?op=edit_modules&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=delete_modules&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
+ echo '</td>';
+ echo '</tr>';
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('tables_modules', $mods_id));
+ $criteria->setSort('tables_name');
+ $criteria->setOrder('ASC');
+ $tbls_arr = $tblsHandler->getall($criteria);
+ $numrows_tables = $tblsHandler->getCount();
+ if ( $numrows_tables != 0 )
+ {
+ foreach (array_keys($tbls_arr) as $i)
{
- foreach (array_keys($tbls_arr) as $i)
- {
- $tbls_id = $tbls_arr[$i]->getVar('tables_id');
- $tbls_modules = $tbls_arr[$i]->getVar('tables_modules');
- $tbls_name = $tbls_arr[$i]->getVar('tables_name');
- $tbls_img = $tbls_arr[$i]->getVar('tables_img');
- $tbls_blocks = $tbls_arr[$i]->getVar('tables_blocks');
- $tbls_champs = $tbls_arr[$i]->getVar('tables_champs');
- $tbls_display_admin = $tbls_arr[$i]->getVar('tables_display_admin');
- $tbls_display_user = $tbls_arr[$i]->getVar('tables_display_user');
- $champs = explode("|", $tbls_champs);
- $nb_champs = $tbls_arr[$i]->getVar('tables_nb_champs');
- $display_admin = ($tbls_display_admin == 1) ? _YES : _NO;
- $display_user = ($tbls_display_user == 1) ? _YES : _NO;
- $blocks = ($tbls_blocks == 1) ? _YES : _NO;
- echo '<tr class="even center">';
- echo '<td class="center width5">'.$tbls_id.'</td>';
- echo '<td class="left"> <b>- '.$tbls_name.'</b></td>';
- if(!is_dir($pathImageAdmin)){
- echo '<td><img src="'.$pathImageAdmin.'/'.$tbls_img.'" height="30px"></td>';
- }else{
- echo '<td><img src="../images/uploads/tables/'.$tbls_img.'" height="30px"></td>';
- }
- echo '<td>'.$display_admin.'</td>';
- echo '<td>'.$display_user.'</td>';
- echo '<td>'.$blocks.'</td>';
- echo '<td>'.$nb_champs.'</td>';
- echo '<td class="center width5">';
- echo '<a href="tables.php?op=edit_tables&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_champs&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/inserttable.png alt="._AM_TDMCREATE_FORMCHAMPS.'" title="'._AM_TDMCREATE_FORMCHAMPS.'"></a> <a href="tables.php?op=delete_tables&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
- echo '</td>';
- echo '</tr>';
+ $tbls_id = $tbls_arr[$i]->getVar('tables_id');
+ $tbls_modules = $tbls_arr[$i]->getVar('tables_modules');
+ $tbls_name = $tbls_arr[$i]->getVar('tables_name');
+ $tbls_img = $tbls_arr[$i]->getVar('tables_img');
+ $tbls_blocks = $tbls_arr[$i]->getVar('tables_blocks');
+ $tbls_display_admin = $tbls_arr[$i]->getVar('tables_display_admin');
+ $tbls_display_user = $tbls_arr[$i]->getVar('tables_display_user');
+ $tbls_search = $tbls_arr[$i]->getVar('tables_search');
+ $tbls_coms = $tbls_arr[$i]->getVar('tables_coms');
+ $nb_champs = $tbls_arr[$i]->getVar('tables_nb_champs');
+ $display_admin = ($tbls_display_admin == 1) ? _YES : _NO;
+ $display_user = ($tbls_display_user == 1) ? _YES : _NO;
+ $search = ($tbls_search == 1) ? _YES : _NO;
+ $coms = ($tbls_coms == 1) ? _YES : _NO;
+ $blocks = ($tbls_blocks == 1) ? _YES : _NO;
+ echo '<tr class="even center">';
+ echo '<td class="center width5 green">'.$tbls_id.'</td>';
+ echo '<td class="left"> <b>- '.$tbls_name.'</b></td>';
+ if(!is_dir($pathImageAdmin)){
+ echo '<td><img src="'.$pathImageAdmin.'/'.$tbls_img.'" height="30px"></td>';
+ }else{
+ echo '<td><img src="../images/uploads/tables/'.$tbls_img.'" height="30px"></td>';
}
- }
+ echo '<td>'.$display_admin.'</td>';
+ echo '<td>'.$display_user.'</td>';
+ echo '<td>'.$blocks.'</td>';
+ echo '<td>'.$search.'</td>';
+ echo '<td>'.$coms.'</td>';
+ echo '<td>'.$nb_champs.'</td>';
+ echo '<td class="center width5">';
+ echo '<a href="tables.php?op=edit_tables&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_champs&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/inserttable.png alt="._AM_TDMCREATE_FORMCHAMPS.'" title="'._AM_TDMCREATE_FORMCHAMPS.'"></a> <a href="tables.php?op=delete_tables&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
+ echo '</td>';
+ echo '</tr>';
+ }
+ }
}
echo '</table><br />';
echo "<div class='center'>".$pagenav."</div><br />";
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php 2013-10-23 01:53:35 UTC (rev 12196)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php 2013-10-23 01:55:18 UTC (rev 12197)
@@ -81,8 +81,10 @@
$form->setExtra('enctype="multipart/form-data"');
$form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_IMPORTANT.'</b></div>','head');
+ // Name
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_NAME, 'modules_name', 50, 255, $this->getVar('modules_name')), true);
- $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'modules_version', 50, 255, $this->getVar('modules_version')), true);
+ // Version
+ $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'modules_version', 10, 25, $this->getVar('modules_version')), true);
// Name description
$editor_configs=array();
$editor_configs["name"] ="modules_description";
@@ -91,13 +93,25 @@
$editor_configs["cols"] = 100;
$editor_configs["width"] = "100%";
$editor_configs["height"] = "100px";
- $editor_configs["editor"] = $GLOBALS['xoopsModuleConfig']['TDMCreate_editor'];
+ $editor_configs["editor"] = $GLOBALS['xoopsModuleConfig']['tdmcreate_editor'];
$form->addElement( new XoopsFormEditor(_AM_TDMCREATE_MODULES_DESCRIPTION, "modules_description", $editor_configs), true);
// Author
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR, 'modules_author', 50, 255, $this->getVar('modules_author')), true);
- $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_LICENSE, 'modules_license', 50, 255, $this->getVar('modules_license')), true);
+ // Licenses
+ $modules_license_select = new XoopsFormSelect(_AM_TDMCREATE_MODULES_LICENSE, 'modules_license', $this->getVar('modules_license'));
+ $modules_license_select->addOption('GNU General Public License (GPL)', 'General Public License');
+ $modules_license_select->addOption('MIT license', 'MIT license');
+ $modules_license_select->addOption('Common Development and Distribution License (CDDL-1.0)', 'Common Development');
+ $modules_license_select->addOption('Educational Community License', 'Educational Community License');
+ $modules_license_select->addOption('Open Font License 1.1 (OFL-1.1)', 'Open Font License');
+ $modules_license_select->addOption('Adaptive Public License (APL-1.0)', 'Adaptive Public License');
+ $modules_license_select->addOption('Q Public License (QPL-1.0)', 'Q Public License');
+ $modules_license_select->addOption('Academic Free License (AFL-3.0)', 'Academic Free License');
+ $form->addElement($modules_license_select, true);
+ // Display Admin
$modules_display_admin = $this->isNew() ? 0 : $this->getVar('modules_display_admin');
$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_DISPLAY_ADMIN, 'modules_display_admin', $modules_display_admin, _YES, _NO));
+ // Display User
$modules_display_user = $this->isNew() ? 0 : $this->getVar('modules_display_user');
$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_DISPLAY_USER, 'modules_display_user', $modules_display_user, _YES, _NO));
$modules_active_search = $this->isNew() ? 0 : $this->getVar('modules_active_search');
@@ -125,8 +139,10 @@
$imgtray->addElement($fileseltray);
$form->addElement($imgtray);
- $form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_NOTIMPORTANT.'</b></div>','head');
+ $form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_NOTIMPORTANT.'</b></div>','head');
+ // Author Email
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR_MAIL, 'modules_author_mail', 50, 255, $this->getVar('modules_author_mail')), false);
+ // Author Website Url
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR_WEBSITE_URL, 'modules_author_website_url', 50, 255, $this->getVar('modules_author_website_url')), false);
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR_WEBSITE_NAME, 'modules_author_website_name', 50, 255, $this->getVar('modules_author_website_name')), false);
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_CREDITS, 'modules_credits', 50, 255, $this->getVar('modules_credits')), false);
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php 2013-10-23 01:53:35 UTC (rev 12196)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php 2013-10-23 01:55:18 UTC (rev 12197)
@@ -60,7 +60,7 @@
$this->__construct();
}
- function _getFormChamps($action = false)
+ function getFormChamps($action = false)
{
if ($action === false) {
$action = $_SERVER["REQUEST_URI"];
@@ -98,12 +98,20 @@
$tbls_nb_champs = $tablesHandler->getall($criteria);
unset($criteria);
for($i=1; $i<count($tbls_nb_champs)-1; $i++)
- {
+ {
+ $tprefix = strtolower($this->getVar("tables_name"));
+
$class = ($class == 'even') ? 'odd' : 'even';
$ele_tray[$i] = new XoopsFormElementTray(' ');
$ele_tray[$i]->addElement(new XoopsFormLabel( '<tr class="center height10 '.$class.'"><td>' ));
$ele_tray[$i]->addElement(new XoopsFormLabel( ($i).'</td><td>' ));
- $ele_tray[$i]->addElement(new XoopsFormText('', "champs_name", 8, 255, $this->getVar("champs_name")));
+ if( $this->getVar("tables_name_empty") == 1 ) {
+ $table_champ = ( $i == 1 ) ? $tprefix.'_id' : $tprefix.'_';
+ $ele_tray[$i]->addElement(new XoopsFormText('', "champs_name", 8, 255, $table_champ));
+ } else {
+ $champs_name = ($this->getVar("tables_name_empty") == 1) ? $tprefix.'_' : $this->getVar("champs_name");
+ $ele_tray[$i]->addElement(new XoopsFormText('', "champs_name", 8, 255, $champs_name));
+ }
$ele_tray[$i]->addElement(new XoopsFormLabel( '</td><td>' ));
//$typeHandler =& xoops_getModuleHandler('tdmcreate_champ_type', 'TDMCreate');
$type_select = new XoopsFormSelect('', 'champ_type_name', $this->getVar("champ_type_name"));
@@ -194,7 +202,7 @@
foreach (array_keys($tbls_arr2) as $j)
{
$tbls_name2 = $tbls_arr2[$j]->getVar('tables_name');
- if ( $tbls_name2 != $tbls_name )
+ if ( $tbls_name2 != $this->getVar('tables_name') )
{
if ( $param_elements[$i] == 'XoopsFormTables-'.$tbls_name2.'' ) {
$elements_select->addOption('XoopsFormTables-'.$tbls_name2, 'Table : '.$tbls_name2);
@@ -245,657 +253,7 @@
$form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
return $form;
}
- /*
- //Entry form fields
- function getFormChamps($action = false, $tbls_id, $tbls_modules, $tbls_name, $tbls_blocks, $tbls_display_admin, $tbls_display_user, $tbls_submitter, $tbls_publisher, $tbls_created, $tbls_published, $tbls_expired, $tbls_status, $tbls_online, $tbls_waiting, $tbls_search, $tbls_coms, $tbls_nb_champs, $select)
- {
- if ($action === false) {
- $action = XOOPS_URL.'/modules/TDMCreate/admin/tables.php';
- }
- $class = 'even';
- $title = $this->isNew() ? sprintf(_AM_TDMCREATE_TABLES_CHAMPS_ADD) : sprintf(_AM_TDMCREATE_TABLES_CHAMPS_EDIT);
-
- $tbls_actions = $tbls_modules.
- "&tables_id=".$tbls_id.
- "&tables_name=".$tbls_name.
- "&tables_blocks=".$tbls_blocks.
- "&tables_display_admin=".$tbls_display_admin.
- "&tables_display_user=".$tbls_display_user.
- "&tables_submitter=".$tbls_submitter.
- "&tables_publisher".$tbls_publisher.
- "&tables_published".$tbls_published.
- "&tables_expired".$tbls_expired.
- "&tables_status".$tbls_status.
- "&tables_created=".$tbls_created.
- "&tables_online=".$tbls_online.
- "&tables_waiting=".$tbls_waiting.
- "&tables_search=".$tbls_search.
- "&tables_coms=".$tbls_coms.
- "&tables_nb_champs=".$tbls_nb_champs.
- "&select=".$select;
-
- echo "<FORM Method='POST' Action='".$action."?op=tables_save&tables_modules=".$tbls_actions."'>
- <table border='0' width='100%' cellspacing='1' class='outer'>
- <tr>
- <td colspan='8' class='head center'>".$title."</td>
- </tr>
- <tr class='head'>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_NAME."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_TYPE."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_VALUE."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_ATTRIBUTE."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_NULL."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_DEFAULT."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_KEY."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE."</td>
- </tr>";
- for($i=0; $i<$tbls_nb_champs ; $i++)
- {
- $tbl_id = ( $i == 0 ) ? strtolower($tbls_name).'_id' : strtolower($tbls_name).'_';
- $tbl_primary = ( $i == 0 ) ? "checked" : "";
- $tbl_value = ( $i == 0 ) ? "8" : "";
-
- $class = ($class == 'even') ? 'odd' : 'even';
- echo "<tr class=".$class.">
- <td class='center'><INPUT type='text' size='10' value='".$tbl_id."' name='champs_name[".$i."]'></td>
- <td class='center'><SELECT name='champs_type[".$i."]'>
- <OPTION VALUE='int'>INT</OPTION>
- <OPTION VALUE='tinyint'>TINYINT</OPTION>
- <OPTION VALUE='mediumint'>MEDIUMINT</OPTION>
- <OPTION VALUE='smallint'>SMALLINT</OPTION>
- <OPTION VALUE='float'>FLOAT</OPTION>
- <OPTION VALUE='double'>DOUBLE</OPTION>
- <OPTION VALUE='decimal'>DECIMAL</OPTION>
- <OPTION VALUE='enum'>ENUM</OPTION>
- <OPTION VALUE='email'>EMAIL</OPTION>
- <OPTION VALUE='url'>URL</OPTION>
- <OPTION VALUE='char'>CHAR</OPTION>
- <OPTION VALUE='varchar'>VARCHAR</OPTION>
- <OPTION VALUE='text'>TEXT</OPTION>
- <OPTION VALUE='tinytext'>TINYTEXT</OPTION>
- <OPTION VALUE='mediumtext'>MEDIUMTEXT</OPTION>
- <OPTION VALUE='longtext'>LONGTEXT</OPTION>
- <OPTION VALUE='date'>DATE</OPTION>
- <OPTION VALUE='datetime'>DATETIME</OPTION>
- <OPTION VALUE='timestamp'>TIMESTAMP</OPTION>
- <OPTION VALUE='time'>TIME</OPTION>
- <OPTION VALUE='year'>YEAR</OPTION>
- </SELECT></td>
- <td class='center'><INPUT type='text' size='2' name='champs_value[".$i."]' value='".$tbl_value."'></td>
- <td class='center'><SELECT name='champs_attributes[".$i."]'>
- <OPTION VALUE=''></OPTION>
- <OPTION VALUE='unsigned'>UNSIGNED</OPTION>
- <OPTION VALUE='ON UPDATE CURRENT_TIMESTAMP'>on update CURRENT_TIMESTAMP</OPTION>
- </SELECT></td>
- <td class='center'><SELECT name='champs_null[".$i."]'>
- <OPTION VALUE='not null'>NOT NULL</OPTION>
- <OPTION VALUE='null'>NULL</OPTION>
- </SELECT></td>
- <td class='center'><INPUT type='text' size='2' name='champs_default[".$i."]'></td>
- <td class='center'><SELECT name='champs_key[".$i."]'>
- <OPTION VALUE=''></OPTION>
- <OPTION VALUE='primary'>PRIMARY</OPTION>
- <OPTION VALUE='unique'>UNIQUE</OPTION>
- <OPTION VALUE='index'>INDEX</OPTION>
- <OPTION VALUE='fulltext'>FULLTEXT</OPTION>
- </SELECT></td>
- <td class='center'>";
- if ( $i != 0 ) {
- echo "<table border='0' style='border-color:#777'; width='100%' cellspacing='1' class='outer'>
- <tr>
- <td class='head left' width='95%'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_ELEMENTS."</td>
- <td class='even right' width='5%'>
- <SELECT name='champs_param_elements[".$i."]'>
- <OPTION VALUE='Null'>None</OPTION>
- <OPTION VALUE='XoopsFormText'>Text</OPTION>
- <OPTION VALUE='XoopsFormTextArea'>TextArea</OPTION>
- <OPTION VALUE='XoopsFormDhtmlTextArea'>DhtmlTextArea</OPTION>
- <OPTION VALUE='XoopsFormCheckBox'>CheckBox</OPTION>
- <OPTION VALUE='XoopsFormRadioYN'>RadioYN</OPTION>
- <OPTION VALUE='XoopsFormSelect'>SelectBox</OPTION>
- <OPTION VALUE='XoopsFormSelectUser'>SelectUser</OPTION>
- <OPTION VALUE='XoopsFormColorPicker'>ColorPicker</OPTION>
- <OPTION VALUE='XoopsFormUploadImage'>UploadImage</OPTION>
- <OPTION VALUE='XoopsFormUploadFile'>UploadFile</OPTION>
- <OPTION VALUE='XoopsFormTextDateSelect'>TextDateSelect</OPTION>";
- $tablesHandler =& xoops_getModuleHandler('TDMCreate_tables', 'TDMCreate');
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('tables_modules', $tbls_modules));
- $criteria->setSort('tables_name');
- $criteria->setOrder('ASC');
- $tbls_arr1 = $tablesHandler->getall($criteria);
-
- foreach (array_keys($tbls_arr1) as $j)
- {
- $tbls_name1 = $tbls_arr1[$j]->getVar('tables_name');
- if ( $tbls_name1 != 'topic' ) {
- echo "<OPTION VALUE='XoopsFormTables-".$tbls_name1."'>Table : ".$tbls_name1."</OPTION>";
- } else {
- echo "<OPTION VALUE='XoopsFormTopic'>Table : topic</OPTION>";
- }
- }
-
- echo "
- </SELECT>
- </td>
- <tr>
- <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_DISPLAY_ADMIN."</td>
- <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_display_admin[".$i."]' ".$chk."></td>
- </tr>
- <tr>
- <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_DISPLAY_USER."</td>
- <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_display_user[".$i."]' ".$chk."></td>
- </tr>
- ";
- //Afficher la case blocks
- if ( $tbls_blocks == 1 )
- {
- //Pour l'affichage dans les blocks
- $checked_blocks = ( $i == 1 || $i == 2 ) ? "checked" : "";
- echo "<tr>
- <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_BLOCK."</td>
- <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_display_blocks[".$i."]' ".$checked_blocks."></td>
- </tr>";
- }
- $checked_main_field = ( $i == 1 ) ? "checked" : "";
- echo "
- <tr>
- <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_MAIN_FIELD."</td>
- <td class='even right'><INPUT type='radio' value='".$i."' name='champs_param_main_field' ".$checked_main_field."></td>
- </tr>";
-
- //Afficher la case blocks
- if ( $tbls_blocks == 1 )
- {
- echo "
- <tr>
- <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_SEARCH."</td>
- <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_search_field[".$i."]' ".$chk."></td>
- </tr>";
- }
- echo "
- <tr>
- <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_REQUIRED."</td>
- <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_required_field[".$i."]' ".$chk."></td>
- </tr>
- </table>";
- }
- echo "</td></tr>";
- }
- echo "<tr>
- <td colspan='8' class='head right'><input type='submit' value="._AM_TDMCREATE_TABLES_CHAMPS_SUBMIT."></td>
- </tr>";
- echo "</table>
- </FORM>";
- }
- //Formulaire d'edition de champs
- function getFormEditChamps($action = false, $tbls_id)
- {
- if ($action === false) {
- $action = XOOPS_URL.'/modules/TDMCreate/admin/tables.php';
- }
- $class = 'even';
- $title = $this->isNew() ? sprintf(_AM_TDMCREATE_TABLES_CHAMPS_ADD) : sprintf(_AM_TDMCREATE_TABLES_CHAMPS_EDIT);
- //Donnees
- //$tbls_id = $this->getVar('tables_id');
- $tbls_modules = $this->getVar('tables_modules');
- $tbls_modules_table = $this->getVar('tables_modules_table');
- $tbls_name = $this->getVar('tables_name');
- $tbls_img = $this->getVar('tables_img');
- $tbls_nb_champs = $this->getVar('tables_nb_champs');
- $tbls_champs = $this->getVar('tables_champs');
- $tbls_parameters = $this->getVar('tables_parameters');
- $tbls_blocks = $this->getVar('tables_blocks');
- $tbls_display_admin = $this->getVar('tables_display_admin');
- $tbls_display_user = $this->getVar('tables_display_user');
- $tbls_submitter = $this->getVar('tables_submitter');
- $tbls_publisher = $this->getVar('tables_publisher');
- $tbls_published = $this->getVar('tables_published');
- $tbls_expired = $this->getVar('tables_expired');
- $tbls_status = $this->getVar('tables_status');
- $tbls_created = $this->getVar('tables_created');
- $tbls_online = $this->getVar('tables_online');
- $tbls_waiting = $this->getVar('tables_waiting');
- $tbls_search = $this->getVar('tables_search');
- $tbls_coms = $this->getVar('tables_coms');
- $select = 0;
-
- $champs_total = explode("|", $tbls_champs);
- $count_champs = count($champs_total);
- //$count_champs -= 3;
-
- $parameters_total = explode("|", $tbls_parameters);
- $count_parameters = count($parameters_total);
- //$count_parameters -= 3;
- //echo $count_parameters;
- //Champs
- for($i=0; $i<$tbls_nb_champs; $i++)
- {
- if ( $i >= $count_champs ) {
- $champs_name[$i] = '';
- $champs_type[$i] = '';
- $champs_value[$i] = '';
- $champs_attributes[$i] = '';
- $champs_null[$i] = '';
- $champs_default[$i] = '';
- $champs_key[$i] = '';
- } else {
- $champs = explode(":", $champs_total[$i]);
- $champs_name[$i] = $champs[0];
- $champs_type[$i] = $champs[1];
- $champs_value[$i] = $champs[2];
- $champs_attributes[$i] = $champs[3];
- $champs_null[$i] = $champs[4];
- $champs_default[$i] = $champs[5];
- $champs_key[$i] = $champs[6];
- }
- }
- //Parametres
- for($i=0; $i<$tbls_nb_champs; $i++)
- {
- if ( $i == 0 || $i > $count_parameters) {
- $param_elements[$i] = '0';
- $param_display_admin[$i] = '0';
- $param_display_user[$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];
- $champs_param_search_field[$i] = $parameters[5];
- $champs_param_required_field[$i] = $parameters[6];
- }
- }
- $tbls_action = $tbls_modules.
- "&tables_id=".$tbls_id.
- "&tables_name=".$tbls_name.
- "&tables_blocks=".$tbls_blocks.
- "&tables_display_admin=".$tbls_display_admin.
- "&tables_display_user=".$tbls_display_user.
- "&tables_submitter=".$tbls_submitter.
- "&tables_publisher".$tbls_publisher.
- "&tables_published".$tbls_published.
- "&tables_expired".$tbls_expired.
- "&tables_status".$tbls_status.
- "&tables_created=".$tbls_created.
- "&tables_online=".$tbls_online.
- "&tables_waiting=".$tbls_waiting.
- "&tables_search=".$tbls_search.
- "&tables_coms=".$tbls_coms.
- "&tables_nb_champs=".$tbls_nb_champs.
- "&select=".$select;
-
- echo "<FORM Method='POST' Action='".$action."?op=tables_save&tables_modules=".$tbls_action."'>
- <table border='0' width='100%' cellspacing='1' class='outer'>
- <tr>
- <td colspan='8' class='head center'>".$title."</td>
- </tr>
- <tr class='head'>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_NAME."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_TYPE."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_VALUE."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_ATTRIBUTE."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_NULL."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_DEFAULT."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_KEY."</td>
- <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE."</td>
- </tr>";
- $sel = "selected";
- $chk = "checked";
- for($i=0; $i<$tbls_nb_champs ; $i++)
- {
- $class = ($class == 'even') ? 'odd' : 'even';
- echo "<tr class=".$class.">
- <td class='center'><INPUT type='text' size='10' value='".$champs_name[$i]."' name='champs_name[".$i."]'></td>
- <td class='center'><SELECT name='champs_type[".$i."]'>";
- if ( $champs_type[$i] == 'int' ) {
- echo "<OPTION VALUE='int' selected>INT</OPTION>";
- } else {
- echo "<OPTION VALUE='int'>INT</OPTION>";
- }
- if ( $champs_type[$i] == 'tinyint' ) {
- echo "<OPTION VALUE='tinyint' selected>TINYINT</OPTION>";
- } else {
- echo "<OPTION VALUE='tinyint'>TINYINT</OPTION>";
- }
- if ( $champs_type[$i] == 'mediumint' ) {
- echo "<OPTION VALUE='mediumint' selected>MEDIUMINT</OPTION>";
- } else {
- echo "<OPTION VALUE='mediumint'>MEDIUMINT</OPTION>";
- }
- if ( $champs_type[$i] == 'smallint' ) {
- echo "<OPTION VALUE='smallint' selected>SMALLINT</OPTION>";
- } else {
- echo "<OPTION VALUE='smallint'>SMALLINT</OPTION>";
- }
- if ( $champs_type[$i] == 'float' ) {
- echo "<OPTION VALUE='float' selected>FLOAT</OPTION>";
- } else {
- echo "<OPTION VALUE='float'>FLOAT</OPTION>";
- }
- if ( $champs_type[$i] == 'double' ) {
- echo "<OPTION VALUE='double' selected>DOUBLE</OPTION>";
- } else {
- echo "<OPTION VALUE='double'>DOUBLE</OPTION>";
- }
- if ( $champs_type[$i] == 'decimal' ) {
- echo "<OPTION VALUE='decimal' selected>DECIMAL</OPTION>";
- } else {
- echo "<OPTION VALUE='decimal'>DECIMAL</OPTION>";
- }
- if ( $champs_type[$i] == 'enum' ) {
- echo "<OPTION VALUE='enum' selected>ENUM</OPTION>";
- } else {
- echo "<OPTION VALUE='enum'>ENUM</OPTION>";
- }
- if ( $champs_type[$i] == 'email' ) {
- echo "<OPTION VALUE='email' selected>EMAIL</OPTION>";
- } else {
- echo "<OPTION VALUE='email'>EMAIL</OPTION>";
- }
- if ( $champs_type[$i] == 'url' ) {
- echo "<OPTION VALUE='url' selected>URL</OPTION>";
- } else {
- echo "<OPTION VALUE='url'>URL</OPTION>";
- }
- if ( $champs_type[$i] == 'char' ) {
- echo "<OPTION VALUE='char' selected>CHAR</OPTION>";
- } else {
- echo ...
[truncated message content] |
