Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13061] XoopsModules26/tdmcreate/branches/2.01/timgno /tdmcreate
|
From: <txm...@us...> - 2015-05-15 12:00:29
|
Revision: 13061
http://sourceforge.net/p/xoops/svn/13061
Author: txmodxoops
Date: 2015-05-15 12:00:25 +0000 (Fri, 15 May 2015)
Log Message:
-----------
Jquery ui tab fixed
Added and updated
Modified Paths:
--------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/css/styles.css
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/index.html
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/imports.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/helper.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/imports.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/docs/changelog.txt
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/common.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/install.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_building.tpl
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_fields.tpl
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_imports.tpl
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.tpl
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.tpl
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/xoops_version.php
Added Paths:
-----------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/css/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/arrow.gif
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/drag.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/left_right.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/spinner.gif
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/submenu.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/tables.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/toggle.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/default.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/js/functions.js
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/js/sortable.js
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/files/locales.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locales.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locales.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_extensions.tpl
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_fields_item.tpl
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_header.tpl
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_locales.tpl
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables_item.tpl
Removed Paths:
-------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/files/locale.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/import.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locale.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locale.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_locale.tpl
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2015-05-11 13:03:29 UTC (rev 13060)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -8,7 +8,7 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-
+use Xoops\Core\Request;
/**
* tdmcreate module
*
@@ -20,18 +20,23 @@
* @version $Id: building.php 10665 2012-12-27 10:14:15Z timgno $
*/
include __DIR__ . '/header.php';
+// Get $_POST, $_GET, $_REQUEST
+$op = Request::getCmd('op', 'default');
// header
$xoops->header('admin:tdmcreate/tdmcreate_building.tpl');
-
+//
$adminMenu->renderNavigation('building.php');
+//
switch ($op)
{
case 'default':
default:
+ $adminMenu->addTips(TDMCreateLocale::BUILDING_TIPS);
+ $adminMenu->renderTips();
$form = new XoopsSimpleForm(TDMCreateLocale::BUILDING_TITLE, 'building', 'building.php', 'post', true);
$mods_select = new XoopsFormSelect(TDMCreateLocale::BUILDING_MODULES, 'mod_name', 'mod_name');
- $mods_select->addOption(0, TDMCreateLocale::BUILDING_SELDEFMOD);
+ $mods_select->addOption(0, TDMCreateLocale::BUILDING_SELECT_DEFAULT);
$mods_select->addOptionArray($modulesHandler->getList());
$form->addElement($mods_select);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2015-05-11 13:03:29 UTC (rev 13060)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -8,6 +8,7 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
+use Xoops\Core\Request;
/**
* tdmcreate module
*
@@ -19,88 +20,72 @@
* @version $Id: fields.php 10665 2012-12-27 10:14:15Z timgno $
*/
include __DIR__ . '/header.php';
-/*
+// Requests $_POST, $_GET, $_REQUEST
+$op = Request::getCmd('op', 'list');
+$start = Request::getInt('start', 0);
+// Limit of pages
+$limit = $helper->getConfig('adminpager');
+// Get Requests
$fieldId = Request::getInt('field_id');
$fieldMid = Request::getInt('field_mid');
$fieldTid = Request::getInt('field_tid');
-$fieldNumb = Request::getInt('field_numb');
-$fieldName = Request::getString('field_name', '');*/
-
-// Get handler
+$fieldName = Request::getString('field_name', '');
+// Get header template
$xoops->header('admin:tdmcreate/tdmcreate_fields.tpl');
-
+//
$adminMenu->renderNavigation('fields.php');
+//
switch ($op)
{
case 'list':
- default:
- $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
- $adminMenu->renderButton();
- // Get modules list
- $criteria = new CriteriaCompo(new Criteria('table_mid', $fieldMid));
- $criteria->add(new Criteria('table_id', $fieldTid));
- $criteria->setSort('table_name');
- $criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $numRowsTables = $tablesHandler->getCount($criteria);
- $tablesArray = $tablesHandler->getAll($criteria);
- $xoops->tpl()->assign('tables_count', $numRowsTables);
- unset($criteria);
+ default:
+ $adminMenu->addTips(TDMCreateLocale::FIELD_TIPS);
+ $adminMenu->addItemButton(TDMCreateLocale::A_ADD_TABLE, 'tables.php?op=new', 'add');
+ $adminMenu->addItemButton(TDMCreateLocale::A_LIST_TABLES, 'tables.php', 'application-view-detail');
+ $adminMenu->addItemButton(TDMCreateLocale::A_LIST_FIELDS, 'fields.php', 'application-view-detail');
+ $adminMenu->renderTips();
+ $adminMenu->renderButton();
+ $xoops->theme()->addStylesheet('modules/tdmcreate/assets/css/styles.css');
+ $xoops->theme()->addScript('modules/tdmcreate/assets/js/functions.js');
+ $xoops->theme()->addScript('modules/tdmcreate/assets/js/sortable.js');
+ $xoops->tpl()->assign('modPathIcon16', TDMC_ROOT_PATH . '/assets/icones/16');
+ $numbRowsTables = $tablesHandler->getCountTables();
+ if ($numbRowsTables == 0) {
+ $xoops->redirect('tables.php?op=new', 2, TDMCreateLocale::E_NO_TABLES );
+ }
+ // Get modules list
+ $tablesArray = $tablesHandler->getAllTablesByModuleId($tablesHandler->getVar('table_mid'), $start, $limit);
+ $xoops->tpl()->assign('tables_count', $numbRowsTables);
// Redirect if there aren't modules
- if ( $numRowsTables == 0 ) {
+ if ( $numbRowsTables == 0 ) {
$xoops->redirect('tables.php?op=new', 2, TDMCreateLocale::E_NO_TABLES );
}
// Assign Template variables
- $xoops->tpl()->assign('fields_list', true);
- $xoops->tpl()->assign('fields_count', $numRowsFields);
- if ($numRowsTables > 0) {
- foreach (array_keys($tablesArray) as $i) {
- $tables['id'] = $tablesArray[$i]->getVar('table_id');
- $tables['name'] = $tablesArray[$i]->getVar('table_name');
- $module_name = $modules_Handler->get($tablesArray[$i]->getVar('table_mid'));
- $tables['mid'] = $module_name->getVar('mod_name');
- $tables['image'] = $tablesArray[$i]->getVar('table_image');
- $tables['nbfields'] = $tablesArray[$i]->getVar('table_nbfields');
- $tables['blocks'] = $tablesArray[$i]->getVar('table_blocks');
- $tables['admin'] = $tablesArray[$i]->getVar('table_admin');
- $tables['user'] = $tablesArray[$i]->getVar('table_user');
- $tables['submenu'] = $tablesArray[$i]->getVar('table_submenu');
- $tables['search'] = $tablesArray[$i]->getVar('table_search');
- $tables['comments'] = $tablesArray[$i]->getVar('table_comments');
- $tables['notifications'] = $tablesArray[$i]->getVar('table_notifications');
- $xoops->tpl()->append_by_ref('tables', $tables);
- unset($tables);
- }
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_tid', $fieldTid));
- $criteria->setSort('field_id');
- $criteria->setOrder('ASC');
- $numRowsFields = $fieldsHandler->getCount($criteria);
- $fieldsArray = $fieldsHandler->getAll($criteria);
- unset($criteria);
- if ($numRowsFields > 0) {
- foreach (array_keys($fieldsArray) as $i) {
- $field['id'] = $fieldsArray[$i]->getVar('field_id');
- $table_name = $tablesHandler->get($fieldsArray[$i]->getVar('field_tid'));
- $field['tid'] = $table_name->getVar('table_name');
- $field['name'] = $fieldsArray[$i]->getVar('field_name');
- $field['type'] = $fieldsArray[$i]->getVar('field_type');
- $field['value'] = $fieldsArray[$i]->getVar('field_value');
- $field['blocks'] = $fieldsArray[$i]->getVar('field_blocks');
- $field['attribute'] = $fieldsArray[$i]->getVar('field_attribute');
- $field['default'] = $fieldsArray[$i]->getVar('field_default');
- $field['key'] = $fieldsArray[$i]->getVar('field_key');
- $field['blocks'] = $fieldsArray[$i]->getVar('field_blocks');
- $field['search'] = $fieldsArray[$i]->getVar('field_search');
- $field['required'] = $fieldsArray[$i]->getVar('field_required');
- $xoops->tpl()->append_by_ref('fields', $field);
- unset($field);
- }
+ if ($numbRowsTables > 0) {
+ foreach (array_keys($tablesArray) as $t) {
+ $table = $tablesArray[$t]->getValues();
+ $numRowsFields = $fieldsHandler->getCountFields($fieldMid, $t);
+ $fieldsArray = $fieldsHandler->getAllFieldsByTableId($fieldMid, $t);
+ $xoops->tpl()->assign('fields_count', $numRowsFields);
+ $fields = array();
+ if ($numRowsFields > 0) {
+ $lid = 1;
+ foreach (array_keys($fieldsArray) as $f) {
+ $field = $fieldsArray[$f]->getValues();
+ $alid = array('lid' => $lid);
+ $fields[] = array_merge($field, $alid);
+ unset($field);
+ ++$lid;
+ }
+ unset($lid);
+ }
+ $table['fields'] = $fields;
+ $xoops->tpl()->appendByRef('tables', $table);
+ unset($table);
}
// Display Page Navigation
- if ($numRowsTables > $limit) {
- $nav = new XoopsPageNav($numRowsTables, $limit, $start, 'start');
+ if ($numbRowsTables > $limit) {
+ $nav = new XoopsPageNav($numbRowsTables, $limit, $start, 'start');
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
@@ -109,68 +94,102 @@
break;
case 'new':
- $adminMenu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail');
- $adminMenu->renderButton();
+ $adminMenu->addItemButton(TDMCreateLocale::A_LIST_FIELDS, 'fields.php', 'application-view-detail');
+ $adminMenu->renderButton();
- $obj = $fieldsHandler->create();
- $form = $xoops->getModuleForm($obj, 'fields');
+ $fieldsObj = $fieldsHandler->create();
+ $form = $xoops->getModuleForm($fieldsObj, 'fields');
$xoops->tpl()->assign('form', $form->render());
break;
case 'save':
if (!$xoops->security()->check()) {
$xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors()));
- }
- if ($fieldId) {
- $obj = $fieldsHandler->get($fieldId);
- } else {
- $obj = $fieldsHandler->create();
- }
+ }
+ $fieldOrder = 0;
//Form fields
- $obj->setVars(array('field_mid' => $fieldMid, 'field_tid' => $fieldTid, 'field_name' => $fieldName,
- 'field_numb' => $fieldNumb, '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')));
- // Save data
- if ($fieldsHandler->insert($obj)) {
- $xoops->redirect('fields.php', 2, TDMCreateLocale::FORMOK);
- }
-
- $xoops->error($obj->getHtmlErrors());
+ foreach($_POST['field_id'] as $key => $value)
+ {
+ if(isset($value)){
+ $fieldsObj =& $fields->get($value);
+ } else {
+ $fieldsObj =& $fields->create();
+ }
+ $order = $fieldsObj->isNew() ? $fieldOrder++ : Request::getInt('field_order');
+ // Set Data
+ $fieldsObj->setVar( 'field_mid', $fieldMid );
+ $fieldsObj->setVar( 'field_tid', $fieldTid );
+ $fieldsObj->setVar( 'field_order', $order );
+ $fieldsObj->setVar( 'field_name', $_POST['field_name'][$key]);
+ $fieldsObj->setVar( 'field_type', $_POST['field_type'][$key]);
+ $fieldsObj->setVar( 'field_value', $_POST['field_value'][$key]);
+ $fieldsObj->setVar( 'field_attribute', $_POST['field_attribute'][$key]);
+ $fieldsObj->setVar( 'field_null', $_POST['field_null'][$key]);
+ $fieldsObj->setVar( 'field_default', $_POST['field_default'][$key]);
+ $fieldsObj->setVar( 'field_key', $_POST['field_key'][$key]);
+ $fieldsObj->setVar( 'field_element', $_POST['field_element'][$key]);
+ $fieldsObj->setVar( 'field_parent', (1 == $_REQUEST['field_parent'][$key]) ? 1 : 0);
+ $fieldsObj->setVar( 'field_inlist', (1 == $_REQUEST['field_inlist'][$key]) ? 1 : 0);
+ $fieldsObj->setVar( 'field_inform', (1 == $_REQUEST['field_inform'][$key]) ? 1 : 0);
+ $fieldsObj->setVar( 'field_admin', (1 == $_REQUEST['field_admin'][$key]) ? 1 : 0);
+ $fieldsObj->setVar( 'field_user', (1 == $_REQUEST['field_user'][$key]) ? 1 : 0);
+ $fieldsObj->setVar( 'field_block', (1 == $_REQUEST['field_block'][$key]) ? 1 : 0);
+ $fieldsObj->setVar( 'field_main', ($key == $_REQUEST['field_main'] ? 1 : 0));
+ $fieldsObj->setVar( 'field_search', (1 == $_REQUEST['field_search'][$key]) ? 1 : 0);
+ $fieldsObj->setVar( 'field_required', (1 == $_REQUEST['field_required'][$key]) ? 1 : 0);
+ // Insert Data
+ $fieldsHandler->insert($fieldsObj);
+ }
+ unset($fieldOrder);
+ // Get table name from field table id
+ $tables =& $tablesHandler->get($fieldTid);
+ $tableName = $tables->getVar('table_name');
+ // Set field elements
+ if ($fieldsObj->isNew()) {
+ // Fields Elements Handler
+ $fieldelementsHandler = $helper->getFieldElementsHandler();
+ $fieldelementObj =& $fieldelementsHandler->create();
+ $fieldelementObj->setVar( 'fieldelement_mid', $fieldMid );
+ $fieldelementObj->setVar( 'fieldelement_tid', $fieldTid );
+ $fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($tableName) );
+ $fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($tableName) );
+ // Insert new field element id for table name
+ if (!$fieldelementsHandler->insert($fieldelementObj) ) {
+ $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element');
+ }
+ $xoops->redirect('fields.php', 2, sprintf(XoopsLocale::S_DATABASE_SAVED, $tableName));
+ } else {
+ // Needed code from table name by field_tid
+ $xoops->redirect('fields.php', 2, sprintf(XoopsLocale::S_DATABASE_UPDATED, $tableName));
+ }
+ $xoops->error($fieldsObj->getHtmlErrors());
break;
case 'edit':
- $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
- $adminMenu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail');
+ $adminMenu->addItemButton(TDMCreateLocale::A_ADD_TABLE, 'tables.php?op=new', 'add');
+ $adminMenu->addItemButton(TDMCreateLocale::A_LIST_TABLES, 'tables.php', 'application-view-detail');
+ $adminMenu->addItemButton(TDMCreateLocale::A_LIST_FIELDS, 'fields.php', 'application-view-detail');
$adminMenu->renderButton();
- $obj = $fieldsHandler->get($fieldTid);
- $form = $xoops->getModuleForm($obj, 'fields');
+ $fieldsObj = $fieldsHandler->get($fieldTid);
+ $form = $xoops->getModuleForm($fieldsObj, 'fields');
$xoops->tpl()->assign('form', $form->render());
break;
case 'delete':
if ($fieldId > 0) {
- $obj = $fieldsHandler->get($fieldId);
+ $fieldsObj = $fieldsHandler->get($fieldId);
if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
$xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors()));
}
- if ($fieldsHandler->delete($obj)) {
+ if ($fieldsHandler->delete($fieldsObj)) {
$xoops->redirect('fields.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::TABLE));
} else {
- $xoops->error($obj->getHtmlErrors());
+ $xoops->error($fieldsObj->getHtmlErrors());
}
} else {
- $xoops->confirm(array('ok' => 1, 'id' => $fieldId, 'op' => 'delete'), 'fields.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('field_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $fieldId, 'op' => 'delete'), 'fields.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $fieldsObj->getVar('field_name')) . '<br />');
}
} else {
$xoops->redirect('fields.php', 1, TDMCreateLocale::E_DATABASE_ERROR);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2015-05-11 13:03:29 UTC (rev 13060)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -8,7 +8,6 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-use Xoops\Core\Request;
/**
* tdmcreate module
*
@@ -31,15 +30,10 @@
XoopsLoad::loadFile($xoops->path(dirname(__DIR__) . '/include/functions.php'));
// Get handler
$modulesHandler = $helper->getModulesHandler();
-$tablesHandler = $helper->getTablesHandler();
-$fieldsHandler = $helper->getFieldsHandler();
-$localeHandler = $helper->getLocalesHandler();
-$importHandler = $helper->getImportsHandler();
-// Get $_POST, $_GET, $_REQUEST
-$op = Request::getCmd('op');
-$start = Request::getInt('start', 0);
-// Parameters
-$limit = $helper->getConfig('adminpager');
+$tablesHandler = $helper->getTablesHandler();
+$fieldsHandler = $helper->getFieldsHandler();
+$localesHandler = $helper->getLocalesHandler();
+$importsHandler = $helper->getImportsHandler();
// Add Script
$xoops->theme()->addScript('media/xoops/xoops.js');
$xoops->theme()->addScript('modules/system/js/admin.js');
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php 2015-05-11 13:03:29 UTC (rev 13060)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -8,6 +8,7 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
+use Xoops\Core\Request;
/**
* tdmcreate module
*
@@ -19,46 +20,44 @@
* @version $Id$
*/
include __DIR__ . '/header.php';
+// Get $_POST, $_GET, $_REQUEST
+$op = Request::getCmd('op', 'list');
+$start = Request::getInt('start', 0);
+// Parameters
+$limit = $helper->getConfig('adminpager');
// heaser
$xoops->header('admin:tdmcreate/tdmcreate_imports.tpl');
//
-//$importId = Request::getInt('import_id', 0);
+$importId = Request::getInt('import_id');
//
$adminMenu->renderNavigation('imports.php');
//
switch ($op)
{
- case 'list':
- $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'imports.php?op=new', 'add');
+ case 'list':
+ $adminMenu->addTips(TDMCreateLocale::IMPORT_TIPS);
+ $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'imports.php?op=new', 'add');
+ $adminMenu->renderTips();
$adminMenu->renderButton();
// Get modules list
- $criteria = new CriteriaCompo();
- $criteria->setSort('import_name');
- $criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $numImports = $importHandler->getCount($criteria);
- $importArr = $importHandler->getAll($criteria);
+ $numbRowsImports = $importsHandler->getCountImports();
+ $importArray = $importsHandler->getAllImports($start, $limit);
// Assign Template variables
- $xoops->tpl()->assign('imports_count', $numImports);
+ $xoops->tpl()->assign('imports_count', $numbRowsImports);
unset($criteria);
- if ($numImports > 0) {
- foreach (array_keys($importArr) as $i) {
- $import['id'] = $importArr[$i]->getVar('import_id');
- $import['mid'] = $importArr[$i]->getVar('import_mid');
- $import['name'] = $importArr[$i]->getVar('import_name');
- $import['nbtables'] = $importArr[$i]->getVar('import_nbtables');
- $import['nbfields'] = $importArr[$i]->getVar('import_nbfields');
- $xoops->tpl()->append_by_ref('imports', $import);
+ if ($numbRowsImports > 0) {
+ foreach (array_keys($importArray) as $i) {
+ $import = $importsHandler[$i]->getValues();
+ $xoops->tpl()->appendByRef('imports', $import);
unset($import);
}
- // Display Page Navigation
- if ($numrows > $limit) {
- $nav = new XoopsPageNav($numrows, $limit, $start, 'start');
+ // Display Imports Navigation
+ if ($numbRowsImports > $limit) {
+ $nav = new XoopsPageNav($numbRowsImports, $limit, $start, 'start');
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
- $xoops->tpl()->assign('error_message', TDMCreateLocale::IMPORT_ERROR_NOIMPORTS);
+ $xoops->tpl()->assign('error_message', TDMCreateLocale::E_NO_IMPORTS);
}
break;
@@ -66,8 +65,8 @@
$adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'imports.php', 'application-view-detail');
$adminMenu->renderButton();
- $obj = $importHandler->create();
- $form = $xoops->getModuleForm($obj, 'import');
+ $importsObj = $importsHandler->create();
+ $form = $xoops->getModuleForm($importsObj, 'imports');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -77,26 +76,26 @@
}
if ($importId > 0) {
- $obj = $importHandler->get($importId);
+ $importsObj = $importsHandler->get($importId);
//Form imported edited save
- $obj->setVar('import_mid', $_POST['import_mid']);
- $obj->setVar('import_name', $_POST['import_name']);
- $obj->setVar('import_nbtables', $_POST['import_nbtables']);
- $obj->setVar('import_tablename', $_POST['import_mid']);
- $obj->setVar('import_nbfields', $_POST['import_nbfields']);
- $obj->setVar('import_fieldelements', $_POST['import_fieldelements']);
+ $importsObj->setVar('import_mid', $_POST['import_mid']);
+ $importsObj->setVar('import_name', $_POST['import_name']);
+ $importsObj->setVar('import_nbtables', $_POST['import_nbtables']);
+ $importsObj->setVar('import_tablename', $_POST['import_mid']);
+ $importsObj->setVar('import_nbfields', $_POST['import_nbfields']);
+ $importsObj->setVar('import_fieldelements', $_POST['import_fieldelements']);
} else {
- $obj = $importHandler->create();
+ $importsObj = $importsHandler->create();
//Form imported save
- $obj->setVar('import_name', $_POST['import_name']);
- $obj->setVar('import_mid', $_POST['import_mid']);
+ $importsObj->setVar('import_name', $_POST['import_name']);
+ $importsObj->setVar('import_mid', $_POST['import_mid']);
$files = $_FILES['importfile'];
// If incoming data have been entered correctly
if($_POST['upload'] == XoopsLocale::A_SUBMIT && isset($files['tmp_name']) && (substr($files['name'], -4) == '.sql'))
{
// File recovery
- $dir = TDMC_UPLOAD_PATH_FILES;
- $file = $_FILES['importfile'];
+ $dir = TDMC_UPLOAD_PATH_FILES;
+ $file = $_FILES['importfile'];
$tmpName = $file['tmp_name'];
// Copy files to the server
if (is_uploaded_file($tmpName)) {
@@ -145,15 +144,15 @@
$t = 0;
foreach(array_keys($resultTable) as $table)
{
- $obj->setVar('import_tablename', $resultTable[$table]); //$_POST['import_tablename']
- $obj->setVar('import_nbtables', $t); $t++; //$_POST['import_nbtables']
+ $importsObj->setVar('import_tablename', $resultTable[$table]); //$_POST['import_tablename']
+ $importsObj->setVar('import_nbtables', $t); $t++; //$_POST['import_nbtables']
if(strlen($resultTable[0]) > 0)
{
$f = 0;
foreach(array_keys($resultFields) as $field)
{
- $obj->setVar('import_nbfields', $f); $f++; // $_POST['import_nbfields']
- $obj->setVar('import_fieldelements', $_POST['import_fieldelements']);
+ $importsObj->setVar('import_nbfields', $f); $f++; // $_POST['import_nbfields']
+ $importsObj->setVar('import_fieldelements', $_POST['import_fieldelements']);
}
unset($f);
}
@@ -170,12 +169,12 @@
}
}
- if ($importHandler->insert($obj)) {
+ if ($importsHandler->insert($importsObj)) {
$xoops->redirect('imports.php', 3, TDMCreateLocale::FORM_OK);
}
- $xoops->error($obj->getHtmlErrors());
- $form = $xoops->getModuleForm($obj, 'import');
+ $xoops->error($importsObj->getHtmlErrors());
+ $form = $xoops->getModuleForm($importsObj, 'import');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -184,25 +183,25 @@
$adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'imports.php', 'application-view-detail');
$adminMenu->renderButton();
- $obj = $importHandler->get($importId);
- $form = $xoops->getModuleForm($obj, 'import');
+ $importsObj = $importsHandler->get($importId);
+ $form = $xoops->getModuleForm($importsObj, 'import');
$xoops->tpl()->assign('form', $form->render());
break;
case 'delete':
if ($importId > 0) {
- $obj = $importHandler->get($importId);
+ $importsObj = $importsHandler->get($importId);
if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
$xoops->redirect('imports.php', 3, implode(',', $xoops->security()->getErrors()));
}
- if ($importHandler->delete($obj)) {
+ if ($importsHandler->delete($importsObj)) {
$xoops->redirect('imports.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT));
} else {
- $xoops->error($obj->getHtmlErrors());
+ $xoops->error($importsObj->getHtmlErrors());
}
} else {
- $xoops->confirm(array('ok' => 1, 'id' => $importId, 'op' => 'delete'), 'imports.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('import_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $importId, 'op' => 'delete'), 'imports.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $importsObj->getVar('import_name')) . '<br />');
}
} else {
$xoops->redirect('imports.php', 1, TDMCreateLocale::E_DATABASE_ERROR);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2015-05-11 13:03:29 UTC (rev 13060)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -41,12 +41,12 @@
// tdmcreate modules
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('loc_mid', 0, '!='));
-$locale = $localeHandler->getCount($criteria);
+$locale = $localesHandler->getCount($criteria);
unset($criteria);
// tdmcreate import
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('import_id', 0, '!='));
-$import = $importHandler->getCount($criteria);
+$import = $importsHandler->getCount($criteria);
unset($criteria);
$r = "red"; $g = "green";
$modulesColor = $modules == 0 ? $r : $g;
@@ -66,17 +66,21 @@
// folder path
$folderPath = array(
- XOOPS_UPLOAD_PATH . '/tdmcreate/',
- XOOPS_UPLOAD_PATH . '/tdmcreate/files',
- XOOPS_UPLOAD_PATH . '/tdmcreate/repository',
- XOOPS_UPLOAD_PATH . '/tdmcreate/images',
- XOOPS_UPLOAD_PATH . '/tdmcreate/images/modules',
- XOOPS_UPLOAD_PATH . '/tdmcreate/images/tables'
-);
+ TDMC_UPLOAD_PATH,
+ TDMC_UPLOAD_FILES_PATH,
+ TDMC_UPLOAD_REPOSITORY_PATH,
+ TDMC_UPLOAD_REPOSITORY_EXTENSIONS_PATH,
+ TDMC_UPLOAD_REPOSITORY_MODULES_PATH,
+ TDMC_UPLOAD_IMAGES_PATH,
+ TDMC_UPLOAD_IMAGES_EXTENSIONS_PATH,
+ TDMC_UPLOAD_IMAGES_MODULES_PATH,
+ TDMC_UPLOAD_IMAGES_TABLES_PATH
+ );
foreach ($folderPath as $folder) {
$adminMenu->addConfigBoxLine($folder, 'folder');
$adminMenu->addConfigBoxLine(array($folder, '777'), 'chmod');
}
+$adminMenu->addConfigBoxLine('thumbnail', 'service');
// extension
$extensions = array('xtranslator' => 'extension');
Deleted: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php 2015-05-11 13:03:29 UTC (rev 13060)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -1,128 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-/**
- * tdmcreate module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package tdmcreate
- * @since 2.6.0
- * @author XOOPS Development Team
- * @version $Id$
- */
-include __DIR__ . '/header.php';
-// heaser
-$xoops->header('admin:tdmcreate/tdmcreate_locale.tpl');
-//
-//$localeId = Request::getInt('import_id', 0);
-//
-$adminMenu->renderNavigation('locale.php');
-//
-switch ($op)
-{
- case 'list':
- $adminMenu->addItemButton(TDMCreateLocale::ADD_LOCALE, 'locale.php?op=new', 'add');
- $adminMenu->renderButton();
- // Get modules list
- $criteria = new CriteriaCompo();
- $criteria->setSort('loc_id');
- $criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $numLocale = $localeHandler->getCount($criteria);
- $localeArr = $localeHandler->getAll($criteria);
- // Assign Template variables
- $xoops->tpl()->assign('locale_count', $numLocale);
- unset($criteria);
- if ($numLocale > 0) {
- foreach (array_keys($localeArr) as $i) {
- $locale['id'] = $localeArr[$i]->getVar('loc_id');
- $locale['mid'] = $localeArr[$i]->getVar('loc_mid');
- $locale['name'] = $localeArr[$i]->getVar('loc_file');
- $locale['define'] = $localeArr[$i]->getVar('loc_define');
- $locale['description'] = $localeArr[$i]->getVar('loc_description');
- $xoops->tpl()->append_by_ref('locale', $locale);
- unset($locale);
- }
- // Display Page Navigation
- if ($numrows > $limit) {
- $nav = new XoopsPageNav($numrows, $limit, $start, 'start');
- $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
- }
- } else {
- $xoops->tpl()->assign('error_message', TDMCreateLocale::IMPORT_ERROR_NOLOCALE);
- }
- break;
-
- case 'new':
- $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locale.php', 'application-view-detail');
- $adminMenu->renderButton();
-
- $obj = $localeHandler->create();
- $form = $xoops->getModuleForm($obj, 'locale');
- $xoops->tpl()->assign('form', $form->render());
- break;
-
- case 'save':
- if (!$xoops->security()->check()) {
- $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
- }
-
- if ($localeId > 0) {
- $obj = $localeHandler->get($localeId);
- //Form imported edited save
- $obj->setVar('loc_mid', Request::getInt('loc_mid'));
- $obj->setVar('loc_file', Request::getString('loc_file'));
- $obj->setVar('loc_define', Request::getString('loc_define'));
- $obj->setVar('loc_description', Request::getString('loc_description'));
- $xoops->redirect('locale.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED);
- }
- if ($localeHandler->insert($obj)) {
- $xoops->redirect('locale.php', 3, TDMCreateLocale::FORM_OK);
- }
-
- $xoops->error($obj->getHtmlErrors());
- $form = $xoops->getModuleForm($obj, 'locale');
- $xoops->tpl()->assign('form', $form->render());
- break;
-
- case 'edit':
- $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'locale.php?op=import', 'add');
- $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locale.php', 'application-view-detail');
- $adminMenu->renderButton();
-
- $obj = $localeHandler->get($localeId);
- $form = $xoops->getModuleForm($obj, 'locale');
- $xoops->tpl()->assign('form', $form->render());
- break;
-
- case 'delete':
- if ($localeId > 0) {
- $obj = $localeHandler->get($localeId);
- if (isset($_POST['ok']) && $_POST['ok'] == 1) {
- if (!$xoops->security()->check()) {
- $xoops->redirect('locale.php', 3, implode(',', $xoops->security()->getErrors()));
- }
- if ($localeHandler->delete($obj)) {
- $xoops->redirect('locale.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT));
- } else {
- $xoops->error($obj->getHtmlErrors());
- }
- } else {
- $xoops->confirm(array('ok' => 1, 'id' => $localeId, 'op' => 'delete'), 'locale.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('loc_file')) . '<br />');
- }
- } else {
- $xoops->redirect('locale.php', 1, TDMCreateLocale::E_DATABASE_ERROR);
- }
- break;
-}
-
-include __DIR__ . '/footer.php';
\ No newline at end of file
Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php (rev 0)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -0,0 +1,127 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+use Xoops\Core\Request;
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.6.0
+ * @author XOOPS Development Team
+ * @version $Id$
+ */
+include __DIR__ . '/header.php';
+// Get $_POST, $_GET, $_REQUEST
+$op = Request::getCmd('op', 'list');
+$start = Request::getInt('start', 0);
+// Parameters
+$limit = $helper->getConfig('adminpager');
+// heaser
+$xoops->header('admin:tdmcreate/tdmcreate_locales.tpl');
+//
+$localeId = Request::getInt('loc_id', 0);
+//
+$adminMenu->renderNavigation('locale.php');
+//
+switch ($op)
+{
+ case 'list':
+ $adminMenu->addTips(TDMCreateLocale::LOCALE_TIPS);
+ $adminMenu->addItemButton(TDMCreateLocale::A_ADD_LOCALE, 'locales.php?op=new', 'add');
+ $adminMenu->renderTips();
+ $adminMenu->renderButton();
+ //
+ $numbRowsLocales = $localesHandler->getCountLocales();
+ $localesArray = $localesHandler->getAllLocales($start, $limit);
+ // Assign Template variables
+ $xoops->tpl()->assign('locale_count', $numbRowsLocales);
+ unset($criteria);
+ if ($numbRowsLocales > 0) {
+ foreach (array_keys($localesArray) as $i) {
+ $locale = $localesHandler->getVars();
+ $xoops->tpl()->appendByRef('locales', $locale);
+ unset($locale);
+ }
+ // Display Page Navigation
+ if ($numbRowsLocales > $limit) {
+ $nav = new XoopsPageNav($numbRowsLocales, $limit, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
+ } else {
+ $xoops->tpl()->assign('error_message', TDMCreateLocale::E_NO_LOCALES);
+ }
+ break;
+
+ case 'new':
+ $adminMenu->addItemButton(TDMCreateLocale::A_LIST_LOCALE, 'locales.php', 'application-view-detail');
+ $adminMenu->renderButton();
+
+ $localesObj = $localesHandler->create();
+ $form = $xoops->getModuleForm($localesObj, 'locales');
+ $xoops->tpl()->assign('form', $form->render());
+ break;
+
+ case 'save':
+ if (!$xoops->security()->check()) {
+ $xoops->redirect('locales.php', 3, implode(',', $xoops->security()->getErrors()));
+ }
+
+ if ($localeId > 0) {
+ $localesObj = $localesHandler->get($localeId);
+ //Form imported edited save
+ $localesObj->setVar('loc_mid', Request::getInt('loc_mid'));
+ $localesObj->setVar('loc_file', Request::getString('loc_file'));
+ $localesObj->setVar('loc_define', Request::getString('loc_define'));
+ $localesObj->setVar('loc_description', Request::getString('loc_description'));
+ $xoops->redirect('locales.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED);
+ }
+ if ($localesHandler->insert($localesObj)) {
+ $xoops->redirect('locales.php', 3, TDMCreateLocale::FORM_OK);
+ }
+
+ $xoops->error($localesObj->getHtmlErrors());
+ $form = $xoops->getModuleForm($localesObj, 'locales');
+ $xoops->tpl()->assign('form', $form->render());
+ break;
+
+ case 'edit':
+ $adminMenu->addItemButton(TDMCreateLocale::A_ADD_LOCALE, 'locales.php?op=new', 'add');
+ $adminMenu->addItemButton(TDMCreateLocale::A_LIST_LOCALE, 'locales.php', 'application-view-detail');
+ $adminMenu->renderButton();
+
+ $localesObj = $localesHandler->get($localeId);
+ $form = $xoops->getModuleForm($localesObj, 'locales');
+ $xoops->tpl()->assign('form', $form->render());
+ break;
+
+ case 'delete':
+ if ($localeId > 0) {
+ $localesObj = $localesHandler->get($localeId);
+ if (isset($_POST['ok']) && $_POST['ok'] == 1) {
+ if (!$xoops->security()->check()) {
+ $xoops->redirect('locales.php', 3, implode(',', $xoops->security()->getErrors()));
+ }
+ if ($localesHandler->delete($localesObj)) {
+ $xoops->redirect('locales.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT));
+ } else {
+ $xoops->error($localesObj->getHtmlErrors());
+ }
+ } else {
+ $xoops->confirm(array('ok' => 1, 'id' => $localeId, 'op' => 'delete'), 'locales.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $localesObj->getVar('loc_file')) . '<br />');
+ }
+ } else {
+ $xoops->redirect('locales.php', 1, TDMCreateLocale::E_DATABASE_ERROR);
+ }
+ break;
+}
+
+include __DIR__ . '/footer.php';
\ No newline at end of file
Property changes on: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2015-05-11 13:03:29 UTC (rev 13060)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -37,7 +37,7 @@
$adminmenu[$i]['icon'] = 'editfields.png';
$i++;
$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU5;
-$adminmenu[$i]['link'] = 'admin/locale.php';
+$adminmenu[$i]['link'] = 'admin/locales.php';
$adminmenu[$i]['icon'] = 'languages.png';
$i++;
$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU6;
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2015-05-11 13:03:29 UTC (rev 13060)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -8,6 +8,7 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
+use Xoops\Core\Request;
/**
* tdmcreate module
*
@@ -19,8 +20,13 @@
* @version $Id: modules.php 10665 2012-12-27 10:14:15Z timgno $
*/
include __DIR__ . '/header.php';
+// Get $_POST, $_GET, $_REQUEST
+$op = Request::getCmd('op', 'list');
+$start = Request::getInt('start', 0);
+// Parameters
+$limit = $helper->getConfig('adminpager');
// Get Action type
-//$modId = Request::getInt('mod_id');
+$modId = Request::getInt('mod_id');
// Get handler
$xoops->header('admin:tdmcreate/tdmcreate_modules.tpl');
$adminMenu->renderNavigation('modules.php');
@@ -28,39 +34,31 @@
{
case 'list':
default:
- $adminMenu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add');
+ $adminMenu->addTips(TDMCreateLocale::MODULE_TIPS);
+ $adminMenu->addItemButton(TDMCreateLocale::A_ADD_MODULE, 'modules.php?op=new', 'add');
+ $adminMenu->renderTips();
$adminMenu->renderButton();
+ $xoops->theme()->addStylesheet('modules/tdmcreate/assets/css/styles.css');
+ $xoops->theme()->addScript('modules/tdmcreate/assets/js/functions.js');
// Get modules list
- $criteria = new CriteriaCompo();
- $criteria->setSort('mod_name');
- $criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $numRowsMods = $modulesHandler->getCount($criteria);
- $modulesArray = $modulesHandler->getAll($criteria);
+ $numbRowsMods = $modulesHandler->getCountModules();
+ $modulesArray = $modulesHandler->getAllModules($start, $limit);
+ // Redirect if there aren't modules
+ if ( $numbRowsMods == 0 ) {
+ $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOT_MODULES );
+ }
// Assign Template variables
- $xoops->tpl()->assign('modules_count', $numRowsMods);
- unset($criteria);
- if ($numRowsMods > 0) {
+ $xoops->tpl()->assign('modules_count', $numbRowsMods);
+ $xoops->tpl()->assign('modPathIcon16', TDMC_URL . '/assets/icons/16');
+ if ($numbRowsMods > 0) {
foreach (array_keys($modulesArray) as $i) {
- $mod['id'] = $modulesArray[$i]->getVar('mod_id');
- $mod['name'] = $modulesArray[$i]->getVar('mod_name');
- $mod['version'] = $modulesArray[$i]->getVar('mod_version');
- $mod['image'] = $modulesArray[$i]->getVar('mod_image');
- $mod['release'] = $modulesArray[$i]->getVar('mod_release');
- $mod['status'] = $modulesArray[$i]->getVar('mod_status');
- $mod['admin'] = $modulesArray[$i]->getVar('mod_admin');
- $mod['user'] = $modulesArray[$i]->getVar('mod_user');
- $mod['submenu'] = $modulesArray[$i]->getVar('mod_submenu');
- $mod['search'] = $modulesArray[$i]->getVar('mod_search');
- $mod['comments'] = $modulesArray[$i]->getVar('mod_comments');
- $mod['notifications'] = $modulesArray[$i]->getVar('mod_notifications');
- $xoops->tpl()->append_by_ref('modules', $mod);
- unset($mod);
+ $module = $modulesArray[$i]->getValues();
+ $xoops->tpl()->appendByRef('modules', $module);
+ unset($module);
}
// Display Page Navigation
- if ($numRowsMods > $limit) {
- $nav = new XoopsPageNav($numRowsMods, $limit, $start, 'start');
+ if ($numbRowsMods > $limit) {
+ $nav = new XoopsPageNav($numbRowsMods, $limit, $start, 'start');
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
@@ -80,33 +78,32 @@
case 'save':
if (!$xoops->security()->check()) {
$xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
- }
- $modId = Request::getInt('mod_id', 0);
+ }
if ($modId > 0) {
$modulesObj = $modulesHandler->get($modId);
} else {
$modulesObj = $modulesHandler->create();
}
//Form module save
- $modulesObj->setVars(array('mod_name' => Request::getString('mod_name', ''),
- 'mod_isextension' => Request::getInt('mod_isextension', 0),
- 'mod_version' => Request::getString('mod_version', ''),
- 'mod_description' => Request::getString('mod_description', ''),
- 'mod_author' => Request::getString('mod_author', ''),
- 'mod_author_mail' => Request::getString('mod_author_mail', ''),
- 'mod_author_website_url' => Request::getString('mod_author_website_url', ''),
- 'mod_author_website_name' => Request::getString('mod_author_website_name', ''),
- 'mod_credits' => Request::getString('mod_credits', ''),
- 'mod_license' => Request::getString('mod_license', ''),
- 'mod_release_info' => Request::getString('mod_release_info', ''),
- 'mod_release_file' => Request::getString('mod_release_file', ''),
- 'mod_manual' => Request::getString('mod_manual', ''),
- 'mod_manual_file' => Request::getString('mod_manual_file', '')));
+ $modulesObj->setVars(array( 'mod_name' => Request::getString('mod_name', ''),
+ 'mod_dirname' => Request::getString('mod_dirname', ''),
+ 'mod_version' => Request::getString('mod_version', ''),
+ 'mod_description' => Request::getString('mod_description', ''),
+ 'mod_author' => Request::getString('mod_author', ''),
+ 'mod_author_mail' => Request::getString('mod_author_mail', ''),
+ 'mod_author_website_url' => Request::getString('mod_author_website_url', ''),
+ 'mod_author_website_name' => Request::getString('mod_author_website_name', ''),
+ 'mod_credits' => Request::getString('mod_credits', ''),
+ 'mod_license' => Request::getString('mod_license', ''),
+ 'mod_release_info' => Request::getString('mod_release_info', ''),
+ 'mod_release_file' => Request::getString('mod_release_file', ''),
+ 'mod_manual' => Request::getString('mod_manual', ''),
+ 'mod_manual_file' => Request::getString('mod_manual_file', '')));
//Form module_image
- $uploader = new XoopsMediaUploader( TDMC_MODULES_PATH_IMG, $helper->getConfig('mimetypes'),
+ $uploader = new XoopsMediaUploader( TDMC_UPLOAD_IMAGES_MODULES_PATH, $helper->getConfig('mimetypes'),
$helper->getConfig('maxuploadsize'), null, null);
if ($uploader->fetchMedia('xoops_upload_file')) {
- $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES['xoops_upload_file']['name']);
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES['modules_image']['name']);
$imageName = 'logo.'.$extension;
$uploader->setPrefix($imageName);
$uploader->fetchMedia('xoops_upload_file');
@@ -130,16 +127,19 @@
'mod_support_name' => Request::getString('mod_support_name', ''),
'mod_website_url' => Request::getString('mod_website_url', ''),
'mod_website_name' => Request::getString('mod_website_name', ''),
- 'mod_release' => Request::getString('mod_release', ''),
+ 'mod_release' => strtotime(Request::getString('mod_release', '')),
'mod_status' => Request::getString('mod_status', ''),
+ 'mod_isextension' => Request::getInt('mod_isextension', 0),
'mod_admin' => Request::getInt('mod_admin', 0),
'mod_user' => Request::getInt('mod_user', 0),
'mod_submenu' => Request::getInt('mod_submenu', 0),
'mod_search' => Request::getInt('mod_search', 0),
'mod_comments' => Request::getInt('mod_comments', 0),
- 'mod_notifications' => Request::getInt('mod_notifications', 0),
+ 'mod_notifications' => Request::getInt('mod_notifications', 0),
+ 'mod_permissions' => Request::getInt('mod_permissions', 0),
'mod_paypal' => Request::getString('mod_paypal', ''),
- 'mod_subversion' => Request::getString('mod_subversion', '')));
+ 'mod_subversion' => Request::getString('mod_subversion', ''),
+ 'mod_inroot_copy' => Request::getString('mod_inroot_copy', '')));
// Insert Data
if ($modulesHandler->insert($modulesObj)) {
$xoops->redirect('modules.php', 2, XoopsLocale::S_DATA_INSERTED);
@@ -151,10 +151,9 @@
break;
case 'edit':
- $adminMenu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add');
- $adminMenu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail');
+ $adminMenu->addItemButton(TDMCreateLocale::A_ADD_MODULE, 'modules.php?op=new', 'add');
+ $adminMenu->addItemButton(TDMCreateLocale::A_LIST_MODULES, 'modules.php', 'application-view-detail');
$adminMenu->renderButton();
- $modId = Request::getInt('mod_id', 0);
if ($modId > 0) {
$modulesObj = $modulesHandler->get($modId);
$form = $helper->getForm($modulesObj, 'modules');
@@ -165,7 +164,6 @@
break;
case 'delete':
- $modId = Request::getInt('mod_id', 0);
if ($modId > 0) {
$modulesObj = $modulesHandler->get($modId);
if (isset($_POST['ok']) && $_POST['ok'] == 1) {
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2015-05-11 13:03:29 UTC (rev 13060)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2015-05-15 12:00:25 UTC (rev 13061)
@@ -8,6 +8,7 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
+use Xoops\Core\Request;
/**
* tdmcreate module
*
@@ -19,8 +20,13 @@
* @version $Id: tables.php 10665 2012-12-27 10:14:15Z timgno $
*/
include __DIR__ . '/header.php';
+// Get $_POST, $_GET, $_REQUEST
+$op = Request::getCmd('op', 'list');
+$start = Request::getInt('start', 0);
+// Parameters
+$limit = $helper->getConfig('adminpager');
// Preferences Limit
-//$tableId = Request::getInt('table_id', 0);
+$tableId = Request::getInt('table_id', 0);
// header
$xoops->header('admin:tdmcreate/tdmcreate_tables.tpl');
//
@@ -30,79 +36,52 @@
{
case 'list':
default:
- $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
- $adminMenu->renderButton();
+ $adminMenu->addTips(TDMCreateLocale::TABLE_TIPS);
+ $adminMenu->addItemButton(TDMCreateLocale::A_ADD_TABLE, 'tables.php?op=new', 'add');
+ $adminMenu->renderTips();
+ $adminMenu->renderButton();
+ $xoops->theme()->addStylesheet('modules/tdmcreate/assets/css/styles.css');
+ $xoops->theme()->addScript('modules/tdmcreate/assets/js/functions.js');
+ $xoops->theme()->addScript('modules/tdmcreate/assets/js/sortable.js');
// Get modules list
- $criteria = new CriteriaCompo();
- $criteria->setSort('mod_name');
- $criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $numRowsMods = $modulesHandler->getCount($criteria);
- $moduleArray = $modulesHandler->getAll($criteria);
- $xoops->tpl()->assign('modules_count', $numRowsMods);
- $xoops->tpl()->assign('mimg_path', TDMC_MODULES_URL_IMG);
- unset($criteria);
+ $numbRowsMods = $modulesHandler->getCountModules();
+ $modulesArray = $modulesHandler->getAllModules($start, $limit);
+ $xoops->tpl()->assign('modules_count', $numbRowsMods);
+ $xoops->tpl()->assign('modules_images_url', TDMC_UPLOAD_IMAGES_MODULES_URL);
+ $xoops->tpl()->assign('modPathIcon16', TDMC_URL . '/assets/icons/16');
// Redirect if there aren't modules
- /*if ( $numRowsMods == 0 ) {
- $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOTMODULES );
- }*/
+ if ( $numbRowsMods == 0 ) {
+ $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOT_MODULES );
+ }
// Assign Template variables
- $xoops->tpl()->assign('mods_count', $numRowsMods);
- if ($numRowsMods > 0) {
- foreach (array_keys($moduleArray) as $i) {
- $mod['id'] = $moduleArray[$i]->getVar('mod_id');
- $mod['name'] = $moduleArray[$i]->getVar('mod_name');
- $mod['image'] = $moduleArray[$i]->getVar('mod_image');
- $mod['admin'] = $moduleArray[$i]->getVar('mod_admin');
- $mod['user'] = $moduleArray[$i]->getVar('mod_user');
- $mod['submenu'] = $moduleArray[$i]->getVar('mod_submenu');
- $mod['search'] = $moduleArray[$i]->getVar('mod_search');
- $mod['comments'] = $moduleArray[$i]->getVar('mod_comments');
- $mod['notifications'] = $moduleArray[$i]->getVar('mod_notifications');
- /*if (file_exists($timage = XOOPS_URL ."/uploads/tdmcreate/images/tables/".$table_image)) {
- $table['image'] = $timage;
- } elseif (file_exists($timage = XOOPS_URL ."/media/xoops/images/icons/32/".$table_image)) {
- $table['image'] = $timage;
- }*/
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('table_mid', $i));
- $criteria->setSort('table_name');
- $criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $numRowsTables = $tablesHandler->getCount($criteria);
- $tablesArray = $tablesHandler->getAll($criteria);
- $xoops->tpl()->assign('tables_count', $numRowsTables);
- $xoops->tpl()->assign('timg_path', TDMC_TABLES_URL_IMG);
- unset($criteria);
- $tables = array();
- if ($numRowsTables > 0) {
- foreach (array_keys($tablesArray) as $i)
+ if ($numbRowsMods > 0) {
+ foreach (array_keys($modulesArray) as $m) {
+ $module = $modulesArray[$m]->getValues();
+ $numbRowsTables = $tablesHandler->getCountTables();
+ $tablesArray = $tablesHandler->getAllTablesByModuleId($m, $start, $limit);
+ $xoops->tpl()->assign('tables_count', $numbRowsTables);
+ $xoops->tpl()->assign('tables_images_url', TDMC_UPLOAD_IMAGES_TABLES_URL);
+ $tables = array();
+
+ if ($numbRowsTables > 0) {
+ $lid = 1;
+ foreach (array_keys($tablesArr...
[truncated message content] |
