Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11243] XoopsModules26/tdmcreate/branches/2.01/timgno /tdmcreate
|
From: <txm...@us...> - 2013-03-17 10:48:07
|
Revision: 11243
http://sourceforge.net/p/xoops/svn/11243
Author: txmodxoops
Date: 2013-03-17 10:48:02 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Fixed bugs
Added jquery ui tabs on class/form/modules.php
Modified Paths:
--------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/architecture.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/import.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/en_US.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/xoops_version.php
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -21,9 +21,10 @@
include dirname(__FILE__) . '/header.php';
$field_id = $system->cleanVars($_REQUEST, 'field_id', 0, 'int');
-$field_tid = $system->cleanVars($_REQUEST, 'field_tid', 0, 'int');
-$table_id = $system->cleanVars($_REQUEST, 'table_id', 0, 'int');
-$table_nbfields = $system->cleanVars($_REQUEST, 'table_nbfields', 0, 'int');
+$field_mid = $system->cleanVars($_REQUEST, 'field_mid', 0, 'int');
+$field_tid = $system->cleanVars($_REQUEST, 'field_tid', 0, 'int');
+$field_numb = $system->cleanVars($_REQUEST, 'field_numb', 0, 'int');
+$field_name = $system->cleanVars($_REQUEST, 'field_name', 0, 'int');
// Get handler
$xoops->header('tdmcreate_fields.html');
@@ -36,8 +37,8 @@
$admin_menu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
$admin_menu->renderButton();
// Get modules list
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('table_id', 0, '!='));
+ $criteria = new CriteriaCompo(new Criteria('table_mid', $field_mid));
+ $criteria->add(new Criteria('table_id', $field_tid));
$criteria->setSort('table_name');
$criteria->setOrder('ASC');
$criteria->setStart($start);
@@ -51,7 +52,7 @@
$xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOTMODULES );
}*/
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_tid', 0, '!='));
+ $criteria->add(new Criteria('field_tid', $field_tid));
$criteria->setSort('field_name');
$criteria->setOrder('ASC');
$criteria->setStart($start);
@@ -61,9 +62,7 @@
unset($criteria);
// Assign Template variables
$xoops->tpl()->assign('fields_list', true);
- $xoops->tpl()->assign('fields_count', $numrows_fields);
- /*$mytree = new XoopsObjectTree($table_arr, 'table_id', 'table_mid');
- tdmcreate_getPathTree($mytree, $table_arr[$i]->getVar('table_mid'), $table_arr, 'table_name');*/
+ $xoops->tpl()->assign('fields_count', $numrows_fields);
if ($numrows_tables > 0) {
foreach (array_keys($table_arr) as $i) {
$tables['id'] = $table_arr[$i]->getVar('table_id');
@@ -129,20 +128,21 @@
$obj = $fields_Handler->get($field_id);
} else {
$obj = $fields_Handler->create();
- }
+ }
//Form fields
- $obj->setVars(array('field_tid' => $_POST['field_tid'], 'field_name' => $_POST['field_name'],
- 'field_type' => $_POST['field_type'], 'field_value' => $_POST['field_value'],
- 'field_attribute' => $_POST['field_attribute'], 'field_null' => $_POST['field_null'],
- 'field_default' => $_POST['field_default'], 'field_key' => $_POST['field_key'],
- 'field_elements' => $_POST['field_elements'],
- 'field_admin' => (($_REQUEST['field_admin'] == 1) ? '1' : '0'),
+ $obj->setVars(array('field_mid' => $field_mid, 'field_tid' => $field_tid, 'field_name' => $field_name,
+ 'field_numb' => $field_numb, 'field_type' => $_POST['field_type'],
+ 'field_value' => $_POST['field_value'], 'field_attribute' => $_POST['field_attribute'],
+ 'field_null' => $_POST['field_null'], 'field_default' => $_POST['field_default'],
+ 'field_key' => $_POST['field_key'], 'field_elements' => $_POST['field_elements'],
+ 'field_auto_increment' => (($_REQUEST['field_auto_increment'] == 1) ? '1' : '0'),
+ 'field_admin' => (($_REQUEST['field_admin'] == 1) ? '1' : '0'),
'field_user' => (($_REQUEST['field_user'] == 1) ? '1' : '0'),
'field_blocks' => (($_REQUEST['field_blocks'] == 1) ? '1' : '0'),
'field_mainfield' => (($_REQUEST['field_mainfield'] == 1) ? '1' : '0'),
- 'field_search' => (($_REQUEST['field_search'] == 1) ? '1' : '0'),
- 'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0')));
-
+ 'field_search' => (($_REQUEST['field_search'] == 1) ? '1' : '0'),
+ 'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0')));
+ // Save data
if ($fields_Handler->insert($obj)) {
$xoops->redirect('fields.php', 2, TDMCreateLocale::FORMOK);
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -61,7 +61,7 @@
$admin_menu->addConfigBoxLine(array($folder, '777'), 'chmod');
}
// extension
-$extensions = array('xtraslator' => 'extension');
+$extensions = array('xtranslator' => 'extension');
foreach ($extensions as $module => $type) {
$admin_menu->addConfigBoxLine(array($module, 'warning'), $type);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -134,8 +134,9 @@
} else {
$obj = $tables_Handler->create();
}
+ $mid = $request->asInt('mod_id', 0);
//Form tables
- $obj->setVars(array('table_mid' => $request->asInt('mod_id', 0), 'table_name' => $_POST['table_name'],
+ $obj->setVars(array('table_mid' => $_POST['table_mid'], 'table_name' => $_POST['table_name'],
'table_nbfields' => $_POST['table_nbfields'], 'table_fieldname' => $_POST['table_fieldname']));
//Form table_image
$pathIcon32 = XOOPS_ROOT_PATH . '/media/xoops/images/icons/32';
@@ -169,10 +170,12 @@
'table_notifications' => (($_REQUEST['table_notifications'] == 1) ? '1' : '0')));
if( $tables_Handler->insert($obj) ) {
- if( $obj->isNew() )
- $xoops->redirect('fields.php?op=new&tid='.$obj->getVar('table_id'), 3, XoopsLocale::S_DATA_INSERTED);
- else
+ if( $obj->isNew() ) {
+ $table_id = $xoops->db->getInsertId();
+ $xoops->redirect('fields.php?op=new&field_mid='.$mid.'&field_tid='.$table_id.'&field_numb='.$table_nbfields.'&field_name='.$table_fieldname, 3, XoopsLocale::S_DATA_INSERTED);
+ } else {
$xoops->redirect('tables.php', 3, XoopsLocale::S_DATABASE_UPDATED);
+ }
}
$xoops->error($obj->getHtmlErrors());
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/architecture.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/architecture.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/architecture.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -192,7 +192,7 @@
}
}
-class TDMCreateFileVersion extends TDMCreateFile
+class TDMCreateXoopsVersionFile extends TDMCreateFile
{
/**
* Constructor
@@ -212,14 +212,14 @@
* @param string $folder
* @param string $file
*/
- public function createFileXoopsVersion($folder, $file, $elements = array())
+ public function createXoopsVersionFile($folder, $file, $elements = array())
{
$this->file = $file;
$this->folder = $folder;
}
}
-class TDMCreateFileClasses
+class TDMCreateClassesFile
{
/**
* @var null|array
@@ -251,7 +251,7 @@
*/
public function tdmc_initVar($key, $data_type = 'INT', $required = false, $maxlength = null, $options = '')
{
- $r = $required == true ? ', ' . $required : $required;
+ $r = $required == true ? ', ' . $required : '';
$m = ($maxlength != null) ? ', ' . $maxlength : $maxlength;
$o = ($options != '') ? ', ' . $options : $options;
return '$this->initVar(\''.$key.'\', XOBJ_DTYPE_'. $data_type .', null' . $r . $m . $o .');';
@@ -264,8 +264,14 @@
* @param boolean $not_gpc
*/
public function tdmc_setVar($key, $value, $not_gpc = false)
- {
- return '$this->setVar(\''.$key.'\', '. $value .', ' . $not_gpc .');';
+ {
+ $res = '';
+ if ( $not_gpc ) {
+ $res .= '$this->setVar(\''.$key.'\', '. $value .', ' . $not_gpc .');';
+ } else {
+ $res .= '$this->setVar(\''.$key.'\', '. $value .');';
+ }
+ return $res;
}
/**
@@ -274,11 +280,27 @@
* @param boolean $not_gpc
*/
public function tdmc_setVars($var_arr, $not_gpc = false)
- {
- foreach ($var_arr as $key => $value) {
- $results = $key.'\', '. $value;
+ {
+ $comma = ', '; $c = 0;
+ foreach ($var_arr as $key => $value) {
+ $_array[$c] = $key.'\' => '. $value;
+ $c++;
}
- return '$this->setVars(\''. $results .', ' . $not_gpc .');';
+ $res = '';
+ for ($i = 0; $i < $c; $i++)
+ {
+ if ( $i != $c - 1 ) {
+ $res .= $_array[$i] . $comma;
+ } else {
+ $res .= $_array[$i];
+ }
+ }
+ if ( $not_gpc ) {
+ $res .= '$this->setVars(array(\''. $res .'), ' . $not_gpc .');';
+ } else {
+ $res .= '$this->setVars(array(\''. $res .'));';
+ }
+ return $res;
}
/**
@@ -295,9 +317,35 @@
{
return null;
}
+
+ /**
+ *
+ * @param string $key
+ * @param string $value
+ * @param string $sort
+ * @param string $order
+ * @param int $tree
+ * @param int $id
+ */
+ public function tdmc_Criteria($key, $value, $sort = '', $order = '', $id = null)
+ {
+ $criteria = '$criteria = new CriteriaCompo();';
+ if($id) {
+ $criteria = '$criteria->add(new Criteria(\''.$key.'\', '.$value.')));';
+ } else {
+ $criteria = '$criteria->add(new Criteria(\''.$key.'\', '.$id.', '.$value.')));';
+ }
+ if($sort != '') {
+ $criteria = '$criteria->setSort(\''.$sort.'\');';
+ }
+ if($order != '') {
+ $criteria = '$criteria->setOrder(\''.$order.'\');';
+ }
+ return $criteria;
+ }
}
-class TDMCreateFileDb
+class TDMCreateDbFile
{
/**
* @var null|array
@@ -317,7 +365,7 @@
/**
*
* @param string $var
- * @param integer $nb_champs
+ * @param integer $nb_fields
* @param mixed $data_type
* @param boolean $required
* @param mixed $handler
@@ -325,18 +373,18 @@
*
* @return string
*/
- public function tdmc_dbTable($tablename, $nb_champs = null, $data_type = 'int', $handler = null, $options = '')
+ public function tdmc_dbTable($tablename, $nb_fields = null, $data_type = 'int', $handler = null, $options = '')
{
$ret = '#
-# Structure for table `'.strtolower($tablename).'` '.$nb_champs.'
+# Structure for table `'.strtolower($tablename).'` '.$nb_fields.'
#
CREATE TABLE `'.strtolower($tablename).'` (';
$j = 0;
- for ($i = 0; $i < $nb_champs; $i++)
+ for ($i = 0; $i < $nb_fields; $i++)
{
- $structure = explode(":", $champs[$i]);
+ $structure = explode(":", $fields[$i]);
//Debut
if ( $structure[0] != ' ' )
@@ -403,10 +451,10 @@
for ($i = 0; $i < $j; $i++)
{
if ( $i != $j - 1 ) {
- $key .= ''.$comma[$i].',
+ $key .= $comma[$i].',
';
} else {
- $key .= ''.$comma[$i].'
+ $key .= $comma[$i].'
';
}
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -29,7 +29,9 @@
public function __construct()
{
$this->initVar('field_id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('field_mid', XOBJ_DTYPE_INT, null);
$this->initVar('field_tid', XOBJ_DTYPE_INT, null);
+ $this->initVar('field_numb', XOBJ_DTYPE_INT, null);
$this->initVar('field_name', XOBJ_DTYPE_TXTBOX, null);
$this->initVar('field_type', XOBJ_DTYPE_TXTBOX, null);
$this->initVar('field_value', XOBJ_DTYPE_TXTBOX, null);
@@ -43,12 +45,7 @@
$this->initVar('field_block', XOBJ_DTYPE_INT);
$this->initVar('field_mainfield', XOBJ_DTYPE_INT);
$this->initVar('field_search', XOBJ_DTYPE_INT);
- $this->initVar('field_required', XOBJ_DTYPE_INT);
- // For relationship
- $this->initVar('table_id', XOBJ_DTYPE_INT, null, true);
- $this->initVar('table_mid', XOBJ_DTYPE_INT, null);
- $this->initVar('table_name', XOBJ_DTYPE_TXTBOX, null);
- $this->initVar('table_nbfields', XOBJ_DTYPE_INT, null);
+ $this->initVar('field_required', XOBJ_DTYPE_INT);
}
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -25,7 +25,7 @@
/**
* @param TDMCreateFields|XoopsObject $obj
*/
- public function __construct(TDMCreateFields &$obj)
+ public function __construct(TDMCreateFields &$obj, $field_mid = 0, $field_tid = 0, $field_numb = null, $field_name = '')
{
$system = System::getInstance();
$xoops = Xoops::getInstance();
@@ -37,21 +37,31 @@
$this->setExtra('enctype="multipart/form-data"');
$tables_Handler = $xoops->getModuleHandler('tables');
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('table_id', 0, '!='));
+ $criteria = new CriteriaCompo(new Criteria('table_mid', $field_mid)));
+ $criteria->add(new Criteria('table_id', $field_tid));
$criteria->setSort('table_name');
$criteria->setOrder('ASC');
$tables_arr = $tables_Handler->getAll($criteria);
- unset($criteria);
+ unset($criteria);
+
+ if (!$obj->isNew()) {
+ $this->addElement(new XoopsFormHidden('field_mid', $obj->getVar('field_mid')));
+ } else {
+ $this->addElement(new XoopsFormHidden('field_mid', $field_mid));
+ }
- // Count fields
- $fields_Handler = $xoops->getModuleHandler('fields');
- /*$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_tid', $request->asInt('table_id', 0)));
- $numb_fields = $fields_Handler->getCount($criteria);
- unset($criteria);*/
- $numb_fields = $fields_Handler->get($request->asInt('table_nbfields', 0));
-
+ if (!$obj->isNew()) {
+ $this->addElement(new XoopsFormHidden('field_tid', $obj->getVar('field_tid')));
+ } else {
+ $this->addElement(new XoopsFormHidden('field_tid', $field_tid));
+ }
+
+ if (!$obj->isNew()) {
+ $numb_fields = $obj->getVar('field_numb');
+ } else {
+ $numb_fields = $field_numb;
+ }
+
if ($numb_fields > 0)
{
$main_tray = new XoopsFormElementTray(' ');
@@ -77,13 +87,15 @@
{
$id = $i + 1;
$main_tray->addElement(new XoopsFormRaw('<tr class=\'top\'>'));
- $main_tray->addElement(new XoopsFormRaw('<td>'.$id.'</td>'));
- $field_name = new XoopsFormText(TDMCreateLocale::FIELD_NAME, 'field_name', 1, 25, $obj->getVar('field_name'));
+ $main_tray->addElement(new XoopsFormRaw('<td>'.$id.'</td>'));
+ $field_value = ( $i == 1 ) ? '8' : $obj->getVar('field_value');
+ $fieldname = $obj->isNew() ? $field_name : $obj->getVar('field_name');
+ $field_name = new XoopsFormText(TDMCreateLocale::FIELD_NAME, 'field_name', 1, 25, $field_name);
$main_tray->addElement(new XoopsFormRaw('<td>'.$field_name->render().'</td>'));
$field_type_select = new XoopsFormSelect(TDMCreateLocale::FIELD_TYPE, 'field_type', $obj->getVar('field_type'));
$field_type_select->addOptionArray($fieldtype_Handler->getList());
$main_tray->addElement(new XoopsFormRaw('<td>'.$field_type_select->render().'</td>'));
- $field_value = new XoopsFormText(TDMCreateLocale::FIELD_VALUE, 'field_value', 1, 25, $obj->getVar('field_value'));
+ $field_value = new XoopsFormText(TDMCreateLocale::FIELD_VALUE, 'field_value', 1, 10, $field_value);
$main_tray->addElement(new XoopsFormRaw('<td>'.$field_value->render().'</td>'));
$field_attrs_select = new XoopsFormSelect(TDMCreateLocale::FIELD_ATTRIBUTE, 'field_attribute', $obj->getVar('field_attribute'));
$field_attrs_select->addOptionArray($fieldattrs_Handler->getList());
@@ -150,12 +162,12 @@
unset($id);
if (!$obj->isNew()) {
- $field_tid = new XoopsFormHidden('id', $obj->getVar('field_tid'));
+ $ftid = new XoopsFormHidden('field_tid', $obj->getVar('field_tid'));
} else {
- $field_tid = new XoopsFormHidden('tid', $obj->getVar('field_tid'));
+ $ftid = new XoopsFormHidden('field_tid', $field_tid);
}
- $main_tray->addElement(new XoopsFormRaw('<tr><td colspan=\'7\'>'.$field_tid->render().'</td>'));/**/
+ $main_tray->addElement(new XoopsFormRaw('<tr><td colspan=\'7\'>'.$ftid->render().'</td>'));
$main_tray->addElement(new XoopsFormHidden('op', 'save'));
$submit = new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit');
$submit->setExtra('style="text-align: right;"');
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -32,10 +32,12 @@
$title = $obj->isNew() ? sprintf(TDMCreateLocale::ADD_MODULE) : sprintf(TDMCreateLocale::EDIT_MODULE);
- parent::__construct($title, 'form', false, 'post', true);
- $this->setExtra('enctype="multipart/form-data"');
+ parent::__construct($title, 'form', 'modules.php', 'post', true, 'raw');
+ //$this->setExtra('enctype="multipart/form-data"');
+ $tabtray = new XoopsFormTabTray('', 'uniqueid');
// First Break
- $this->insertBreak('<div class="center"><b>'.TDMCreateLocale::IMPORTANT.'</b></div>','head');
+ //$this->insertBreak('<div class="center"><b>'.TDMCreateLocale::IMPORTANT.'</b></div>', 'head');
+ $tab1 = new XoopsFormTab(TDMCreateLocale::IMPORTANT, 'important');
// Name of Module
$mod_tray = new XoopsFormElementTray(TDMCreateLocale::C_MODULE_OR_EXTENSION, "\t");
$mod_tray->setDescription(TDMCreateLocale::C_MODULE_OR_EXTENSION_DESC);
@@ -44,9 +46,9 @@
$check_is_extension = new XoopsFormCheckBox(' ', 'isextension', $is_extension);
$check_is_extension->addOption(1, TDMCreateLocale::QC_ISEXTENSION);
$mod_tray->addElement($check_is_extension);
- $this->addElement($mod_tray);
+ $tab1->addElement($mod_tray);
// Version module
- $this->addElement(new XoopsFormText(XoopsLocale::VERSION, 'mod_version', 30, 50, $obj->getVar('mod_version')), true);
+ $tab1->addElement(new XoopsFormText(XoopsLocale::VERSION, 'mod_version', 30, 50, $obj->getVar('mod_version')), true);
// Editor
$editor_configs=array();
$editor_configs['name'] = 'mod_description';
@@ -56,10 +58,10 @@
$editor_configs['width'] = '100%';
$editor_configs['height'] = '400px';
$editor_configs['editor'] = $xoops->getModuleConfig('editor');
- $this->addElement( new XoopsFormEditor(XoopsLocale::DESCRIPTION, 'mod_description', $editor_configs), true );
+ $tab1->addElement( new XoopsFormEditor(XoopsLocale::DESCRIPTION, 'mod_description', $editor_configs), true );
// Author module
- $this->addElement(new XoopsFormText(XoopsLocale::AUTHOR, 'mod_author', 50, 255, $obj->getVar('mod_author')), true);
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_LICENSE, 'mod_license', 50, 255, $obj->getVar('mod_license')), true);
+ $tab1->addElement(new XoopsFormText(XoopsLocale::AUTHOR, 'mod_author', 50, 255, $obj->getVar('mod_author')), true);
+ $tab1->addElement(new XoopsFormText(TDMCreateLocale::C_LICENSE, 'mod_license', 50, 255, $obj->getVar('mod_license')), true);
$option_tray = new XoopsFormElementTray(XoopsLocale::OPTIONS, ' ');
$display_admin = $obj->isNew() ? 0 : $obj->getVar('mod_admin');
$check_display_admin = new XoopsFormCheckBox(' ', 'mod_admin', $display_admin);
@@ -85,7 +87,7 @@
$check_active_notifies = new XoopsFormCheckBox(' ', 'mod_notifications', $active_notifies);
$check_active_notifies->addOption(1, TDMCreateLocale::C_NOTIFICATIONS);
$option_tray->addElement($check_active_notifies);
- $this->addElement($option_tray);
+ $tab1->addElement($option_tray);
$module_image = $obj->getVar('mod_image') ? $obj->getVar('mod_image') : 'default_slogo.png';
$uploadir = 'uploads/tdmcreate/images/modules';
@@ -103,36 +105,52 @@
$fileseltray->addElement(new XoopsFormFile(XoopsLocale::A_UPLOAD , 'modules_image', $xoops->getModuleConfig('maxuploadsize')));
$fileseltray->addElement(new XoopsFormLabel(''));
$imgtray->addElement($fileseltray);
- $this->addElement($imgtray);/**/
- /*$uploadir = 'uploads/tdmcreate/images/modules';
- $this->addElement(new XoopsFormImage(XoopsLocale::IMAGE , 'modules', $uploadir, $obj->getVar('mod_image')));*/
+ $tab1->addElement($imgtray);
+ $tabtray->addElement($tab1);
+
+ /**
+ * Not important
+ */
+ $tab2 = new XoopsFormTab(TDMCreateLocale::NOT_IMPORTANT, 'not_important');
// Second Break
- $this->insertBreak('<div class="center"><b>'.TDMCreateLocale::NOT_IMPORTANT.'</b></div>','head');
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_AUTHOR_MAIL, 'mod_author_mail', 50, 255, $obj->getVar('mod_author_mail')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_AUTHOR_WEBSITE_URL, 'mod_author_website_url', 50, 255, $obj->getVar('mod_author_website_url')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_AUTHOR_WEBSITE_NAME, 'mod_author_website_name', 50, 255, $obj->getVar('mod_author_website_name')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_CREDITS, 'mod_credits', 50, 255, $obj->getVar('mod_credits')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_RELEASE_INFO, 'mod_release_info', 50, 255, $obj->getVar('mod_release_info')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_RELEASE_FILE, 'mod_release_file', 50, 255, $obj->getVar('mod_release_file')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_MANUAL, 'mod_manual', 50, 255, $obj->getVar('mod_manual')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_MANUAL_FILE, 'mod_manual_file', 50, 255, $obj->getVar('mod_manual_file')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_DEMO_SITE_URL, 'mod_demo_site_url', 50, 255, $obj->getVar('mod_demo_site_url')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_DEMO_SITE_NAME, 'mod_demo_site_name', 50, 255, $obj->getVar('mod_demo_site_name')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_SUPPORT_URL, 'mod_support_url', 50, 255, $obj->getVar('mod_support_url')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_SUPPORT_NAME, 'mod_support_name', 50, 255, $obj->getVar('mod_support_name')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_WEBSITE_URL, 'mod_website_url', 50, 255, $obj->getVar('mod_website_url')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_WEBSITE_NAME, 'mod_website_name', 50, 255, $obj->getVar('mod_website_name')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_RELEASE, 'mod_release', 50, 255, $obj->getVar('mod_release')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_STATUS, 'mod_status', 50, 255, $obj->getVar('mod_status')));
+ //$this->insertBreak('<div class="center"><b>'.TDMCreateLocale::NOT_IMPORTANT.'</b></div>','head');
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_AUTHOR_MAIL, 'mod_author_mail', 50, 255, $obj->getVar('mod_author_mail')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_AUTHOR_WEBSITE_URL, 'mod_author_website_url', 50, 255, $obj->getVar('mod_author_website_url')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_AUTHOR_WEBSITE_NAME, 'mod_author_website_name', 50, 255, $obj->getVar('mod_author_website_name')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_CREDITS, 'mod_credits', 50, 255, $obj->getVar('mod_credits')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_RELEASE_INFO, 'mod_release_info', 50, 255, $obj->getVar('mod_release_info')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_RELEASE_FILE, 'mod_release_file', 50, 255, $obj->getVar('mod_release_file')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_MANUAL, 'mod_manual', 50, 255, $obj->getVar('mod_manual')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_MANUAL_FILE, 'mod_manual_file', 50, 255, $obj->getVar('mod_manual_file')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_DEMO_SITE_URL, 'mod_demo_site_url', 50, 255, $obj->getVar('mod_demo_site_url')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_DEMO_SITE_NAME, 'mod_demo_site_name', 50, 255, $obj->getVar('mod_demo_site_name')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_SUPPORT_URL, 'mod_support_url', 50, 255, $obj->getVar('mod_support_url')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_SUPPORT_NAME, 'mod_support_name', 50, 255, $obj->getVar('mod_support_name')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_WEBSITE_URL, 'mod_website_url', 50, 255, $obj->getVar('mod_website_url')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_WEBSITE_NAME, 'mod_website_name', 50, 255, $obj->getVar('mod_website_name')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_RELEASE, 'mod_release', 50, 255, $obj->getVar('mod_release')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_STATUS, 'mod_status', 50, 255, $obj->getVar('mod_status')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_PAYPAL_BUTTON, 'mod_paypal_button', 50, 255, $obj->getVar('mod_paypal_button')));
- $this->addElement(new XoopsFormText(TDMCreateLocale::C_SUBVERSION, 'mod_subversion', 50, 255, $obj->getVar('mod_subversion')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_PAYPAL_BUTTON, 'mod_paypal_button', 50, 255, $obj->getVar('mod_paypal_button')));
+ $tab2->addElement(new XoopsFormText(TDMCreateLocale::C_SUBVERSION, 'mod_subversion', 50, 255, $obj->getVar('mod_subversion')));
- if (!$obj->isNew()) {
+ /**
+ * Button submit
+ */
+ $button_tray = new XoopsFormElementTray('', '');
+ $button_tray->addElement(new XoopsFormHidden('op', 'save'));
+
+ $button_2 = new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit' );
+ $button_2->setClass('btn');
+ $button_tray->addElement($button_2);
+ $tab2->addElement($button_tray);
+ $tabtray->addElement($tab2);
+
+ if (!$obj->isNew()) {
$this->addElement(new XoopsFormHidden( 'id', $obj->getVar('mod_id') ) );
- }
- $this->addElement(new XoopsFormHidden('op', 'save' ) );
- $this->addElement(new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit' ) );
+ }
+
+ $this->addElement($tabtray);
}
}
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/import.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/import.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/import.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -23,6 +23,21 @@
class TDMCreateImport extends XoopsObject
{
+ /*
+ * @public regexp $search
+ */
+ public $search = array ( '/\/\*.*(\n)*.*(\*\/)?/', '/\s*--.*\n/', '/\s*#.*\n/' );
+
+ /*
+ * @public regexp $replace
+ */
+ public $replace = array ( "\n" );
+
+ /*
+ * @public regexp
+ */
+ public $regexp = '/((\s)*(CREATE TABLE)(\s)*([a-z_]+)(\s)*(\()(\s)*([a-z_]+)(\s)*([a-z]+)(\()([0-9]{1,4})(\))(\s)*([a-z]+)(\s)*(NOT NULL)(\s)*([a-z_]+)(\s)*(\w+))/';
+
/**
* Constructor
*/
@@ -47,12 +62,12 @@
* @param integer $_2
* @return array
*/
- public function getWord($regex, $text, $matches, $_1, $_2)
+ public function getWordMatched($regex, $text, $matches, $_1, $_2)
{
preg_match_all($regex, $text, $matches);
- if(count($matches[0]) > 0)
- array_push( $result, $matches[$_1][$_2] );
-
+ if(count($matches[0]) > 0) {
+ $result[] = $matches[$_1][$_2];
+ }
return $result;
}
@@ -82,8 +97,8 @@
public function getStrReplace($search, $replace, $text, $char = '')
{
$pos = strpos($text, $char);
- $result = str_replace($search, $replace, $text);
- return $result;
+ $res = str_replace($search, $replace, $text);
+ return $res;
}
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/en_US.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/en_US.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/en_US.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -158,25 +158,7 @@
const DISPLAY_USER = "Visible User";
const IMPORTANT = "Information";
- const NOT_IMPORTANT = "Optional Information";
-
- const L_ADMIN = "Admin";
- const L_USER = "User";
- const L_SUBMENU = "Submenu";
- const L_SEARCH = "Search";
- const L_COMMENTS = "Comments";
- const L_NOTIFICATIONS = "Notifications";
- const L_LIST = "List";
- const L_ID = "N&176; ID";
- const L_NAME = "Name";
- const L_TYPE = "Type";
- const L_VALUE = "Value";
- const L_ATTRIBUTES = "Attributes";
- const L_NOTNULL = "Not Null";
- const L_DEFAULT = "Default";
- const L_KEY = "Key";
- const L_ARGUMENTS = "Arguments";
- const L_EXTRA = "Extra fields";
+ const NOT_IMPORTANT = "Optional Information";
const E_NO_EXTENSIONS = "There are no extensions";
const E_NO_FIELDS = "There are no fields";
@@ -192,12 +174,8 @@
const FIELDS_NUMBER = "Number of fields";
- const S_SAVED = "Successfully saved";
- const S_DELETED = "Successfully deleted";
- const QF_ARE_YOU_SURE_TO_DELETE = "Are you sure you want to delete: <span class='red bold'>%s</span>?";
- const QF_ARE_YOU_SURE_TO_RENEW = "Are you sure you want to renew: <span class='red bold'>%s</span>?";
- const QC_ISEXTENSION = "Is an Extension?";
+
const F_FILES_PATH = "Files in %s ";
const F_EDIT = "Modification";
const F_DEL = "Clear";
@@ -220,6 +198,12 @@
const MODULE_FIELDS_NUMBER = "Fields Number";
const MODULE_BLOCKS = "Blocks";
+ const QF_ARE_YOU_SURE_TO_DELETE = "Are you sure you want to delete: <span class='red bold'>%s</span>?";
+ const QF_ARE_YOU_SURE_TO_RENEW = "Are you sure you want to renew: <span class='red bold'>%s</span>?";
+ const QC_ISEXTENSION = "Is an Extension?";
+
+ const S_SAVED = "Successfully saved";
+ const S_DELETED = "Successfully deleted";
const S_DELETED_SUCCESS = "Deleted Successfully";
const S_DATA_ENTERED = "Data entered successfull!";
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql 2013-03-17 10:48:02 UTC (rev 11243)
@@ -74,7 +74,9 @@
CREATE TABLE `tdmcreate_fields` (
`field_id` int (5) unsigned NOT NULL auto_increment,
+`field_mid` int (5) unsigned NOT NULL default '0',
`field_tid` int (5) unsigned NOT NULL default '0',
+`field_numb` int (10) unsigned NOT NULL default '0',
`field_name` varchar (255) NOT NULL default '',
`field_type` varchar (100) NOT NULL default '',
`field_value` char (4) NOT NULL default '',
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html 2013-03-17 10:48:02 UTC (rev 11243)
@@ -31,20 +31,20 @@
<td class='center'><img src='<{xoAppUrl uploads/tdmcreate/images/modules}>/<{$module.image}>' height='20px' title='<{$module.name}>' alt='<{$module.name}>' /></td>
<td class='center'><{$module.release}></td>
<td class='center'><{$module.status}></td>
- <td class='center'> </td>
- <td class='center'> </td>
- <td class='center'><img src='<{if $module.admin}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $module.user}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $module.submenu}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $module.search}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $module.comments}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $module.notifications}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
+ <td class='center'><img src='<{xoAppUrl modules/tdmcreate/icons/16/fields.png}>' /></td>
+ <td class='center'><img src='<{xoAppUrl modules/tdmcreate/icons/16/blocks.png}>' /></td>
+ <td class='center'><img src='<{if $module.admin}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $module.user}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $module.submenu}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $module.search}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $module.comments}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $module.notifications}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
<td class='xo-actions txtcenter width6'>
<a href='modules.php?op=edit&mod_id=<{$module.id}>' title='<{translate key="A_EDIT"}>'>
<img src='<{xoAdminIcons edit.png}>' alt='<{translate key="A_EDIT"}>' /></a>
@@ -58,25 +58,24 @@
<td class='center'><{$table.id}></td>
<td class='center'><{$table.name}></td>
<td class='center'><{$table.mid}></td> <!-- uploads/tdmcreate/images/tables -->
- <td class='center'><img src='<{xoAppUrl media/xoops/images/icons/32}>/<{$table.image}>' height='20px' title='<{$table.name}>' alt='<{$table.name}>' /></td>
+ <td class='center'><img src='<{xoAppUrl modules/tdmcreate/icons/32}>/<{$table.image}>' height='20px' title='<{$table.name}>' alt='<{$table.name}>' /></td>
<td class='center'> </td>
<td class='center'> </td>
<td class='center'><{$table.nbfields}></td>
- <td class='center'><img src='<{if $table.blocks}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $table.admin}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $table.user}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $table.submenu}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $table.search}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'><img src='<{if $table.comments}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' /></td>
- <td class='center'>
- <img src='<{if $table.notifications}><{xoAppUrl media/xoops/images/icons/16/green.gif}>
- <{else}><{xoAppUrl media/xoops/images/icons/16/red.gif}><{/if}>' />
+ <td class='center'><img src='<{if $table.blocks}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $table.admin}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $table.user}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $table.submenu}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $table.search}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $table.comments}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' /></td>
+ <td class='center'><img src='<{if $table.notifications}><{xoAppUrl modules/tdmcreate/icons/16/green.png}>
+ <{else}><{xoAppUrl modules/tdmcreate/icons/16/red.png}><{/if}>' />
</td>
<td class='xo-actions txtcenter width5'>
<a href='tables.php?op=edit&table_id=<{$table.id}>' title='<{translate key="A_EDIT"}>'>
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/xoops_version.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/xoops_version.php 2013-03-17 06:32:26 UTC (rev 11242)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/xoops_version.php 2013-03-17 10:48:02 UTC (rev 11243)
@@ -41,7 +41,7 @@
$modversion['module_website_url'] = 'http://www.xoops.org/';
$modversion['module_website_name'] = 'XOOPS';
$modversion['module_status'] = 'ALPHA';
-$modversion['min_php'] = '5.3';
+$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = '2.6.0';
$modversion['min_db'] = array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
// paypal
|
