Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12373] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate
|
From: <txm...@us...> - 2014-03-13 21:55:47
|
Revision: 12373
http://sourceforge.net/p/xoops/svn/12373
Author: txmodxoops
Date: 2014-03-13 21:55:43 +0000 (Thu, 13 Mar 2014)
Log Message:
-----------
Work in progress
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/headerfiles.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/htmlsmartycodes.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_common.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_file.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_index.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions_const.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/create_file.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/docs_files.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/fields_parameters.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/form_elements.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/tables_fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_xoopsversion.php
Removed Paths:
-------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields_parameters.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/xoopsversion_file.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form_elements.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/structure.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables_fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Car_logo.png
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_logo.png
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-03-13 21:55:43 UTC (rev 12373)
@@ -62,164 +62,9 @@
/*Structure*/
/************************************************/
//Creation of the structure of folders and files
- const_structure($modules);
- //Creation of changelog.txt
- const_changelog($modules);
-
- $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix('mod_tdmcreate_tables') . " WHERE table_name = 'mod_".strtolower($mod_name)."_categories'");
- list( $category ) = $xoopsDB->fetchRow($result);
-
- foreach (array_keys($tables_arr) as $i)
- {
- // Variables
- $table_name = $tables_arr[$i]->getVar('table_name');
- $table_fieldname = $tables_arr[$i]->getVar('table_fieldname');
- $table_category = $tables_arr[$i]->getVar('table_category');
- $table_fields = $tables_arr[$i]->getVar('table_fields');
- $table_parameters = $tables_arr[$i]->getVar('table_parameters');
- $table_image = $tables_arr[$i]->getVar('table_image');
- $table_blocks = $tables_arr[$i]->getVar('table_blocks');
- $table_admin = $tables_arr[$i]->getVar('table_admin');
- $table_user = $tables_arr[$i]->getVar('table_user');
- $table_search = $tables_arr[$i]->getVar('table_search');
- $table_comments = $tables_arr[$i]->getVar('table_comments');
- $table_notifications = $tables_arr[$i]->getVar('table_notifications');
- $table_permissions = $tables_arr[$i]->getVar('table_permissions');
- $table_waiting = $tables_arr[$i]->getVar('table_waiting');
-
- // Fabrication
- // Copy of images tables
- $table_image1 = $modPath . '/images/uploads/tables/' . $table_image;
- if (file_exists($table_image1)) {
- copy($table_image1, $modPath . '/modules/' . strtolower($mod_name) . '/images/icons/32/' . $table_image);
- }
- // Creation of classes
- if ( $table_admin == 1 || $table_user == 1) {
- const_class($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $table_permissions);
- }
- // Creation of pages admin
- if ( $table_admin == 1 ) {
- const_admin_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $category);
- }
- // Creation of pages and templates user
- if ( $table_user == 1 && $table_name != null ) {
- const_user_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
- const_templates_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
- }
- // Creation of search
- if ( $table_search == 1 ) {
- const_include_search($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $table_image);
- }
- // Creation of admin permissions.php
- if ( $table_permissions == 1) {
- const_admin_permissions($modules, $table_name, $table_fields, $table_parameters);
- }
- // Creation of notifications
- if ( $table_notifications == 1 ) {
- const_include_notifications($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
- }
- // Creation of the file mysql.sql
- const_sql($modules, $table_name, $table_fieldname, $category, $table_fields);
-
- // Creation of blocks
- if ( $table_blocks == 1 ) {
- const_blocks($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $category);
- //Creation of template per blocks
- const_blocks_templates($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
- }
- }
- $table_name = isset($table_name) ? $table_name : null;
- $table_comments = isset($table_comments) ? $table_comments : null;
- $table_waiting = isset($table_waiting) ? $table_waiting : null;
- $table_parameters = isset($table_parameters) ? $table_parameters : null;
- $table_user = isset($table_user) ? $table_user : null;
- $table_admin = isset($table_admin) ? $table_admin : null;
- $table_fields = isset($table_fields) ? $table_fields : null;
- $table_blocks = isset($table_blocks) ? $table_blocks : null;
- $table_image = isset($table_image) ? $table_image : null;
- $table_permissions = isset($table_permissions) ? $table_permissions : null;
- $table_notifications = isset($table_notifications) ? $table_notifications : null;
- //Creation of architecture of more fields and data
- //const_architecture(null, null, $table_admin, $table_blocks, $table_admin, $table_blocks );
- // Creation of comments
- if ( $table_comments == 1 ) {
- const_include_comments($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
- }
-
- if ( $table_waiting == 1 ) {
- // Creation of Waiting Plugin
- const_waiting($modules, $tables_arr);
- }
- // Creation of class helper, module & request
- if ( $table_name != '' ) {
- const_class_helper($modules);
- const_class_module($modules);
- const_class_request($modules);
- }
- // Creation of xoopsversion.php
- const_xoopsversion($modules, $table_name, $table_fields, $table_parameters, $table_image, $tables_arr);
- // Creation of template index
- const_templates_index($modules);
- // Creation of template header
- const_templates_header($modules, $tables_arr);
- // Creation of template footer
- const_templates_footer($modules, $table_comments, $table_notifications);
- if ( $table_admin == 1 ) {
- // Creation of template admin about
- const_templates_admin_about($modules);
- // Creation of template admin help
- const_templates_admin_help($modules);
- }
- // Include
- ///////////////////////////////////////////////////////////////////////
- // Configs
- const_include_common($modules, $mod_author_website_name, $mod_author_website_url);
- // Functions
- const_include_functions($modules);
- //Creation of file install per l'uploads
- const_include_install($modules, $tables_arr);
- // Language
- ///////////////////////////////////////////////////////////////////////
- if ( $mod_user == 1 ) {
- //Creation of language main.php
- const_main_language($modules, $tables_arr);
- }
- // Creation of language modinfo.php
- const_modinfo_language($modules, $table_name, $table_image, $tables_arr, $mod_notifications);
- if ( $table_admin == 1 ) {
- // Creation of language admin.php
- const_admin_language($modules, $tables_arr, $mod_permissions);
- }
- if ( $table_blocks == 1 ) {
- // Creation of language blocks.php
- const_blocks_language($modules, $tables_arr);
- }
- // Creation of language help/help.html
- const_help_language($modules);
- ///////////////////////////////////////////////////////////////////////
- //Creation of style.css
- const_css_style($modules);
- /************************************************/
- /*Admin*/
- /************************************************/
- // Creation of admin header.php
- const_admin_header($modules, $table_name, $tables_arr);
- // Creation of admin index.php
- const_admin_index($modules, $tables_arr);
- // Creation of admin footer.php
- const_admin_footer($modules);
- // Creation of admin menu.php
- const_admin_menu($modules, $tables_arr, $mod_permissions);
- // Creation of admin about.php
- const_admin_about($modules);
- /************************************************/
- /*User*/
- /************************************************/
- if ( $mod_user == 1 ) {
- const_user_header($modules);
- const_user_index($modules);
- }
+ echo 'Under new construction';
+
TDMCreate_CloseTable();
break;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php 2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php 2014-03-13 21:55:43 UTC (rev 12373)
@@ -23,4 +23,5 @@
echo "<div class='center smallsmall italic pad5'>
<strong>" . $xoopsModule->getVar('name') . "</strong> is maintained by the
<a href='http://xoops.org/forums/newbb' title='Visit Support Forum' class='tooltip' rel='external'>Support Forum</a></div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
+?>
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-03-13 21:55:43 UTC (rev 12373)
@@ -1,4 +1,4 @@
-<?php
+<?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
@@ -14,173 +14,170 @@
* @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.5.0
- * @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: modules.php 11084 2013-02-23 15:44:20Z timgno $
+ * @since 2.5.5
+ * @author Txmod Xoops <su...@tx...>
+ * @version $Id: 1.59 modules.php 11297 2013-03-24 10:58:10Z timgno $
*/
-include_once 'header.php';
-$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'list', 'string' );
-echo $adminMenu->addNavigation('modules.php');
+include 'header.php';
+// Recovered the value of the argument op in the URL $
+$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+
switch ($op)
-{
- case 'save':
- if (!$GLOBALS['xoopsSecurity']->check()) {
+{
+ case 'list':
+ default:
+ $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ $start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
+ // Define main template
+ $xoopsOption['template_main'] = 'tdmcreate_modules.html';
+ xoops_cp_header();
+ $xoopsTpl->assign('navigation', $adminMenu->addNavigation('modules.php'));
+ $adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');
+ $xoopsTpl->assign('button_new', $adminMenu->renderButton());
+ $xoopsTpl->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('mod_id ASC, mod_name');
+ $criteria->setOrder('ASC');
+ $numrows = $modulesHandler->getCount();
+ $mods_arr = $modulesHandler->getAll( $criteria );
+ unset($criteria);
+ // Display modules list
+ if ($numrows>0)
+ {
+ $yes = "<img src='../images/icons/16/green.png' alt='"._YES."' title='"._YES."' />";
+ $no = "<img src='../images/icons/16/red.png' alt='"._NO."' title='"._NO."' />";
+ foreach (array_keys($mods_arr) as $i)
+ {
+ $mod['mod_id'] = $i;
+ $mod['mod_name'] = $mods_arr[$i]->getVar('mod_name');
+ $mod['mod_version'] = $mods_arr[$i]->getVar('mod_version');
+ $mod['mod_image'] = $mods_arr[$i]->getVar('mod_image');
+ $mod['mod_release'] = $mods_arr[$i]->getVar('mod_release');
+ $mod['mod_status'] = $mods_arr[$i]->getVar('mod_status');
+ $mod['mod_admin'] = ( $mods_arr[$i]->getVar('mod_admin') == 1 ) ? $yes : $no;
+ $mod['mod_user'] = ( $mods_arr[$i]->getVar('mod_user') == 1 ) ? $yes : $no;
+ $mod['mod_submenu'] = ( $mods_arr[$i]->getVar('mod_submenu') == 1 ) ? $yes : $no;
+ $mod['mod_search'] = ( $mods_arr[$i]->getVar('mod_search') == 1 ) ? $yes : $no;
+ $mod['mod_comments'] = ( $mods_arr[$i]->getVar('mod_comments') == 1 ) ? $yes : $no;
+ $mod['mod_notifications'] = ( $mods_arr[$i]->getVar('mod_notifications') == 1 ) ? $yes : $no;
+ $xoopsTpl->append('modules_list', $mod);
+ unset($mod);
+ }
+ if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
+ $xoopsTpl->assign('pagenav', $pagenav->renderNav(4));
+ }
+ } else {
+ $xoopsTpl->assign('error', 'There aren\'t modules');
+ }
+ break;
+
+ case 'new':
+ // Define main template
+ $xoopsOption['template_main'] = 'tdmcreate_modules.html';
+ xoops_cp_header();
+ $xoopsTpl->assign('navigation', $adminMenu->addNavigation('modules.php'));
+ $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');
+ $xoopsTpl->assign('button_list', $adminMenu->renderButton());
+
+ $obj =& $modulesHandler->create();
+ $form = $obj->getForm();
+ $xoopsTpl->assign('form', $form->render());
+ break;
+
+ case 'save':
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
-
if (isset($_REQUEST['mod_id'])) {
$obj =& $modulesHandler->get($_REQUEST['mod_id']);
} else {
$obj =& $modulesHandler->create();
+ }
+ //Form module save
+ $obj->setVars(array('mod_name' => $_POST['mod_name'], 'mod_version' => $_POST['mod_version'],
+ 'mod_min_php' => $_POST['mod_min_php'], 'mod_min_xoops' => $_POST['mod_min_xoops'],
+ 'mod_min_admin' => $_POST['mod_min_admin'], 'mod_min_mysql' => $_POST['mod_min_mysql'],
+ 'mod_description' => $_POST['mod_description'], 'mod_author' => $_POST['mod_author'], 'mod_author_mail' => $_POST['mod_author_mail'],
+ 'mod_author_website_url' => $_POST['mod_author_website_url'],
+ 'mod_author_website_name' => $_POST['mod_author_website_name'],
+ 'mod_credits' => $_POST['mod_credits'], 'mod_license' => $_POST['mod_license'],
+ 'mod_release_info' => $_POST['mod_release_info'],
+ 'mod_release_file' => $_POST['mod_release_file'],
+ 'mod_manual' => $_POST['mod_manual'], 'mod_manual_file' => $_POST['mod_manual_file']));
+ //Form mod_image
+ include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+ $uploaddir = TDMC_UPLOAD_PATH.'/images/modules/';
+ $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes'],
+ $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attaccedFile']['name']);
+ $name_img = $_GET['mod_name'].'_slogo.'.$extension;
+ $uploader->setPrefix($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header('javascript:history.go(-1)',3, $errors);
+ } else {
+ $obj->setVar('mod_image', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('mod_image', $_POST['mod_image']);
+ }
+ //Form module save
+ $obj->setVars(array('mod_demo_site_url' => $_POST['mod_demo_site_url'],
+ 'mod_demo_site_name' => $_POST['mod_demo_site_name'],
+ 'mod_support_url' => $_POST['mod_support_url'],
+ 'mod_support_name' => $_POST['mod_support_name'],
+ 'mod_website_url' => $_POST['mod_website_url'],
+ 'mod_website_name' => $_POST['mod_website_name'],
+ 'mod_release' => $_POST['mod_release'], 'mod_status' => $_POST['mod_status'],
+ 'mod_admin' => (($_REQUEST['mod_admin'] == 1) ? '1' : '0'),
+ 'mod_user' => (($_REQUEST['mod_user'] == 1) ? '1' : '0'),
+ 'mod_submenu' => (($_REQUEST['mod_submenu'] == 1) ? '1' : '0'),
+ 'mod_search' => (($_REQUEST['mod_search'] == 1) ? '1' : '0'),
+ 'mod_comments' => (($_REQUEST['mod_comments'] == 1) ? '1' : '0'),
+ 'mod_notifications' => (($_REQUEST['mod_notifications'] == 1) ? '1' : '0')));
+
+ if ($modulesHandler->insert($obj)) {
+ redirect_header('modules.php', 2, _AM_TDMCREATE_FORMOK);
}
- //Image 'gif|jpeg|pjpeg|png' 500000
- include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- $uploaddir = XOOPS_ROOT_PATH . '/modules/'.$xoopsModule->dirname().'/images/uploads/modules/';
- $uploader = new XoopsMediaUploader($uploaddir, xoops_getModuleOption('mimetypes', $thisDirname),
- xoops_getModuleOption('maxsize', $thisDirname), null, null);
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']) ;
- $img_name = $obj->getVar('mod_name').'_slogo.'.$extension;
- $uploader->setTargetFileName($img_name);
- $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
- if (!$uploader->upload()) {
- $errors = $uploader->getErrors();
- redirect_header('javascript:history.go(-1)', 3, $errors);
- } else {
- $obj->setVar('mod_image', $uploader->getSavedFileName());
- }
- } else {
- $obj->setVar('mod_image', $_POST['mod_image']);
- }
-
- $obj->setVar('mod_name', preg_replace('/\s+/', '', $_POST['mod_name'])); //remove all spaces from the new name
- $obj->setVar('mod_version', $_POST['mod_version']);
- $obj->setVar('mod_since', $_POST['mod_since']);
- $obj->setVar('mod_min_php', $_POST['mod_min_php']);
- $obj->setVar('mod_min_xoops', $_POST['mod_min_xoops']);
- $obj->setVar('mod_min_admin', $_POST['mod_min_admin']);
- $obj->setVar('mod_min_mysql', $_POST['mod_min_mysql']);
- $obj->setVar('mod_description', $_POST['mod_description']);
- $obj->setVar('mod_author', $_POST['mod_author']);
- $obj->setVar('mod_author_mail', $_POST['mod_author_mail']);
- $obj->setVar('mod_author_website_url', $_POST['mod_author_website_url']);
- $obj->setVar('mod_author_website_name', $_POST['mod_author_website_name']);
- $obj->setVar('mod_credits', $_POST['mod_credits']);
- $obj->setVar('mod_license', $_POST['mod_license']);
- $obj->setVar('mod_release_info', $_POST['mod_release_info']);
- $obj->setVar('mod_release_file', $_POST['mod_release_file']);
- $obj->setVar('mod_manual', $_POST['mod_manual']);
- $obj->setVar('mod_manual_file', $_POST['mod_manual_file']);
- $obj->setVar('mod_demo_site_url', $_POST['mod_demo_site_url']);
- $obj->setVar('mod_demo_site_name', $_POST['mod_demo_site_name']);
- $obj->setVar('mod_support_url', $_POST['mod_support_url']);
- $obj->setVar('mod_support_name', $_POST['mod_support_name']);
- $obj->setVar('mod_website_url', $_POST['mod_website_url']);
- $obj->setVar('mod_website_name', $_POST['mod_website_name']);
- $obj->setVar('mod_release', $_POST['mod_release']);
- $obj->setVar('mod_status', $_POST['mod_status']);
- $obj->setVar('mod_admin', $_REQUEST['mod_admin']);
- $obj->setVar('mod_user', $_REQUEST['mod_user']);
- $obj->setVar('mod_search', $_REQUEST['mod_search']);
- $obj->setVar('mod_comments', $_REQUEST['mod_comments']);
- $obj->setVar('mod_notifications', $_REQUEST['mod_notifications']);
- $obj->setVar('mod_permissions', $_REQUEST['mod_permissions']);
- $obj->setVar('mod_install', $_REQUEST['mod_install']);
- $obj->setVar('mod_donations', $_POST['mod_donations']);
- $obj->setVar('mod_subversion', $_POST['mod_subversion']);
-
- if ($modulesHandler->insert($obj)) {
- redirect_header('modules.php?op=list', 2, _AM_TDMCREATE_FORMOK);
- }
+ $xoopsTpl->assign('error', $obj->getHtmlErrors());
+ $form =& $obj->getForm();
+ $xoopsTpl->assign('form', $form->render());
break;
-
- case 'new':
- $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=list', 'list');
- echo $adminMenu->renderButton();
-
- $obj =& $modulesHandler->create();
- $form = $obj->getForm();
- break;
- case 'edit':
+
+ case 'edit':
+ // Define main template
+ $xoopsOption['template_main'] = 'tdmcreate_modules.html';
+ xoops_cp_header();
+ $xoopsTpl->assign('navigation', $adminMenu->addNavigation('modules.php'));
+ $adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');
+ $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');
+ $xoopsTpl->assign('button_new', $adminMenu->renderButton());
+ $xoopsTpl->assign('button_list', $adminMenu->renderButton());
+
+ $obj = $modulesHandler->get($_REQUEST['mod_id']);
+ $form = $obj->getForm();
+ $xoopsTpl->assign('form', $form->render());
+ break;
+
+ case 'delete':
$obj =& $modulesHandler->get($_REQUEST['mod_id']);
- $form = $obj->getForm();
- break;
- case 'delete':
- $obj =& $modulesHandler->get($_REQUEST['mod_id']);
- if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1)
- {
- if (!$GLOBALS['xoopsSecurity']->check()) {
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($modulesHandler->delete($obj)) {
- $xoopsDB->queryF("DELETE FROM ".$xoopsDB->prefix("tdmcreate_modules")." WHERE mod_id = ".$_REQUEST['mod_id']);
redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
} else {
- echo $obj->getHtmlErrors();
+ $xoopsTpl->assign('error', $obj->getHtmlErrors());
}
} else {
xoops_confirm(array('ok' => 1, 'mod_id' => $_REQUEST['mod_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('mod_name')));
}
- break;
- case 'list':
- default:
- $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_NEW, 'modules.php?op=new', 'add');
- echo $adminMenu->renderButton();
-
- $criteria = new CriteriaCompo();
- $criteria->setSort('mod_id');
- $criteria->setOrder('ASC');
- $mod_arr = $modulesHandler->getall($criteria);
- $numrows_modules = $modulesHandler->getCount();
-
- if ( $numrows_modules > 0 )
- {
- echo '<table width="100%" cellspacing="1" class="outer">';
- echo '<tr class="center">';
- echo '<th width="1%">'._AM_TDMCREATE_ID.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
- echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
- echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
- echo '<th width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
- echo '</tr>';
- $class = 'odd';
- foreach (array_keys($mod_arr) as $i)
- {
- $mod_id = $mod_arr[$i]->getVar('mod_id');
- $mod_name = $mod_arr[$i]->getVar('mod_name');
- $mod_image = $mod_arr[$i]->getVar('mod_image');
- //$mod_blocks = $mod_arr[$i]->getVar('mod_blocks');
- $mod_admin = $mod_arr[$i]->getVar('mod_admin');
- $mod_user = $mod_arr[$i]->getVar('mod_user');
- $admin = ($mod_admin == 1) ? _YES : _NO;
- $user = ($mod_user == 1) ? _YES : _NO;
- echo '<tr class="odd center">';
- echo '<td><b>'.$i.'</b></td>';
- $nbsps = ' ';
- echo '<td class="left">'.$nbsps.'<img src="../images/icons/16/arrow.gif" alt="Arrow" />'.$nbsps.'<b>'.$mod_name.'</b></td>';
- echo '<td><img src="../images/uploads/modules/'.$mod_image.'" height="30px" /></td>';
- echo '<td>'.$admin.'</td>';
- echo '<td>'.$user.'</td>';
- echo '<td>';
- echo '<a href="modules.php?op=edit&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._EDIT.'" title="'._EDIT.'" /></a> <a href="modules.php?op=delete&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._DELETE.'" title="'._DELETE.'" /></a>';
- echo '</td>';
- echo '</tr>';
- }
- echo '</table><br><br>';
- } else {
- echo '<table width="100%" cellspacing="1" class="outer">';
- echo '<tr class="center">';
- echo '<th width="1%">'._AM_TDMCREATE_ID.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
- echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
- echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
- echo '<th width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
- echo '<tr><td class="errorMsg" colspan="8">No modules</td></tr>';
- echo '</tr></table><br><br>';
- }
- break;
+ break;
}
-include_once 'footer.php';
\ No newline at end of file
+include 'footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-03-13 21:55:43 UTC (rev 12373)
@@ -1,198 +1,164 @@
-<?php
+<?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.
+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.
- */
+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.5.0
- * @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: tables.php 11084 2013-02-23 15:44:20Z timgno $
- */
-include_once 'header.php';
-$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
-$table_id = TDMCreate_CleanVars( $_REQUEST, 'table_id', 0 );
-echo $adminMenu->addNavigation('tables.php');
-switch ($op) {
- case 'save_table':
- if (isset($_REQUEST['table_id'])) {
- $obj =& $tablesHandler->get($_REQUEST['table_id']);
- } else {
- $obj =& $tablesHandler->create();
- }
+* 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.5.5
+* @author Txmod Xoops <su...@tx...>
+* @version $Id: 1.59 tables.php 11297 2013-03-24 10:58:10Z timgno $
+*/
+include 'header.php';
+// Recovered the value of the argument op in the URL $
+$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+$mod_id = TDMCreate_CleanVars($_REQUEST, 'mod_id', 0);
+switch ($op)
+{
+ case 'list':
+ default:
+ $limit = xoops_getModuleOption('adminperpage');
+ $start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
+ // Define main template
+ $xoopsOption['template_main'] = 'tdmcreate_tables.html';
+ xoops_cp_header();
+ $GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/style.css' );
+ $GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
- //Module Name
- $modules =& $modulesHandler->get($_REQUEST['table_mid']);
- $mod_name = $modules->getVar('mod_name');
-
- $obj->setVar('table_mid', $_REQUEST['table_mid']);
-
- if ( $_REQUEST['select'] == 1 )
- {
- $obj->setVar('table_name', 'categories');
- $obj->setVar('table_category', 1);
- $obj->setVar('table_fieldname', 'cat');
- $obj->setVar('table_blocks', 0);
- $obj->setVar('table_admin', 1);
- $obj->setVar('table_user', 1);
- $obj->setVar('table_status', 0);
- $obj->setVar('table_waiting', 0);
- $obj->setVar('table_online', 0);
- $obj->setVar('table_search', 0);
- $obj->setVar('table_comments', 0);
- $obj->setVar('table_notifications', 0);
- $obj->setVar('table_permissions', 0);
- $obj->setVar('table_nbfields', 7);
-
- $table_fields = 'cat_id:int:8:unsigned:NOT NULL: :primary|cat_pid:int:5:unsigned:NOT NULL:0:unique|cat_title:varchar:255: :NOT NULL: :unique|cat_desc:text: : :NOT NULL: :|cat_image:varchar:255: :NOT NULL: :|cat_weight:int:5:unsigned:NOT NULL:0:|cat_color:varchar:10: :NULL: :';
-
- $table_parameters = 'XoopsFormCategory:0:0:0:0:0:1|XoopsFormText:1:1:0:1:0:1|XoopsFormTextArea:0:1:0:0:0:1|XoopsFormUploadImage:1:1:0:0:0:0|XoopsFormText:1:1:0:0:0:0|XoopsFormColorPicker:1:1:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1';
-
- //Image
- include_once XOOPS_ROOT_PATH.'/class/uploader.php';
-
- if(is_dir($pathIcon32)){
- $uploaddir = $pathIcon32;
- }else{
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
- }
-
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
- $name_img = 'category.'.$extension;
- $uploader->setTargetFileName($name_img);
- $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
- if (!$uploader->upload()) {
- $errors = $uploader->getErrors();
- redirect_header("javascript:history.go(-1)",3, $errors);
- } else {
- $obj->setVar('table_image', $uploader->getSavedFileName());
- }
- } else {
- $obj->setVar('table_image', $_REQUEST['table_image1']);
- }
+ $xoopsTpl->assign('navigation', $adminMenu->addNavigation('tables.php'));
+ $adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
+ $xoopsTpl->assign('button_new', $adminMenu->renderButton());
+ $xoopsTpl->assign('tdmc_url', TDMC_URL);
+ $xoopsTpl->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
+ $xoopsTpl->assign('pathIcon32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32');
+ // Get the list of modules
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('mod_id ASC, mod_name');
+ $criteria->setOrder('ASC');
+ $numrows_modules = $modulesHandler->getCount();
+ // Redirect if there aren't modules
+ if ( $numrows_modules == 0 ) {
+ redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
+ }
+ $mods_arr = $modulesHandler->getAll($criteria);
+ unset($criteria);
+ // Display modules list
+ if ( $numrows_modules > 0 )
+ {
+ $_yyes = "<img src='../images/icons/16/yellow.png' alt='"._YES."' title='"._YES."' />";
+ $_no = "<img src='../images/icons/16/red.png' alt='"._NO."' title='"._NO."' />";
+ foreach (array_keys($mods_arr) as $i)
+ {
+ $mod['id'] = $i;
+ $mod['name'] = $mods_arr[$i]->getVar('mod_name');
+ $mod['image'] = $mods_arr[$i]->getVar('mod_image');
+ $mod['admin'] = ( $mods_arr[$i]->getVar('mod_admin') == 1 ) ? $_yyes : $_no;
+ $mod['user'] = ( $mods_arr[$i]->getVar('mod_user') == 1 ) ? $_yyes : $_no;
+ $mod['submenu'] = ( $mods_arr[$i]->getVar('mod_submenu') == 1 ) ? $_yyes : $_no;
+ $mod['search'] = ( $mods_arr[$i]->getVar('mod_search') == 1 ) ? $_yyes : $_no;
+ $mod['comments'] = ( $mods_arr[$i]->getVar('mod_comments') == 1 ) ? $_yyes : $_no;
+ $mod['notifications'] = ( $mods_arr[$i]->getVar('mod_notifications') == 1 ) ? $_yyes : $_no;
+ // Get the list of tables
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('table_mid', $i));
+ $criteria->setSort('table_id ASC, table_name');
+ $criteria->setOrder('ASC');
+ $numrows_tables = $tablesHandler->getCount();
+ $tables_arr = $tablesHandler->getAll($criteria);
+ unset($criteria);
+ // Display tables list
+ $tables = array();
+ if ( $numrows_tables > 0 )
+ {
+ $_yes = "<img src='../images/icons/16/green.png' alt='"._YES."' title='"._YES."' />";
+ foreach (array_keys($tables_arr) as $t)
+ {
+ $table['id'] = $t;
+ $table['mid'] = $tables_arr[$t]->getVar('table_mid');
+ $table['name'] = $tables_arr[$t]->getVar('table_name');
+ $table['image'] = $tables_arr[$t]->getVar('table_image');
+ $table['nbfields'] = $tables_arr[$t]->getVar('table_nbfields');
+ $table['blocks'] = ( $tables_arr[$t]->getVar('table_blocks') == 1 ) ? $_yes : $_no;
+ $table['admin'] = ( $tables_arr[$t]->getVar('table_admin') == 1 ) ? $_yes : $_no;
+ $table['user'] = ( $tables_arr[$t]->getVar('table_user') == 1 ) ? $_yes : $_no;
+ $table['submenu'] = ( $tables_arr[$t]->getVar('table_submenu') == 1 ) ? $_yes : $_no;
+ $table['search'] = ( $tables_arr[$t]->getVar('table_search') == 1 ) ? $_yes : $_no;
+ $table['comments'] = ( $tables_arr[$t]->getVar('table_comments') == 1 ) ? $_yes : $_no;
+ $table['notifications'] = ( $tables_arr[$t]->getVar('table_notifications') == 1 ) ? $_yes : $_no;
+ $tables[] = $table;
+ unset($table);
+ }
+ }
+ $mod['tables'] = $tables;
+ $xoopsTpl->append('modules_list', $mod);
+ unset($mod);
+ }
+ if ( $numrows_modules > $limit ) {
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
+ $xoopsTpl->assign('pagenav', $pagenav->renderNav(4));
+ }
} else {
-
- $obj->setVar('table_name', strtolower($_REQUEST['table_name']));
- $obj->setVar('table_fieldname', strtolower($_REQUEST['table_fieldname']));
- $obj->setVar('table_nbfields', $_REQUEST['table_nbfields']);
- $obj->setVar('table_blocks', $_REQUEST['table_blocks']);
- $obj->setVar('table_admin', $_REQUEST['table_admin']);
- $obj->setVar('table_user', $_REQUEST['table_user']);
- $obj->setVar('table_status', $_REQUEST['table_status']);
- $obj->setVar('table_waiting', $_REQUEST['table_waiting']);
- $obj->setVar('table_online', $_REQUEST['table_online']);
- $obj->setVar('table_search', $_REQUEST['table_search']);
- $obj->setVar('table_comments', $_REQUEST['table_comments']);
- $obj->setVar('table_notifications', $_REQUEST['table_notifications']);
- $obj->setVar('table_permissions', $_REQUEST['table_permissions']);
-
- $table_fields = '';
- $table_parameters = '';
- for($i=0; $i<$_REQUEST['table_nbfields']; $i++)
- {
- //Additions of parameters: text: on: off: ...
- if ( $i != 0 ) {
- $table_parameters .= ( !empty($_REQUEST['fields_param_elements'][$i]) ) ? "".$_REQUEST['fields_param_elements'][$i].":" : " :";
- $table_parameters .= ( !empty($_REQUEST['fields_param_admin'][$i]) ) ? "1:" : "0:";
- $table_parameters .= ( !empty($_REQUEST['fields_param_user'][$i]) ) ? "1:" : "0:";
- $table_parameters .= ( !empty($_REQUEST['fields_param_blocks'][$i]) ) ? "1:" : "0:";
- $table_parameters .= ( $i == $_REQUEST['fields_param_main_field']) ? "1:" : "0:";
- $table_parameters .= ( !empty($_REQUEST['fields_param_search_field'][$i]) ) ? "1:" : "0:";
- $table_parameters .= ( !empty($_REQUEST['fields_param_required_field'][$i]) ) ? "1" : "0";
- }
-
- //Additions of fields: test: int: 4: ...
- $table_fields .= (!empty($_REQUEST['fields_name'][$i])) ? $_REQUEST['fields_name'][$i].":" : " :";
- $table_fields .= (!empty($_REQUEST['fields_type'][$i])) ? $_REQUEST['fields_type'][$i].":" : " :";
- $table_fields .= (!empty($_REQUEST['fields_value'][$i])) ? $_REQUEST['fields_value'][$i].":" : " :";
- $table_fields .= (!empty($_REQUEST['fields_attributes'][$i])) ? $_REQUEST['fields_attributes'][$i].":" : " :";
- $table_fields .= (!empty($_REQUEST['fields_null'][$i])) ? strtoupper($_REQUEST['fields_null'][$i]).":" : " :";
- $table_fields .= (!empty($_REQUEST['fields_default'][$i])) ? $_REQUEST['fields_default'][$i].":" : " :";
- $table_fields .= (!empty($_REQUEST['fields_index'][$i])) ? $_REQUEST['fields_index'][$i]."" : " ";
-
- // Break between fields and between the parameters
- if ( $i != $_REQUEST['table_nbfields'] - 1) {
- $table_fields .= '|';
- if ( $i != 0 )
- $table_parameters .= '|';
- } else {
- if ( isset($_REQUEST['table_status']) ) {
- if ( $_REQUEST['table_status'] == 1 ) {
- $table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_status:int:10:unsigned:NOT NULL:0:';
- $table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
- }
- } else {
- $table_fields .= '';
- $table_parameters .= '';
- }
- if ( isset($_REQUEST['table_waiting']) ) {
- if ( $_REQUEST['table_waiting'] == 1 ) {
- $table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_waiting:int:10:unsigned:NOT NULL:0:';
- $table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
- }
- } else {
- $table_fields .= '';
- $table_parameters .= '';
- }
- if ( isset($_REQUEST['table_online']) ) {
- if ( $_REQUEST['table_online'] == 1 ) {
- $table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_online:tinyint:1: unsigned:NOT NULL:0:'; $table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
- }
- } else {
- $table_fields .= '';
- $table_parameters .= '';
- }
- }
- }
- }
- $obj->setVar('table_fields', $table_fields);
- $obj->setVar('table_parameters', $table_parameters);
-
- if ($tablesHandler->insert($obj)) {
- redirect_header('tables.php', 2, _AM_TDMCREATE_FORMOK);
+ $xoopsTpl->assign('error', 'There aren\'t modules');
}
-
break;
-
- case 'table_save_fields':
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+
+ case 'new':
+ // Define main template
+ $xoopsOption['template_main'] = 'tdmcreate_tables.html';
+ xoops_cp_header();
+ $xoopsTpl->assign('navigation', $adminMenu->addNavigation('tables.php'));
+ $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
+ $xoopsTpl->assign('button_new', $adminMenu->renderButton());
+
+ $obj =& $tablesHandler->create();
+ $form = $obj->getForm();
+ $xoopsTpl->assign('form', $form->render());
+ break;
+
+ case 'save':
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
-
- if (isset($_REQUEST['table_id'])) {
- $obj =& $tablesHandler->get($_REQUEST['table_id']);
+ $table_id = TDMCreate_CleanVars($_REQUEST, 'table_id', 0, 'int');
+ if (isset($table_id)) {
+ $obj =& $tablesHandler->get($table_id);
} else {
- $obj =& $tablesHandler->create();
+ $obj =& $tablesHandler->create();
}
- //Module Name
- $modules =& $modulesHandler->get($_REQUEST['table_mid']);
- $mod_name = $modules->getVar('mod_name');
-
- //Image
+
+ $table_mid = intval($_REQUEST['table_mid']);
+ $table_nbfields = intval($_REQUEST['table_nbfields']);
+ $table_fieldname = strtolower($_REQUEST['table_fieldname']);
+ $_SESSION['field_tid'] = $tid;
+ $_SESSION['field_mid'] = $table_mid;
+ $_SESSION['field_numb'] = $table_nbfields;
+ $_SESSION['field_name'] = $table_fieldname;
+ //Form tables
+ $obj->setVars(array('table_mid' => $table_mid, 'table_name' => $_POST['table_name'],
+ 'table_nbfields' => $table_nbfields, 'table_fieldname' => $table_fieldname));
+ //Form table_image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
if(is_dir($pathIcon32)){
- $uploaddir = $pathIcon32;
+ $uploaddir = $pathIcon32;
}else{
- $uploaddir = XOOPS_ROOT_PATH . '/modules/'.$xoopsModule->dirname().'/images/uploads/tables/';
- }
- $uploader = new XoopsMediaUploader($uploaddir, 'gif|jpeg|pjpeg|png', 104857600, null, null);
-
+ $uploaddir = TDMC_UPLOAD_PATH.'/images/tables';
+ }
+ $uploader = new XoopsMediaUploader($uploaddir, xoops_getModuleOption('mimetypes'),
+ xoops_getModuleOption('maxsize'), null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']);
- $name_img = $_REQUEST['table_name'].'.'.$extension;
- $uploader->setTargetFileName($name_img);
+ $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['table_image']['name']);
+ $name_img = $_GET['table_name'].'.'.$extension;
+ $uploader->setPrefix($name_img);
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
@@ -201,65 +167,47 @@
$obj->setVar('table_image', $uploader->getSavedFileName());
}
} else {
- $obj->setVar('table_image', $_REQUEST['table_image']);
- }
+ $obj->setVar('table_image', $_POST['table_image']);
+ }
+ $obj->setVars(array('table_blocks' => (($_REQUEST['table_blocks'] == 1) ? '1' : '0'),
+ 'table_admin' => (($_REQUEST['table_admin'] == 1) ? '1' : '0'),
+ 'table_user' => (($_REQUEST['table_user'] == 1) ? '1' : '0'),
+ 'table_submenu' => (($_REQUEST['table_submenu'] == 1) ? '1' : '0'),
+ 'table_search' => (($_REQUEST['table_search'] == 1) ? '1' : '0'),
+ 'table_comments' => (($_REQUEST['table_comments'] == 1) ? '1' : '0'),
+ 'table_notifications' => (($_REQUEST['table_notifications'] == 1) ? '1' : '0')));
+ if( $tablesHandler->insert($obj) ) {
+ if( $obj->isNew() ) {
+ $tid = $GLOBALS['xoopsDB']->getInsertId();
+ redirect_header('fields.php?op=new&field_tid='.$tid, 3, _AM_TDMCREATE_FORMOK);
+ } else {
+ redirect_header('tables.php', 3, _AM_TDMCREATE_FORMOK);
+ }
+ }
- $oldname = $obj->getVar('table_fieldname');
+ $xoopsTpl->assign('error', $obj->getHtmlErrors());
+ $form = $obj->getForm();
+ $xoopsTpl->assign('form', $form->render());
+ break;
- $obj->setVar('table_mid', strtolower($_POST['table_mid']));
- $obj->setVar('table_name', strtolower($_POST['table_name']));
- $obj->setVar('table_fieldname', strtolower($_POST['table_fieldname']));
- $obj->setVar('table_nbfields', $_POST['table_nbfields']);
- $obj->setVar('table_blocks', $_REQUEST['table_blocks']);
- $obj->setVar('table_admin', $_REQUEST['table_admin']);
- $obj->setVar('table_user', $_REQUEST['table_user']);
- $obj->setVar('table_status', $_REQUEST['table_status']);
- $obj->setVar('table_waiting', $_REQUEST['table_waiting']);
- $obj->setVar('table_online', $_REQUEST['table_online']);
- $obj->setVar('table_search', $_REQUEST['table_search']);
- $obj->setVar('table_comments', $_REQUEST['table_comments']);
- $obj->setVar('table_notifications', $_REQUEST['table_notifications']);
- $obj->setVar('table_permissions', $_REQUEST['table_permissions']);
+ case 'edit':
+ // Define main template
+ $xoopsOption['template_main'] = 'tdmcreate_tables.html';
+ xoops_cp_header();
+ $xoopsTpl->assign('navigation', $adminMenu->addNavigation('tables.php'));
+ $adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
+ $xoopsTpl->assign('button_new', $adminMenu->renderButton());
+
+ $obj = $tablesHandler->get($_REQUEST['table_id']);
+ $form = $obj->getForm();
+ $xoopsTpl->assign('form', $form->render());
+ break;
- $table_fields = $obj->getVar('table_fields');
- $table_nbfields=$_REQUEST['table_nbfields'];
-
- $fields_total = explode('|', $table_fields);
- $count_fields = count($fields_total);
-
- $newname = strtolower($_REQUEST['table_fieldname']);
- //echo $count_parameters;
- //fields
- for($i=0; $i<$count_fields; $i++)
- {
- $fields = explode(":", $fields_total[$i]);
- $fields[0] = $newname . substr($fields[0], stripos($fields[0], '_'));
- $newfields[$i] = implode(":", $fields);
- }
-
- $newTableFields=implode("|",$newfields);
- $obj->setVar('table_fields', $newTableFields);
-
- if ($tablesHandler->insert($obj)) {
- redirect_header('tables.php', 2, _AM_TDMCREATE_FORMOK);
- }
- break;
-
- case "edit_table":
+ case 'delete':
$obj =& $tablesHandler->get($_REQUEST['table_id']);
- $form = $obj->getFormTable(false, $_REQUEST['table_mid']);
- break;
-
- case "edit_fields":
- $obj =& $tablesHandler->get($_REQUEST['table_id']);
- $form = $obj->getFormEditFields(false, $_REQUEST['table_id']);
- break;
-
- case "delete_table":
- $obj =& $tablesHandler->get($_REQUEST['table_id']);
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($tablesHandler->delete($obj)) {
@@ -268,216 +216,8 @@
echo $obj->getHtmlErrors();
}
} else {
- xoops_confirm(array('ok' => 1, 'table_id' => $_REQUEST['table_id'], 'op' => 'delete_table'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('table_name')));
+ xoops_confirm(array('ok' => 1, 'table_id' => $_REQUEST['table_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('table_name')));
}
- break;
-
- case "table_fields":
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=table_list', 'list');
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=table_fields', 'add');
- echo $adminMenu->renderButton();
-
- //fields existe deja ?
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('table_mid', $_REQUEST['table_mid']));
- $criteria->add(new Criteria('table_name', $_REQUEST['table_name']));
- $nb_tables1 = $tablesHandler->getCount($criteria);
-
- if ( $nb_tables1 < 1 )
- {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($_REQUEST['table_id'])) {
- $obj =& $tablesHandler->get($_REQUEST['table_id']);
- } else {
- $obj =& $tablesHandler->create();
- }
- $table_blocks = (isset($_REQUEST['table_blocks'])) ? $_REQUEST['table_blocks'] : '0';
- $table_display_admin = (isset($_REQUEST['table_admin'])) ? $_REQUEST['table_admin'] : '0';
- $table_display_user = (isset($_REQUEST['table_user'])) ? $_REQUEST['table_user'] : '0';
- $table_status = (isset($_REQUEST['table_status'])) ? $_REQUEST['table_status'] : '0';
- $table_waiting = (isset($_REQUEST['table_waiting'])) ? $_REQUEST['table_waiting'] : '0';
- $table_online = (isset($_REQUEST['table_online'])) ? $_REQUEST['table_online'] : '0';
- $table_search = (isset($_REQUEST['table_search'])) ? $_REQUEST['table_search'] : '0';
- $table_comments = (isset($_REQUEST['table_comments'])) ? $_REQUEST['table_comments'] : '0';
- $table_notifications = (isset($_REQUEST['table_notifications'])) ? $_REQUEST['table_notifications'] : '0';
- $table_permissions = (isset($_REQUEST['table_permissions'])) ? $_REQUEST['table_permissions'] : '0';
-
- $select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0';
-
- //Image
- include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- if(!is_dir($pathIcon32)){
- $uploaddir = $pathIcon32;
- }else{
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
- }
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']);
- $name_img = $_REQUEST['table_fieldname'].'.'.$extension;
- $uploader->setTargetFileName($name_img);
- $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
- if (!$uploader->upload()) {
- $errors = $uploader->getErrors();
- redirect_header("javascript:history.go(-1)",3, $errors);
- } else {
- $obj->setVar('table_image', $uploader->getSavedFileName());
- }
- } else {
- $obj->setVar('table_image', $_REQUEST['table_image']);
- }
-
- if ($tablesHandler->insert($obj)) {
- $table_id = $xoopsDB->getInsertId();
- $obj = $tablesHandler->get($table_id);
- $form = $obj->getFormFields(false, $table_id, intval($_REQUEST['table_mid']), strtolower($_REQUEST['table_name']), strtolower($_REQUEST['table_fieldname']), $table_blocks, $table_display_admin, $table_display_user, $table_status, $table_waiting, $table_online, $table_search, $table_comments, $table_notifications, $table_permissions, intval($_REQUEST['table_nbfields']), $select);
- }
- } else {
- redirect_header('tables.php', 2, _AM_TDMCREATE_TABLES_EXIST);
- }
- break;
-
- case "create_table":
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW_CATEGORY, 'tables.php?op=create_category', 'add');
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=table_list', 'list');
- echo $adminMenu->renderButton();
-
- $table_mid = TDMCreate_CleanVars( $_REQUEST, 'table_mid', 0);
- $obj =& $tablesHandler->create();
- $form = $obj->getFormTable(false, $table_mid);
- break;
-
- case "create_category":
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=create_table', 'add');
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=table_list', 'list');
- echo $adminMenu->renderButton();
-
- $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("mod_tdmcreate_tables")." WHERE table_name = 'categories'");
- list( $category ) = $xoopsDB->fetchRow($result);
- $obj =& $tablesHandler->get($_REQUEST['table_id']);
- if ( $category >= 0 ) {
- $form = $obj->getFormCategory();
- }
- break;
-
- case "table_list":
- default:
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=create_table', 'add');
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW_CATEGORY, 'tables.php?op=create_category', 'add');
- echo $adminMenu->renderButton();
-
- $GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/style.css' );
- $GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
-
- // Remove unnecessary tables
- /*$sql = "SELECT table_id FROM ".$xoopsDB->prefix("mod_tdmcreate_tables")." WHERE table_mid = 0";
- $result = $xoopsDB->queryF($sql);
- while ( $myrow = $xoopsDB->fetchArray($result) )
- {
- $sql_del = "DELETE FROM ".$xoopsDB->prefix("mod_tdmcreate_tables")." WHERE table_id = ".$myrow['table_id']."";
- $xoopsDB->queryF($sql_del);
- }*/
- $obj =& $tablesHandler->get($table_id);
- if ($tablesHandler->deleteAll($obj)) {
- redirect_header('tables.php', 3, _AM_TDMCREATE_FORMDELOK);
- }
-
- $criteria = new CriteriaCompo();
- $criteria->add( new Criteria('mod_id', 0, '!=') );
- $criteria->setSort('mod_id');
- $criteria->setOrder('ASC');
- $mod_arr = $modulesHandler->getAll($criteria);
- $numrows_modules = $modulesHandler->getCount($criteria);
-
- if ( $numrows_modules > 0 )
- {
- echo '<table width="100%" cellspacing="1" class="outer">';
- echo '<tr>';
- echo '<th class="center width1">'._AM_TDMCREATE_ID.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_NAME.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_IMAGE.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_BLOCKS.'</th>';
- echo '<th class="center width10">'._AM_TDMCREATE_NB_FIELDS.'</th>';
- echo '<th class="center width5">'._AM_TDMCREATE_FORMACTION.'</th>';
- echo '</tr>';
- $class = 'odd';
- foreach (array_keys($mod_arr) as $i)
- {
- $mod_id = $mod_arr[$i]->getVar('mod_id');
- $mod_name = $mod_arr[$i]->getVar('mod_name');
- $mod_image = $mod_arr[$i]->getVar('mod_image');
- $mod_display_admin = ($mod_arr[$i]->getVar('mod_display_admin') == 1) ? _YES : _NO;
- $mod_display_user = ($mod_arr[$i]->getVar('mod_display_user') == 1) ? _YES : _NO;
- echo '<tr class="odd center toggleTables">';
- echo '<td class="width5"><b>'.$i.'</b><br /><img src="../images/icons/16/toggle.png" alt="Toggle" title="Toggle" /></td>';
- $nbsps = ' ';
- echo '<td class="left">'.$nbsps.'<img src="../images/icons/16/arrow.gif" alt="Arrow" />'.$nbsps.'<b>'.$mod_name.'</b></td>';
- echo '<td><img src="../images/uploads/modules/'.$mod_image.'" height="30px"></td>';
- echo '<td>'.$mod_display_admin.'</td>';
- echo '<td>'.$mod_display_user.'</td>';
- echo '<td>~</td>';
- echo '<td>~</td>';
- echo '<td>';
- echo '<a href="modules.php?op=edit&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._EDIT.'" title="'._EDIT.'" /></a> <a href="modules.php?op=delete&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._DELETE.'" title="'._DELETE.'" /></a>';
- echo '</td>';
- echo '</tr>';
-
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('table_mid', $mod_id));
- $criteria->setSort('table_name');
- $criteria->setOrder('ASC');
- $table_arr = $tablesHandler->getall($criteria);
- $numrows_tables = $tablesHandler->getCount();
- if ( $numrows_tables != 0 )
- {
- foreach (array_keys($table_arr) as $i)
- {
- $table_name = $table_arr[$i]->getVar('table_name');
- $table_image = $table_arr[$i]->getVar('table_image');
- $table_blocks = $table_arr[$i]->getVar('table_blocks');
- $table_admin = (($table_arr[$i]->getVar('table_admin') == 1) ? _YES : _NO);
- $table_user = (($table_arr[$i]->getVar('table_user') == 1) ? _YES : _NO);
- $nb_fields = $table_arr[$i]->getVar('table_nbfields');
- $blocks = ($table_blocks == 1) ? _YES : _NO;
- echo '<tr class="even center toggleHidden">';
- echo '<td class="center">'.$i.'</b></a></td>';
- echo '<td class="left"> <b>- '.$table_name.'</b></a></td>';
- if(file_exists($image = $pathIcon32.'/'.$table_image)) {
- echo '<td><img src="'.$image.'" height="25px"></td>';
- } else {
- echo '<td><img src="../images/uploads/tables/'.$table_image.'" height="25px"></td>';
- }
- echo '<td>'.$table_admin.'</td>';
- echo '<td>'.$table_user.'</td>';
- echo '<td>'.$blocks.'</td>';
- echo '<td>'.$nb_fields.'</td>';
- echo '<td class="width6">';
- echo '<a href="tables.php?op=edit_table&table_id='.$i.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_fields&table_id='.$i.'"><img src="'. $pathIcon16 .'/inserttable.png" alt="'._AM_TDMCREATE_FORMFIELDS.'" title="'._AM_TDMCREATE_FORMFIELDS.'" /></a> <a href="tables.php?op=delete_table&table_id='.$i.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
- echo '</td>';
- echo '</tr>';
- }
- }
- }
- echo '</table>';
- } else {
- echo '<table width="100%" cellspacing="1" class="outer">';
- echo '<tr class="center">';
- echo '<th width="1%">'._AM_TDMCREATE_ID.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
- echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
- echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_BLOCKS.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_NB_FIELDS.'</th>';
- echo '<th width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
- echo '<tr><td class="errorMsg" colspan="8">There are no modules</td></tr>';
- echo '</tr></table><br><br>';
- }
- break;
+ break;
}
include 'footer.php';
\ No newline at end of file
Deleted: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/architecture.php 2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/architecture.php 2014-03-13 21:55:43 UTC (rev 12373)
@@ -1,110 +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 a...
[truncated message content] |
