Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13058] XoopsModules26/tdmcreate/branches/2.01/timgno /tdmcreate
|
From: <txm...@us...> - 2015-05-06 14:56:33
|
Revision: 13058
http://sourceforge.net/p/xoops/svn/13058
Author: txmodxoops
Date: 2015-05-06 14:56:29 +0000 (Wed, 06 May 2015)
Log Message:
-----------
Fixings and updates
Modified Paths:
--------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/about.php
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/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/class/fieldattributes.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fieldelements.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fieldkey.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fieldnull.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fieldtype.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/helper.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/structure.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/tables.php
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/xoops_version.php
Added Paths:
-----------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/css/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/css/styles.css
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/fonts/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/fonts/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/blocks.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/editfields.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/fields.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/green.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/nb_fields.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/red.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/yellow.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/addmodule.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/addtable.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/builder.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/dashboard.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/editfields.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/edittable.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/extensions.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/logo_large.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/logo_small.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/default_slogo.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/logo.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/naked.png
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/js/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/js/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/building.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/building.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/imports.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locales.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/imports.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locales.php
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_locale.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
Removed Paths:
-------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/css/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/icons/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/images/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_building.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_extensions.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_fields.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_import.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/about.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/about.php 2015-05-04 18:50:06 UTC (rev 13057)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/about.php 2015-05-06 14:56:29 UTC (rev 13058)
@@ -19,10 +19,10 @@
* @author TDM Xoops (AKA Developers)
* @version $Id: about.php 10665 2012-12-27 10:14:15Z timgno $
*/
-include dirname(__FILE__) . '/header.php';
-// Header
+include __DIR__ . '/header.php';
$xoops->header();
// About
-$admin_menu->displayNavigation('about.php');
-$admin_menu->displayAbout('6KJ7RW5DR3VTJ', true);
-$xoops->footer();
\ No newline at end of file
+$adminMenu->displayNavigation('about.php');
+$adminMenu->displayAbout(true);
+
+include __DIR__ . '/footer.php';
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2015-05-04 18:50:06 UTC (rev 13057)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2015-05-06 14:56:29 UTC (rev 13058)
@@ -19,18 +19,11 @@
* @author TDM Xoops (AKA Developers)
* @version $Id: building.php 10665 2012-12-27 10:14:15Z timgno $
*/
-include dirname(__FILE__) . '/header.php';
-// Get Action type
-$op = $system->cleanVars($_REQUEST, 'op', 'default', 'string');
-// heaser
-$xoops->header('tdmcreate_building.html');
-// Get handler
-/* @var $modules_handler TDMCreateModulesHandler */
-$modules_Handler = $xoops->getModuleHandler('modules');
-/* @var $tables_handler TDMCreateExtensionsHandler */
-$tables_Handler = $xoops->getModuleHandler('tables');
+include __DIR__ . '/header.php';
+// header
+$xoops->header('admin:tdmcreate/tdmcreate_building.tpl');
-$admin_menu->renderNavigation('building.php');
+$adminMenu->renderNavigation('building.php');
switch ($op)
{
case 'default':
@@ -39,7 +32,7 @@
$mods_select = new XoopsFormSelect(TDMCreateLocale::BUILDING_MODULES, 'mod_name', 'mod_name');
$mods_select->addOption(0, TDMCreateLocale::BUILDING_SELDEFMOD);
- $mods_select->addOptionArray($modules_Handler->getList());
+ $mods_select->addOptionArray($modulesHandler->getList());
$form->addElement($mods_select);
$form->addElement(new XoopsFormHidden('op', 'build'));
@@ -51,8 +44,9 @@
$admin_menu->addItemButton(TDMCreateLocale::BUILDING_FORM, 'building.php', 'application-view-detail');
$admin_menu->renderButton();
- $mods =& $modules_Handler->get($_REQUEST['mod_name']);
+ $mods =& $modulesHandler->get($_REQUEST['mod_name']);
$mods_name = $mods->getVar('mod_name');
break;
}
-$xoops->footer();
\ No newline at end of file
+
+include __DIR__ . '/footer.php';
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2015-05-04 18:50:06 UTC (rev 13057)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2015-05-06 14:56:29 UTC (rev 13058)
@@ -18,92 +18,89 @@
* @author TDM Xoops (AKA Developers)
* @version $Id: fields.php 10665 2012-12-27 10:14:15Z timgno $
*/
-include dirname(__FILE__) . '/header.php';
+include __DIR__ . '/header.php';
+/*
+$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', '');*/
-$field_id = $system->cleanVars($_REQUEST, 'field_id', 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');
+$xoops->header('admin:tdmcreate/tdmcreate_fields.tpl');
-$admin_menu->renderNavigation('fields.php');
+$adminMenu->renderNavigation('fields.php');
switch ($op)
{
case 'list':
default:
- $admin_menu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
- $admin_menu->renderButton();
+ $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
+ $adminMenu->renderButton();
// Get modules list
- $criteria = new CriteriaCompo(new Criteria('table_mid', $field_mid));
- $criteria->add(new Criteria('table_id', $field_tid));
+ $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);
- $numrows_tables = $tables_Handler->getCount($criteria);
- $table_arr = $tables_Handler->getAll($criteria);
- $xoops->tpl()->assign('tables_count', $numrows_tables);
+ $numRowsTables = $tablesHandler->getCount($criteria);
+ $tablesArray = $tablesHandler->getAll($criteria);
+ $xoops->tpl()->assign('tables_count', $numRowsTables);
unset($criteria);
// Redirect if there aren't modules
- /* if ( $numrows_mods == 0 ) {
- $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOTMODULES );
- }*/
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_tid', $field_tid));
- $criteria->setSort('field_name');
- $criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $numrows_fields = $fields_Handler->getCount($criteria);
- $field_arr = $fields_Handler->getAll($criteria);
- unset($criteria);
+ if ( $numRowsTables == 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', $numrows_fields);
- if ($numrows_tables > 0) {
- foreach (array_keys($table_arr) as $i) {
- $tables['id'] = $table_arr[$i]->getVar('table_id');
- $tables['name'] = $table_arr[$i]->getVar('table_name');
- $module_name = $modules_Handler->get($table_arr[$i]->getVar('table_mid'));
+ $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'] = $table_arr[$i]->getVar('table_image');
- $tables['nbfields'] = $table_arr[$i]->getVar('table_nbfields');
- $tables['blocks'] = $table_arr[$i]->getVar('table_blocks');
- $tables['admin'] = $table_arr[$i]->getVar('table_admin');
- $tables['user'] = $table_arr[$i]->getVar('table_user');
- $tables['submenu'] = $table_arr[$i]->getVar('table_submenu');
- $tables['search'] = $table_arr[$i]->getVar('table_search');
- $tables['comments'] = $table_arr[$i]->getVar('table_comments');
- $tables['notifications'] = $table_arr[$i]->getVar('table_notifications');
+ $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);
}
- if ($numrows_fields > 0) {
- foreach (array_keys($field_arr) as $i) {
- $field['id'] = $field_arr[$i]->getVar('field_id');
- $table_name = $tables_Handler->get($field_arr[$i]->getVar('field_tid'));
+ $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'] = $field_arr[$i]->getVar('field_name');
- $field['type'] = $field_arr[$i]->getVar('field_type');
- $field['value'] = $field_arr[$i]->getVar('field_value');
- $field['blocks'] = $field_arr[$i]->getVar('field_blocks');
- $field['attribute'] = $field_arr[$i]->getVar('field_attribute');
- $field['default'] = $field_arr[$i]->getVar('field_default');
- $field['key'] = $field_arr[$i]->getVar('field_key');
- $field['auto_increment'] = $field_arr[$i]->getVar('field_auto_increment');
- $field['blocks'] = $field_arr[$i]->getVar('field_blocks');
- $field['search'] = $field_arr[$i]->getVar('field_search');
- $field['required'] = $field_arr[$i]->getVar('field_required');
+ $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);
}
}
// Display Page Navigation
- if ($numrows_tables > $nb_pager) {
- $nav = new XoopsPageNav($numrows_tables, $nb_pager, $start, 'start');
+ if ($numRowsTables > $limit) {
+ $nav = new XoopsPageNav($numRowsTables, $limit, $start, 'start');
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
@@ -112,10 +109,10 @@
break;
case 'new':
- $admin_menu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail');
- $admin_menu->renderButton();
+ $adminMenu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail');
+ $adminMenu->renderButton();
- $obj = $fields_Handler->create();
+ $obj = $fieldsHandler->create();
$form = $xoops->getModuleForm($obj, 'fields');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -124,14 +121,14 @@
if (!$xoops->security()->check()) {
$xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors()));
}
- if ($field_id) {
- $obj = $fields_Handler->get($field_id);
+ if ($fieldId) {
+ $obj = $fieldsHandler->get($fieldId);
} else {
- $obj = $fields_Handler->create();
+ $obj = $fieldsHandler->create();
}
//Form fields
- $obj->setVars(array('field_mid' => $field_mid, 'field_tid' => $field_tid, 'field_name' => $field_name,
- 'field_numb' => $field_numb, 'field_type' => $_POST['field_type'],
+ $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'],
@@ -143,7 +140,7 @@
'field_search' => (($_REQUEST['field_search'] == 1) ? '1' : '0'),
'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0')));
// Save data
- if ($fields_Handler->insert($obj)) {
+ if ($fieldsHandler->insert($obj)) {
$xoops->redirect('fields.php', 2, TDMCreateLocale::FORMOK);
}
@@ -151,29 +148,29 @@
break;
case 'edit':
- $admin_menu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
- $admin_menu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail');
- $admin_menu->renderButton();
+ $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add');
+ $adminMenu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail');
+ $adminMenu->renderButton();
- $obj = $fields_Handler->get($field_tid);
+ $obj = $fieldsHandler->get($fieldTid);
$form = $xoops->getModuleForm($obj, 'fields');
$xoops->tpl()->assign('form', $form->render());
break;
case 'delete':
- if ($field_id > 0) {
- $obj = $fields_Handler->get($field_id);
+ if ($fieldId > 0) {
+ $obj = $fieldsHandler->get($fieldId);
if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
$xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors()));
}
- if ($fields_Handler->delete($obj)) {
+ if ($fieldsHandler->delete($obj)) {
$xoops->redirect('fields.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::TABLE));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array('ok' => 1, 'id' => $field_id, '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, $obj->getVar('field_name')) . '<br />');
}
} else {
$xoops->redirect('fields.php', 1, TDMCreateLocale::E_DATABASE_ERROR);
Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.php (rev 0)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.php 2015-05-06 14:56:29 UTC (rev 13058)
@@ -0,0 +1,23 @@
+<?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 TDM Xoops (AKA Developers)
+ * @version $Id$
+ */
+
+$xoops->footer();
\ No newline at end of file
Property changes on: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.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/header.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2015-05-04 18:50:06 UTC (rev 13057)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2015-05-06 14:56:29 UTC (rev 13058)
@@ -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
*
@@ -19,26 +19,33 @@
* @author TXMod Xoops (AKA Timgno)
* @version $Id: header.php 10665 2012-12-27 10:14:15Z timgno $
*/
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
-include_once dirname(dirname(__FILE__)) . '/include/functions.php';
-include_once dirname(dirname(__FILE__)) . '/class/helper.php';
+require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
// Get main instance
XoopsLoad::load('system', 'system');
$system = System::getInstance();
-// Get main locale instance
-$xoops = Xoops::getInstance();
-$helper = TDMCreate::getInstance();
-$request = $xoops->request();
+//
+$helper = Xoops\Module\Helper::getHelper('tdmcreate');
+$xoops = $helper->xoops();
+// Load local libraries
+XoopsLoad::loadFile($xoops->path(dirname(__DIR__) . '/include/common.php'));
+XoopsLoad::loadFile($xoops->path(dirname(__DIR__) . '/include/functions.php'));
// Get handler
-$modules_Handler = $helper->getHandlerModules();
-$tables_Handler = $helper->getHandlerTables();
-$import_Handler = $helper->getHandlerImport();
-$fields_Handler = $helper->getHandlerFields();
+$modulesHandler = $helper->getModulesHandler();
+$tablesHandler = $helper->getTablesHandler();
+$fieldsHandler = $helper->getFieldsHandler();
+$localeHandler = $helper->getLocalesHandler();
+$importHandler = $helper->getImportsHandler();
// Get $_POST, $_GET, $_REQUEST
-$op = $request->asStr('op', 'list');
-$start = $request->asInt('start', 0);
+$op = Request::getCmd('op');
+$start = Request::getInt('start', 0);
// Parameters
$limit = $helper->getConfig('adminpager');
+// Add Script
+$xoops->theme()->addScript('media/xoops/xoops.js');
+$xoops->theme()->addScript('modules/system/js/admin.js');
+$xoops->theme()->addScript('modules/tdmcreate/assets/js/functions.js');
+// Add Stylesheet
+$xoops->theme()->addStylesheet('modules/system/css/admin.css');
+$xoops->theme()->addStylesheet('modules/tdmcreate/assets/css/admin.css');
// Get admin menu istance
-$admin_menu = new XoopsModuleAdmin();
\ No newline at end of file
+$adminMenu = new \Xoops\Module\Admin();
\ No newline at end of file
Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php (rev 0)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php 2015-05-06 14:56:29 UTC (rev 13058)
@@ -0,0 +1,213 @@
+<?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_imports.tpl');
+//
+//$importId = Request::getInt('import_id', 0);
+//
+$adminMenu->renderNavigation('imports.php');
+//
+switch ($op)
+{
+ case 'list':
+ $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'imports.php?op=new', 'add');
+ $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);
+ // Assign Template variables
+ $xoops->tpl()->assign('imports_count', $numImports);
+ 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);
+ unset($import);
+ }
+ // 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_NOIMPORTS);
+ }
+ break;
+
+ case 'new':
+ $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'imports.php', 'application-view-detail');
+ $adminMenu->renderButton();
+
+ $obj = $importHandler->create();
+ $form = $xoops->getModuleForm($obj, 'import');
+ $xoops->tpl()->assign('form', $form->render());
+ break;
+
+ case 'save':
+ if (!$xoops->security()->check()) {
+ $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
+ }
+
+ if ($importId > 0) {
+ $obj = $importHandler->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']);
+ } else {
+ $obj = $importHandler->create();
+ //Form imported save
+ $obj->setVar('import_name', $_POST['import_name']);
+ $obj->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'];
+ $tmpName = $file['tmp_name'];
+ // Copy files to the server
+ if (is_uploaded_file($tmpName)) {
+ readfile($tmpName);
+ // The directory where you saved the file
+ if ($file['error'] == UPLOAD_ERR_OK) {
+ if (move_uploaded_file($tmpName, $dir.'/'.$file['name']));
+ $xoops->redirect('imports.php', 3, sprintf(TDMCreateLocale::E_FILE_UPLOADING, $file['name']));
+ }
+ } else {
+ $xoops->redirect('imports.php', 3, sprintf(TDMCreateLocale::E_FILE_NOT_UPLOADING, $tmpName));
+ }
+
+ // Copies data in the db
+ $filename = $dir.'/'.$file['name'];
+ // File size
+ $filesize = $files['size'];
+ // Check that the file was inserted and that there is
+ if ( ($handle = fopen($filename, 'r') ) !== false) {
+ // File reading until at the end
+ while ( !feof( $handle ))
+ {
+ $buffer = fgets($handle, filesize($filename));
+ if(strlen($buffer) > 1)
+ {
+ // search all comments
+ $search = array ( '/\/\*.*(\n)*.*(\*\/)?/', '/\s*--.*\n/', '/\s*#.*\n/' );
+ // and replace with null
+ $replace = array ( "\n" );
+ $buffer = preg_replace($search, $replace, $buffer);
+ $buffer = str_replace('`', '', $buffer);
+ $buffer = str_replace(',', '', $buffer);
+
+ preg_match_all('/((\s)*(CREATE TABLE)(\s)+(.*)(\s)+(\())/', $buffer, $tableMatch); // table name ... (match)
+ if(count($tableMatch[0]) > 0) {
+ array_push( $resultTable, $tableMatch[5][0] );
+ }
+ } else {
+ $xoops->redirect('imports.php', 3, sprintf(TDMCreateLocale::E_SQL_FILE_DATA_NOT_MATCH, $buffer));
+ }
+ }
+
+ // Insert query
+ if(strlen($resultTable[0]) > 0)
+ {
+ $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']
+ 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']);
+ }
+ unset($f);
+ }
+ }
+ unset($t);
+ }
+ } else {
+ $xoops->redirect('imports.php', 3, TDMCreateLocale::E_FILE_NOT_OPEN_READING);
+ }
+ $xoops->redirect('imports.php', 3, TDMCreateLocale::S_DATA_ENTERED);
+ fclose($handle);
+ } else {
+ $xoops->redirect('imports.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED);
+ }
+ }
+
+ if ($importHandler->insert($obj)) {
+ $xoops->redirect('imports.php', 3, TDMCreateLocale::FORM_OK);
+ }
+
+ $xoops->error($obj->getHtmlErrors());
+ $form = $xoops->getModuleForm($obj, 'import');
+ $xoops->tpl()->assign('form', $form->render());
+ break;
+
+ case 'edit':
+ $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'imports.php?op=import', 'add');
+ $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'imports.php', 'application-view-detail');
+ $adminMenu->renderButton();
+
+ $obj = $importHandler->get($importId);
+ $form = $xoops->getModuleForm($obj, 'import');
+ $xoops->tpl()->assign('form', $form->render());
+ break;
+
+ case 'delete':
+ if ($importId > 0) {
+ $obj = $importHandler->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)) {
+ $xoops->redirect('imports.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT));
+ } else {
+ $xoops->error($obj->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 />');
+ }
+ } else {
+ $xoops->redirect('imports.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/imports.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/index.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2015-05-04 18:50:06 UTC (rev 13057)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2015-05-06 14:56:29 UTC (rev 13058)
@@ -19,36 +19,53 @@
* @author TDM Xoops (AKA Developers)
* @version $Id: index.php 10665 2012-12-27 10:14:15Z timgno $
*/
-include dirname(__FILE__) . '/header.php';
-// Heaser
+include __DIR__ . '/header.php';
+// header
$xoops->header();
// tdmcreate modules
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('mod_id', 0, '!='));
-$tdmcreate_modules = $modules_Handler->getCount($criteria);
+$modules = $modulesHandler->getCount($criteria);
+unset($criteria);
// tdmcreate tables
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('table_mid', 0, '!='));
-$tdmcreate_tables = $tables_Handler->getCount($criteria);
+$tables = $tablesHandler->getCount($criteria);
+unset($criteria);
+// tdmcreate tables
+$criteria = new CriteriaCompo();
+$criteria->add(new Criteria('field_mid', 0, '!='));
+$criteria->add(new Criteria('field_tid', 0, '!='));
+$fields = $fieldsHandler->getCount($criteria);
+unset($criteria);
+// tdmcreate modules
+$criteria = new CriteriaCompo();
+$criteria->add(new Criteria('loc_mid', 0, '!='));
+$locale = $localeHandler->getCount($criteria);
+unset($criteria);
// tdmcreate import
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('import_id', 0, '!='));
-$tdmcreate_import = $import_Handler->getCount($criteria);
-
+$import = $importHandler->getCount($criteria);
+unset($criteria);
$r = "red"; $g = "green";
-$modules_color = $tdmcreate_modules == 0 ? $r : $g;
-$tables_color = $tdmcreate_tables == 0 ? $r : $g;
-$import_color = $tdmcreate_import == 0 ? $r : $g;
+$modulesColor = $modules == 0 ? $r : $g;
+$tablesColor = $tables == 0 ? $r : $g;
+$fieldsColor = $fields == 0 ? $r : $g;
+$localeColor = $locale == 0 ? $r : $g;
+$importColor = $import == 0 ? $r : $g;
-$admin_menu->displayNavigation('index.php');
+$adminMenu->displayNavigation('index.php');
-$admin_menu->addInfoBox(TDMCreateLocale::INDEX_STATISTICS);
-$admin_menu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NMTOTAL, '<span class="'.$modules_color.'">' . $tdmcreate_modules . '</span>'));
-$admin_menu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NTTOTAL, '<span class="'.$tables_color.'">' . $tdmcreate_tables . '</span>'));
-$admin_menu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NITOTAL, '<span class="'.$import_color.'">' . $tdmcreate_import . '</span>'));
+$adminMenu->addInfoBox(TDMCreateLocale::INDEX_STATISTICS);
+$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NMTOTAL, '<span class="'.$modulesColor.'">' . $modules . '</span>'));
+$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NTTOTAL, '<span class="'.$tablesColor.'">' . $tables . '</span>'));
+$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NFTOTAL, '<span class="'.$fieldsColor.'">' . $fields . '</span>'));
+$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NLTOTAL, '<span class="'.$localeColor.'">' . $locale . '</span>'));
+$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NITOTAL, '<span class="'.$importColor.'">' . $import . '</span>'));
// folder path
-$folder_path = array(
+$folderPath = array(
XOOPS_UPLOAD_PATH . '/tdmcreate/',
XOOPS_UPLOAD_PATH . '/tdmcreate/files',
XOOPS_UPLOAD_PATH . '/tdmcreate/repository',
@@ -56,16 +73,17 @@
XOOPS_UPLOAD_PATH . '/tdmcreate/images/modules',
XOOPS_UPLOAD_PATH . '/tdmcreate/images/tables'
);
-foreach ($folder_path as $folder) {
- $admin_menu->addConfigBoxLine($folder, 'folder');
- $admin_menu->addConfigBoxLine(array($folder, '777'), 'chmod');
+foreach ($folderPath as $folder) {
+ $adminMenu->addConfigBoxLine($folder, 'folder');
+ $adminMenu->addConfigBoxLine(array($folder, '777'), 'chmod');
}
// extension
$extensions = array('xtranslator' => 'extension');
foreach ($extensions as $module => $type) {
- $admin_menu->addConfigBoxLine(array($module, 'warning'), $type);
+ $adminMenu->addConfigBoxLine(array($module, 'warning'), $type);
}
-$admin_menu->displayIndex();
-$xoops->footer();
\ No newline at end of file
+$adminMenu->displayIndex();
+
+include __DIR__ . '/footer.php';
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-06 14:56:29 UTC (rev 13058)
@@ -0,0 +1,128 @@
+<?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('locales.php');
+//
+switch ($op)
+{
+ case 'list':
+ $adminMenu->addItemButton(TDMCreateLocale::ADD_LOCALE, 'locales.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('locales', $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, 'locales.php', 'application-view-detail');
+ $adminMenu->renderButton();
+
+ $obj = $localeHandler->create();
+ $form = $xoops->getModuleForm($obj, 'locales');
+ $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('locales.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED);
+ }
+ if ($localeHandler->insert($obj)) {
+ $xoops->redirect('locales.php', 3, TDMCreateLocale::FORM_OK);
+ }
+
+ $xoops->error($obj->getHtmlErrors());
+ $form = $xoops->getModuleForm($obj, 'locales');
+ $xoops->tpl()->assign('form', $form->render());
+ break;
+
+ case 'edit':
+ $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'locales.php?op=import', 'add');
+ $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locales.php', 'application-view-detail');
+ $adminMenu->renderButton();
+
+ $obj = $localeHandler->get($localeId);
+ $form = $xoops->getModuleForm($obj, 'locales');
+ $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('locales.php', 3, implode(',', $xoops->security()->getErrors()));
+ }
+ if ($localeHandler->delete($obj)) {
+ $xoops->redirect('locales.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT));
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
+ } else {
+ $xoops->confirm(array('ok' => 1, 'id' => $localeId, 'op' => 'delete'), 'locales.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->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-04 18:50:06 UTC (rev 13057)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2015-05-06 14:56:29 UTC (rev 13058)
@@ -37,10 +37,14 @@
$adminmenu[$i]['icon'] = 'editfields.png';
$i++;
$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU5;
-$adminmenu[$i]['link'] = 'admin/import.php';
+$adminmenu[$i]['link'] = 'admin/locales.php';
+$adminmenu[$i]['icon'] = 'languages.png';
+$i++;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU6;
+$adminmenu[$i]['link'] = 'admin/imports.php';
$adminmenu[$i]['icon'] = 'import.png';
$i++;
-$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU6;
+$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU7;
$adminmenu[$i]['link'] = 'admin/building.php';
$adminmenu[$i]['icon'] = 'builder.png';
$i++;
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2015-05-04 18:50:06 UTC (rev 13057)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2015-05-06 14:56:29 UTC (rev 13058)
@@ -18,49 +18,49 @@
* @author XOOPS Development Team
* @version $Id: modules.php 10665 2012-12-27 10:14:15Z timgno $
*/
-include dirname(__FILE__) . '/header.php';
+include __DIR__ . '/header.php';
// Get Action type
-$mod_id = $system->cleanVars($_REQUEST, 'mod_id', 0, 'int');
+//$modId = Request::getInt('mod_id');
// Get handler
-$xoops->header('tdmcreate_modules.html');
-$admin_menu->renderNavigation('modules.php');
+$xoops->header('admin:tdmcreate/tdmcreate_modules.tpl');
+$adminMenu->renderNavigation('modules.php');
switch ($op)
{
case 'list':
default:
- $admin_menu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add');
- $admin_menu->renderButton();
+ $adminMenu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add');
+ $adminMenu->renderButton();
// Get modules list
$criteria = new CriteriaCompo();
$criteria->setSort('mod_name');
$criteria->setOrder('ASC');
$criteria->setStart($start);
$criteria->setLimit($limit);
- $numrows_mods = $modules_Handler->getCount($criteria);
- $mod_arr = $modules_Handler->getAll($criteria);
+ $numRowsMods = $modulesHandler->getCount($criteria);
+ $modulesArray = $modulesHandler->getAll($criteria);
// Assign Template variables
- $xoops->tpl()->assign('modules_count', $numrows_mods);
+ $xoops->tpl()->assign('modules_count', $numRowsMods);
unset($criteria);
- if ($numrows_mods > 0) {
- foreach (array_keys($mod_arr) as $i) {
- $mod['id'] = $mod_arr[$i]->getVar('mod_id');
- $mod['name'] = $mod_arr[$i]->getVar('mod_name');
- $mod['version'] = $mod_arr[$i]->getVar('mod_version');
- $mod['image'] = $mod_arr[$i]->getVar('mod_image');
- $mod['release'] = $mod_arr[$i]->getVar('mod_release');
- $mod['status'] = $mod_arr[$i]->getVar('mod_status');
- $mod['admin'] = $mod_arr[$i]->getVar('mod_admin');
- $mod['user'] = $mod_arr[$i]->getVar('mod_user');
- $mod['submenu'] = $mod_arr[$i]->getVar('mod_submenu');
- $mod['search'] = $mod_arr[$i]->getVar('mod_search');
- $mod['comments'] = $mod_arr[$i]->getVar('mod_comments');
- $mod['notifications'] = $mod_arr[$i]->getVar('mod_notifications');
+ if ($numRowsMods > 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);
}
// Display Page Navigation
- if ($numrows_mods > $limit) {
- $nav = new XoopsPageNav($numrows_mods, $limit, $start, 'start');
+ if ($numRowsMods > $limit) {
+ $nav = new XoopsPageNav($numRowsMods, $limit, $start, 'start');
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
@@ -69,11 +69,11 @@
break;
case 'new':
- $admin_menu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail');
- $admin_menu->renderButton();
+ $adminMenu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail');
+ $adminMenu->renderButton();
- $obj = $modules_Handler->create();
- $form = $xoops->getModuleForm($obj, 'modules');
+ $modulesObj = $modulesHandler->create();
+ $form = $xoops->getModuleForm($modulesObj, 'modules');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -81,83 +81,83 @@
if (!$xoops->security()->check()) {
$xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
}
- $mod_id = $request->asInt('mod_id', 0);
- if ($mod_id > 0) {
- $obj = $modules_Handler->get($mod_id);
+ $modId = Request::getInt('mod_id', 0);
+ if ($modId > 0) {
+ $modulesObj = $modulesHandler->get($modId);
} else {
- $obj = $modules_Handler->create();
+ $modulesObj = $modulesHandler->create();
}
//Form module save
- $obj->setVars(array('mod_name' => $request->asStr('mod_name', ''),
- 'mod_isextension' => $request->asInt('mod_isextension', 0),
- 'mod_version' => $request->asStr('mod_version', ''),
- 'mod_description' => $request->asStr('mod_description', ''),
- 'mod_author' => $request->asStr('mod_author', ''),
- 'mod_author_mail' => $request->asStr('mod_author_mail', ''),
- 'mod_author_website_url' => $request->asStr('mod_author_website_url', ''),
- 'mod_author_website_name' => $request->asStr('mod_author_website_name', ''),
- 'mod_credits' => $request->asStr('mod_credits', ''),
- 'mod_license' => $request->asStr('mod_license', ''),
- 'mod_release_info' => $request->asStr('mod_release_info', ''),
- 'mod_release_file' => $request->asStr('mod_release_file', ''),
- 'mod_manual' => $request->asStr('mod_manual', ''),
- 'mod_manual_file' => $request->asStr('mod_manual_file', '')));
+ $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', '')));
//Form module_image
$uploader = new XoopsMediaUploader( TDMC_MODULES_PATH_IMG, $helper->getConfig('mimetypes'),
$helper->getConfig('maxuploadsize'), null, null);
if ($uploader->fetchMedia('xoops_upload_file')) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES['xoops_upload_file']['name']);
- $img_name = 'logo.'.$extension;
- $uploader->setPrefix($img_name);
+ $imageName = 'logo.'.$extension;
+ $uploader->setPrefix($imageName);
$uploader->fetchMedia('xoops_upload_file');
if (!$uploader->upload()) {
$xoops->redirect('javascript:history.go(-1)',3, $uploader->getErrors());
} else {
- $obj->setVar('mod_image', $uploader->getSavedFileName());
+ $modulesObj->setVar('mod_image', $uploader->getSavedFileName());
}
} else {
if ($_POST['modules_image'] == 'blank.gif') {
- $obj->setVar('mod_image', $_POST['mod_image']);
+ $modulesObj->setVar('mod_image', $_POST['mod_image']);
} else {
- $obj->setVar('mod_image', $_POST['modules_image']);
+ $modulesObj->setVar('mod_image', $_POST['modules_image']);
}
}
//Form module save
- $obj->setVars(array('mod_demo_site_url' => $request->asStr('mod_demo_site_url', ''),
- 'mod_demo_site_name' => $request->asStr('mod_demo_site_name', ''),
- 'mod_support_url' => $request->asStr('mod_support_url', ''),
- 'mod_support_name' => $request->asStr('mod_support_name', ''),
- 'mod_website_url' => $request->asStr('mod_website_url', ''),
- 'mod_website_name' => $request->asStr('mod_website_name', ''),
- 'mod_release' => $request->asStr('mod_release', ''),
- 'mod_status' => $request->asStr('mod_status', ''),
- 'mod_admin' => $request->asInt('mod_admin', 0),
- 'mod_user' => $request->asInt('mod_user', 0),
- 'mod_submenu' => $request->asInt('mod_submenu', 0),
- 'mod_search' => $request->asInt('mod_search', 0),
- 'mod_comments' => $request->asInt('mod_comments', 0),
- 'mod_notifications' => $request->asInt('mod_notifications', 0),
- 'mod_paypal' => $request->asStr('mod_paypal', ''),
- 'mod_subversion' => $request->asStr('mod_subversion', '')));
+ $modulesObj->setVars(array('mod_demo_site_url' => Request::getString('mod_demo_site_url', ''),
+ 'mod_demo_site_name' => Request::getString('mod_demo_site_name', ''),
+ 'mod_support_url' => Request::getString('mod_support_url', ''),
+ '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_status' => Request::getString('mod_status', ''),
+ '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_paypal' => Request::getString('mod_paypal', ''),
+ 'mod_subversion' => Request::getString('mod_subversion', '')));
// Insert Data
- if ($modules_Handler->insert($obj)) {
+ if ($modulesHandler->insert($modulesObj)) {
$xoops->redirect('modules.php', 2, XoopsLocale::S_DATA_INSERTED);
}
// Form Data
- $xoops->error($obj->getHtmlErrors());
- $form = $xoops->getModuleForm($obj, 'modules');
+ $xoops->error($modulesObj->getHtmlErrors());
+ $form = $xoops->getModuleForm($modulesObj, 'modules');
$xoops->tpl()->assign('form', $form->render());
break;
case 'edit':
- $admin_menu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add');
- $admin_menu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail');
- $admin_menu->renderButton();
- $mod_id = $request->asInt('mod_id', 0);
- if ($mod_id > 0) {
- $obj = $modules_Handler->get($mod_id);
- $form = $helper->getForm($obj, 'modules');
+ $adminMenu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add');
+ $adminMenu->addItemButton(TDMCreateLocale::MODULES_LIST, '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');
$xoops->tpl()->assign('form', $form->render());
} else {
$xoops->redirect('modules.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
@@ -165,20 +165,20 @@
break;
case 'delete':
- $mod_id = $request->asInt('mod_id', 0);
- if ($mod_id > 0) {
- $obj = $modules_Handler->get($mod_id);
+ $modId = Request::getInt('mod_id', 0);
+ if ($modId > 0) {
+ $modulesObj = $modulesHandler->get($modId);
if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
$xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
}
- if ($modules_Handler->delete($obj)) {
+ if ($modulesHandler->delete($modulesObj)) {
...
[truncated message content] |
