Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11008] XoopsModules26/tdmcreate/branches/2.01/timgno /tdmcreate
|
From: <txm...@us...> - 2013-02-07 21:28:27
|
Revision: 11008
http://sourceforge.net/p/xoops/svn/11008
Author: txmodxoops
Date: 2013-02-07 21:28:19 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
Added more files
Updated all
Added Locale folder and files
Modified Paths:
--------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.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/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/import.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/import.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/install.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_extensions.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
Added Paths:
-----------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/common.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/forms.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/functions.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/en_US.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/locale.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/templates/
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/templates/help.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/templates/index.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/index.html
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php 2013-02-07 21:07:43 UTC (rev 11007)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php 2013-02-07 21:28:19 UTC (rev 11008)
@@ -8,21 +8,17 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-
/**
- * tdmcreate extension
+ * 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: extensions.php 10665 2012-12-27 10:14:15Z timgno $
+ * @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: extensions.php 10665 2012-12-27 10:14:15Z timgno $
*/
include dirname(__FILE__) . '/header.php';
-// Get main instance
-$system = System::getInstance();
-$xoops = Xoops::getInstance();
// Preferences Limit
$nb_pager = $xoops->getModuleConfig('pager');
// Get Action type
@@ -37,41 +33,59 @@
/* @var $extensions_handler TDMCreateExtensionsHandler */
$extensions_Handler = $xoops->getModuleHandler('extensions');
-$admin_page = new XoopsModuleAdmin();
-$admin_page->renderNavigation('extensions.php');
+$admin_menu->renderNavigation('extensions.php');
switch ($op)
{
- case "list":
+ case 'list':
default:
- $admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_EXTENSION, 'extensions.php?op=new', 'add');
- $admin_page->renderButton();
+ $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_EXTENSION, 'extensions.php?op=new', 'add');
+ $admin_menu->renderButton();
$criteria = new CriteriaCompo();
- $criteria->setSort("ext_name");
- $criteria->setOrder("ASC");
+ $criteria->setSort('ext_name');
+ $criteria->setOrder('ASC');
$criteria->setStart($start);
$criteria->setLimit($limit);
- $numrows = $extensions_Handler->getCount($criteria);
- $xoops->tpl()->assign('eimg_path', XOOPS_UPLOAD_URL.'/tdmcreate/images/extensions/');
- $xoops->tpl()->assign('extensions', $extensions_Handler->getObjects($criteria, true, false));
- $xoops->tpl()->assign('extensions_list', true);
- $xoops->tpl()->assign('extension', true);
- unset($criteria);
- // Display Page Navigation
- if ($numrows > $nb_pager) {
- $nav = new XoopsPageNav($numrows, $nb_pager, $start, 'start');
- $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ $numrows_exts = $extensions_Handler->getCount($criteria);
+ $exts_arr = $extensions_Handler->getAll($criteria);
+ $xoops->tpl()->assign('eimg_path', TDMC_EXTENSIONS_URL_IMG);
+ $xoops->tpl()->assign('extensions_count', $numrows_exts);
+ unset($criteria);
+ if ($numrows_mods > 0) {
+ foreach (array_keys($exts_arr) as $i) {
+ $ext['id'] = $exts_arr[$i]->getVar('ext_id');
+ $ext['name'] = $exts_arr[$i]->getVar('ext_name');
+ $ext['version'] = $exts_arr[$i]->getVar('ext_version');
+ $ext['release'] = $exts_arr[$i]->getVar('ext_release');
+ $ext['status'] = $exts_arr[$i]->getVar('ext_status');
+ $ext['admin'] = $exts_arr[$i]->getVar('ext_admin');
+ $ext['user'] = $exts_arr[$i]->getVar('ext_user');
+ $ext['submenu'] = $exts_arr[$i]->getVar('ext_submenu');
+ $ext['search'] = $exts_arr[$i]->getVar('ext_search');
+ $ext['comments'] = $exts_arr[$i]->getVar('ext_comments');
+ $ext['notifications'] = $exts_arr[$i]->getVar('ext_notifications');
+ $xoops->tpl()->append_by_ref('extensions', $ext);
+ unset($ext);
+ }
+ // Display Page Navigation
+ if ($numrows_exts > $nb_pager) {
+ $nav = new XoopsPageNav($numrows_exts, $nb_pager, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
+ } else {
+ $xoops->tpl()->assign('error_message', _AM_TDMCREATE_EXTENSION_ERROR_NOEXTENSIONS);
}
break;
- case "new":
- $admin_page->addItemButton(_AM_TDMCREATE_EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
- $admin_page->renderButton();
+
+ case 'new':
+ $admin_menu->addItemButton(_AM_TDMCREATE_EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
+ $admin_menu->renderButton();
$obj = $extensions_Handler->create();
$form = $xoops->getModuleForm($obj, 'extensions');
$xoops->tpl()->assign('form', $form->render());
break;
- case "save":
+ case 'save':
if (!$xoops->security()->check()) {
$xoops->redirect('extensions.php', 3, implode(',', $xoops->security()->getErrors()));
}
@@ -82,50 +96,51 @@
$obj = $extensions_Handler->create();
}
//Form extension save
- $obj->setVars(array("ext_name" => $_POST["ext_name"], "ext_version" => $_POST["ext_version"],
- "ext_description" => $_POST["ext_description"], "ext_author" => $_POST["ext_author"],
- "ext_author_mail" => $_POST["ext_author_mail"], "ext_author_website_url" => $_POST["ext_author_website_url"],
- "ext_author_website_name" => $_POST["ext_author_website_name"], "ext_credits" => $_POST["ext_credits"],
- "ext_license" => $_POST["ext_license"], "ext_release_info" => $_POST["ext_release_info"],
- "ext_release_file" => $_POST["ext_release_file"], "ext_manual" => $_POST["ext_manual"],
- "ext_manual_file" => $_POST["ext_manual_file"]));
+ $obj->setVars(array('ext_name' => $_POST['ext_name'], 'ext_version' => $_POST['ext_version'],
+ 'ext_description' => $_POST['ext_description'], 'ext_author' => $_POST['ext_author'],
+ 'ext_author_mail' => $_POST['ext_author_mail'], 'ext_author_website_url' => $_POST['ext_author_website_url'],
+ 'ext_author_website_name' => $_POST['ext_author_website_name'], 'ext_credits' => $_POST['ext_credits'],
+ 'ext_license' => $_POST['ext_license'], 'ext_release_info' => $_POST['ext_release_info'],
+ 'ext_release_file' => $_POST['ext_release_file'], 'ext_manual' => $_POST['ext_manual'],
+ 'ext_manual_file' => $_POST['ext_manual_file']));
//Form extension_image
- $uploaddir = XOOPS_UPLOAD_PATH."/tdmcreate/images/extensions/";
- $uploader_img = new XoopsMediaUploader($uploaddir, $xoops->getModuleConfig('mimetypes'),
+ $uploader_img = new XoopsMediaUploader(TDMC_EXTENSIONS_PATH_IMG, $xoops->getModuleConfig('mimetypes'),
$xoops->getModuleConfig('maxsize'), null, null);
- if ($uploader_img->fetchMedia("extensions_image")) {
- $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["ext_image"]['name']);
- $name_img = $_GET['ext_name'].'_slogo.'.$extension;
+ if ($uploader_img->fetchMedia('extensions_image')) {
+ $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['ext_image']['name']);
+ $name_img = 'logo.'.$extension;
$uploader_img->setPrefix($name_img);
- $uploader_img->fetchMedia("extensions_image");
+ $uploader_img->fetchMedia('extensions_image');
if (!$uploader_img->upload()) {
$errors = $uploader_img->getErrors();
- $xoops->redirect("javascript:history.go(-1)", 3, $errors);
+ $xoops->redirect('javascript:history.go(-1)', 3, $errors);
} else {
- $obj->setVar("extensions_image", $uploaddir . $uploader_img->getSavedFileName());
+ $obj->setVar('extensions_image', TDMC_EXTENSIONS_URL_IMG . '/' . $uploader_img->getSavedFileName());
}
} else {
- if ($_POST["extensions_image"] == 'blank.gif') {
- $obj->setVar("ext_image", $_POST["ext_image"]);
+ if ($_POST['extensions_image'] == 'blank.gif') {
+ $obj->setVar('ext_image', $_POST['ext_image']);
} else {
- $obj->setVar("ext_image", $uploaddir . $_POST["ext_image"]);
+ $obj->setVar('ext_image', TDMC_EXTENSIONS_URL_IMG . '/' . $_POST['ext_image']);
}
}
//Form extension save
- $obj->setVars(array("ext_demo_site_url" => $_POST["ext_demo_site_url"], "ext_demo_site_name" => $_POST["ext_demo_site_name"],
- "ext_forum_site_url" => $_POST["ext_forum_site_url"], "ext_forum_site_name" => $_POST["ext_forum_site_name"],
- "ext_website_url" => $_POST["ext_website_url"], "ext_website_name" => $_POST["ext_website_name"],
- "ext_release" => $_POST["ext_release"], "ext_status" => $_POST["ext_status"],
- "ext_display_admin" => (($_REQUEST["ext_display_admin"] == 1) ? "1" : "0"),
- "ext_display_user" => (($_REQUEST["ext_display_user"] == 1) ? "1" : "0"),
- "ext_display_submenu" => (($_REQUEST["ext_display_submenu"] == 1) ? "1" : "0"),
- "ext_active_search" => (($_REQUEST["ext_active_search"] == 1) ? "1" : "0"),
- "ext_active_comments" => (($_REQUEST["ext_active_comments"] == 1) ? "1" : "0"),
- "ext_active_notifies" => (($_REQUEST["ext_active_notifies"] == 1) ? "1" : "0")));
+ $obj->setVars(array('ext_demo_site_url' => $_POST['ext_demo_site_url'], 'ext_demo_site_name' => $_POST['ext_demo_site_name'],
+ 'ext_forum_site_url' => $_POST['ext_forum_site_url'], 'ext_forum_site_name' => $_POST['ext_forum_site_name'],
+ 'ext_website_url' => $_POST['ext_website_url'], 'ext_website_name' => $_POST['ext_website_name'],
+ 'ext_release' => $_POST['ext_release'], 'ext_status' => $_POST['ext_status'],
+ 'ext_admin' => (($_REQUEST['ext_admin'] == 1) ? '1' : '0'),
+ 'ext_user' => (($_REQUEST['ext_user'] == 1) ? '1' : '0'),
+ 'ext_submenu' => (($_REQUEST['ext_submenu'] == 1) ? '1' : '0'),
+ 'ext_search' => (($_REQUEST['ext_search'] == 1) ? '1' : '0'),
+ 'ext_comments' => (($_REQUEST['ext_comments'] == 1) ? '1' : '0'),
+ 'ext_notifications' => (($_REQUEST['ext_notifications'] == 1) ? '1' : '0'),
+ 'ext_paypal' => $_POST['ext_paypal'],
+ 'ext_subversion' => $_POST['ext_subversion']));
// Insert Data
if ($extensions_Handler->insert($obj)) {
- redirect_header("extensions.php?op=list", 2, _AM_TDMCREATE_FORMOK);
+ redirect_header('extensions.php?op=list', 2, _AM_TDMCREATE_FORMOK);
}
// Form Data
$xoops->error($obj->getHtmlErrors());
@@ -133,10 +148,10 @@
$xoops->tpl()->assign('form', $form->render());
break;
- case "edit":
- $admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_EXTENSION, 'extensions.php?op=new', 'add');
- $admin_page->addItemButton(_AM_TDMCREATE_EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
- $admin_page->renderButton();
+ case 'edit':
+ $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_EXTENSION, 'extensions.php?op=new', 'add');
+ $admin_menu->addItemButton(_AM_TDMCREATE_EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
+ $admin_menu->renderButton();
$id = $system->cleanVars($_REQUEST, 'ext_id', 0, 'int');
if ($id > 0) {
@@ -148,21 +163,21 @@
}
break;
- case "delete":
+ case 'delete':
$id = $system->cleanVars($_REQUEST, 'ext_id', 0, 'int');
if ($id > 0) {
$obj = $extensions_Handler->get($id);
- if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
- $xoops->redirect("extensions.php", 3, implode(",", $xoops->security()->getErrors()));
+ $xoops->redirect('extensions.php', 3, implode(',', $xoops->security()->getErrors()));
}
if ($extensions_Handler->delete($obj)) {
- $xoops->redirect("extensions.php", 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_EXTENSION));
+ $xoops->redirect('extensions.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_EXTENSION));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'extensions.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('ext_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'extensions.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('ext_name')) . '<br />');
}
} else {
$xoops->redirect('extensions.php', 1, _AM_SYSTEM_DBERROR);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-02-07 21:07:43 UTC (rev 11007)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-02-07 21:28:19 UTC (rev 11008)
@@ -39,77 +39,110 @@
/* @var $fields_handler TDMCreateFieldsHandler */
$fields_Handler = $xoops->getModuleHandler('fields');
-$admin_page = new XoopsModuleAdmin();
-$admin_page->renderNavigation('fields.php');
+$admin_menu->renderNavigation('fields.php');
switch ($op)
{
- case "list":
+ case 'list':
default:
- $admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
- $admin_page->renderButton();
- // Get tables list
+ $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
+ $admin_menu->renderButton();
+ // Get modules list
$criteria = new CriteriaCompo();
- $criteria->setSort('table_name');
+ $criteria->setSort('mod_name');
$criteria->setOrder('ASC');
$criteria->setStart($start);
$criteria->setLimit($nb_pager);
- $numrows_tabs = $tables_Handler->getCount($criteria);
+ $numrows_tables = $tables_Handler->getCount($criteria);
+ $table_arr = $tables_Handler->getAll($criteria);
+ $xoops->tpl()->assign('tables_count', $numrows_tables);
+ $xoops->tpl()->assign('timg_path', TDMC_TABLES_URL_IMG);
+ unset($criteria);
// Redirect if there aren't modules
/* if ( $numrows_mods == 0 ) {
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
- }*/
- $xoops->tpl()->assign('timg_path', XOOPS_UPLOAD_URL.'/tdmcreate/images/tables/');
- $xoops->tpl()->assign('tables', $tables_Handler->getObjects($criteria, true, false));
- $xoops->tpl()->assign('table', true);
- unset($criteria);
- // Get fields list
+ }*/
$criteria = new CriteriaCompo();
- $criteria->setSort("field_name");
- $criteria->setOrder("ASC");
- $xoops->tpl()->assign('fimg_path', XOOPS_UPLOAD_URL.'/tdmcreate/images/fields/');
- $xoops->tpl()->assign('fields', $fields_Handler->getObjects($criteria, true, false));
- $xoops->tpl()->assign('field', true);
- unset($criteria);
- // Display Page Navigation
- if ($numrows_tabs > $nb_pager) {
- $nav = new XoopsPageNav($numrows_tabs, $nb_pager, $start, 'start');
- $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
- }
+ $criteria->setSort('table_name');
+ $criteria->setOrder('ASC');
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $numrows_fields = $fields_Handler->getCount($criteria);
+ $field_arr = $fields_Handler->getAll($criteria);
+ unset($criteria);
+ // Assign Template variables
+ $xoops->tpl()->assign('fields_count', $numrows_fields);
+ $mytree = new XoopsObjectTree($table_arr, 'table_id', 'table_mid');
+ 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');
+ $tables['modname'] = TDMCreate_getPathTree($mytree, $table_arr[$i]->getVar('table_mid'), $table_arr, 'table_name');
+ $tables['image'] = $table_arr[$i]->getVar('table_image');
+ $tables['submenu'] = $table_arr[$i]->getVar('table_submenu');
+ $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');
+ $field['name'] = $field_arr[$i]->getVar('field_name');
+ $field['version'] = $field_arr[$i]->getVar('field_version');
+ $field['image'] = $field_arr[$i]->getVar('field_image');
+ $field['nbfields'] = $field_arr[$i]->getVar('field_nbfields');
+ $field['blocks'] = $field_arr[$i]->getVar('field_blocks');
+ $field['admin'] = $field_arr[$i]->getVar('field_admin');
+ $field['user'] = $field_arr[$i]->getVar('field_user');
+ $field['submenu'] = $field_arr[$i]->getVar('field_submenu');
+ $field['search'] = $field_arr[$i]->getVar('field_search');
+ $field['comments'] = $field_arr[$i]->getVar('field_comments');
+ $field['notifies'] = $field_arr[$i]->getVar('field_notifies');
+ $xoops->tpl()->append_by_ref('fields', $field);
+ unset($field);
+ }
+ }
+ }
+ // Display Page Navigation
+ if ($numrows_mods > $nb_pager) {
+ $nav = new XoopsPageNav($numrows_mods, $nb_pager, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
+ } else {
+ $xoops->tpl()->assign('error_message', _AM_TDMCREATE_FIELD_ERROR_NOFIELDS);
+ }
break;
- case "new":
- $admin_page->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'application-view-detail');
- $admin_page->renderButton();
+ case 'new':
+ $admin_menu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'application-view-detail');
+ $admin_menu->renderButton();
$obj = $fields_Handler->create();
$form = $xoops->getModuleForm($obj, 'fields');
$xoops->tpl()->assign('form', $form->render());
break;
- case "save":
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("fields.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ case 'save':
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- if (isset($_REQUEST["field_id"])) {
- $obj =& $fieldsHandler->get($_REQUEST["field_id"]);
+ if (isset($_REQUEST['field_id'])) {
+ $obj =& $fieldsHandler->get($_REQUEST['field_id']);
} else {
$obj =& $fieldsHandler->create();
}
//Form fields
- $obj->setVars(array("field_table" => $_POST["field_table"], "field_name" => $_POST["field_name"],
- "field_type" => $_POST["field_type"], "field_value" => $_POST["field_value"],
- "field_attribute" => $_POST["field_attribute"], "field_null" => $_POST["field_null"],
- "field_default" => $_POST["field_default"], "field_key" => $_POST["field_key"],
- "field_elements" => $_POST["field_elements"],
- "field_display_admin" => (($_REQUEST["field_display_admin"] == 1) ? "1" : "0"),
- "field_display_user" => (($_REQUEST["field_display_user"] == 1) ? "1" : "0"),
- "field_display_block" => (($_REQUEST["field_display_block"] == 1) ? "1" : "0"),
- "field_mainfield" => (($_REQUEST["field_mainfield"] == 1) ? "1" : "0"),
- "field_search" => (($_REQUEST["field_search"] == 1) ? "1" : "0"),
- "field_required" => (($_REQUEST["field_required"] == 1) ? "1" : "0")));
+ $obj->setVars(array('field_table' => $_POST['field_table'], 'field_name' => $_POST['field_name'],
+ 'field_type' => $_POST['field_type'], 'field_value' => $_POST['field_value'],
+ 'field_attribute' => $_POST['field_attribute'], 'field_null' => $_POST['field_null'],
+ 'field_default' => $_POST['field_default'], 'field_key' => $_POST['field_key'],
+ 'field_elements' => $_POST['field_elements'],
+ 'field_admin' => (($_REQUEST['field_admin'] == 1) ? '1' : '0'),
+ 'field_user' => (($_REQUEST['field_user'] == 1) ? '1' : '0'),
+ 'field_blocks' => (($_REQUEST['field_blocks'] == 1) ? '1' : '0'),
+ 'field_mainfield' => (($_REQUEST['field_mainfield'] == 1) ? '1' : '0'),
+ 'field_search' => (($_REQUEST['field_search'] == 1) ? '1' : '0'),
+ 'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0')));
if ($fieldsHandler->insert($obj)) {
- redirect_header("fields.php?op=list", 2, _AM_TDMCREATE_FORMOK);
+ redirect_header('fields.php?op=list', 2, _AM_TDMCREATE_FORMOK);
}
$xoops->error($obj->getHtmlErrors());
@@ -117,9 +150,9 @@
$xoops->tpl()->assign('form', $form->render());
break;
- case "edit":
- $admin_page->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'application-view-detail');
- $admin_page->renderButton();
+ case 'edit':
+ $admin_menu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'application-view-detail');
+ $admin_menu->renderButton();
$id = $system->cleanVars($_REQUEST, 'field_id', 0, 'int');
if ($id > 0) {
@@ -131,21 +164,21 @@
}
break;
- case "delete":
+ case 'delete':
$id = $system->cleanVars($_REQUEST, 'field_id', 0, 'int');
if ($id > 0) {
$obj = $fields_Handler->get($id);
- if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
- $xoops->redirect("fields.php", 3, implode(",", $xoops->security()->getErrors()));
+ $xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors()));
}
if ($fields_Handler->delete($obj)) {
- $xoops->redirect("fields.php", 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_TABLE));
+ $xoops->redirect('fields.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_TABLE));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'fields.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('field_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'fields.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('field_name')) . '<br />');
}
} else {
$xoops->redirect('fields.php', 1, _AM_SYSTEM_DBERROR);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php 2013-02-07 21:07:43 UTC (rev 11007)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php 2013-02-07 21:28:19 UTC (rev 11008)
@@ -8,7 +8,6 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-
/**
* tdmcreate module
*
@@ -16,7 +15,7 @@
* @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)
+ * @author XOOPS Development Team
* @version $Id: import.php 10665 2012-12-27 10:14:15Z timgno $
*/
include dirname(__FILE__) . '/header.php';
@@ -37,40 +36,53 @@
/* @var $import_handler TDMCreateImportHandler */
$import_Handler = $xoops->getModuleHandler('import');
-$admin_page = new XoopsModuleAdmin();
-$admin_page->renderNavigation('import.php');
+$admin_menu->renderNavigation('import.php');
switch ($op)
{
- case "list":
- $admin_page->addItemButton(_AM_TDMCREATE_IMPORT, 'import.php?op=import', 'add');
- $admin_page->renderButton();
- $criteria = new CriteriaCompo();
- $criteria->setSort("import_name");
- $criteria->setOrder("ASC");
+ case 'list':
+ $admin_menu->addItemButton(_AM_TDMCREATE_IMPORT, 'import.php?op=import', 'add');
+ $admin_menu->renderButton();
+ // Get modules list
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('import_name');
+ $criteria->setOrder('ASC');
$criteria->setStart($start);
- $criteria->setLimit($limit);
- $numrows = $import_Handler->getCount($criteria);
- $xoops->tpl()->assign('imports', $import_Handler->getObjects($criteria, true, false));
- $xoops->tpl()->assign('imports_list', true);
- $xoops->tpl()->assign('import', true);
- unset($criteria);
- // Display Page Navigation
- if ($numrows > $nb_pager) {
- $nav = new XoopsPageNav($numrows, $nb_pager, $start, 'start');
- $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
- }
+ $criteria->setLimit($nb_pager);
+ $numrows = $import_Handler->getCount($criteria);
+ $import_arr = $import_Handler->getAll($criteria);
+ // Assign Template variables
+ $xoops->tpl()->assign('import_count', $numrows);
+ unset($criteria);
+ if ($numrows > 0) {
+ foreach (array_keys($import_arr) as $i) {
+ $import['id'] = $import_arr[$i]->getVar('import_id');
+ $import['mid'] = $import_arr[$i]->getVar('import_mid');
+ $import['name'] = $import_arr[$i]->getVar('import_name');
+ $import['nbtables'] = $import_arr[$i]->getVar('import_nbtables');
+ $import['nbfields'] = $import_arr[$i]->getVar('import_nbfields');
+ $xoops->tpl()->append_by_ref('imports', $import);
+ unset($import);
+ }
+ // Display Page Navigation
+ if ($numrows > $nb_pager) {
+ $nav = new XoopsPageNav($numrows, $nb_pager, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
+ } else {
+ $xoops->tpl()->assign('error_message', _AM_TDMCREATE_IMPORT_ERROR_NOIMPORTS);
+ }
break;
- case "import":
- $admin_page->addItemButton(_AM_TDMCREATE_IMPORTS_LIST, 'import.php', 'application-view-detail');
- $admin_page->renderButton();
+ case 'import':
+ $admin_menu->addItemButton(_AM_TDMCREATE_IMPORTS_LIST, 'import.php', 'application-view-detail');
+ $admin_menu->renderButton();
$obj = $import_Handler->create();
$form = $xoops->getModuleForm($obj, 'import');
$xoops->tpl()->assign('form', $form->render());
break;
- case "save":
+ case 'save':
if (!$xoops->security()->check()) {
$xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
}
@@ -81,64 +93,90 @@
$obj = $import_Handler->create();
}
- // File recovery
- $file = $_FILES['import_oldmod'];
- // Temporary file name
- $filename = $file['tmp_name'];
- // File size
- $filesize = $file['size'];
+ // If incoming data have been entered correctly
+ if($_POST['upload'] == _SUBMIT && isset($_FILES['importfile']['tmp_name']) && (substr($_FILES['importfile']['name'], -4) == '.sql'))
+ {
+ $uploads_dir = TDMC_UPLOAD_PATH_FILES;
+ // File recovery
+ $filename = $_FILES['importfile']['name'];
+ $tmp_file = $_FILES['importfile']['tmp_name'];
+ if (is_uploaded_file($tmp_file)) { // Copy files to the server
+ $xoops->redirect('import.php', 1, 'File ' . $filename . ' uploaded successfully.');
+ readfile($tmp_file);
+ // The directory where you saved the file
+ if ($_FILES['importfile']['error'] == UPLOAD_ERR_OK) {
+ $tmp_name = $tmp_file;
+ $name = $filename;
+ move_uploaded_file($tmp_name, $uploads_dir.'/'.$name);
+ }
+ } else {
+ $xoops->redirect('import.php', 1, 'Error in file upload.');
+ }
+ // File size
+ $filesize = $_FILES['importfile']['size'];
+
+ // Check that the file was inserted and that there is
+ if ( ($handle = fopen($filename, 'r') ) !== false)
+ {
+ $separator = $_POST['separator']; // data separator
+ $row = ''; // clear line
+ // Use a counter to see what line are comments
+ $comments = 0;
+ // Use the fgets function to retrieve the information in the sql file
+ // The second parameter is the size of the file, we have recovered over
+ while ( !feof( $handle )) // file reading until the end
+ {
+ $row = fgets($handle, $filesize); // reads the entire row for the whole file
+ if ( preg_match( '/\#/', $row ) ) { // if this row is a comment
+ $comments++;
+ // Check for a $fields_table variable, the first row of the field name of the sql
+ $fields_table = $row;
+ } else {
+ if(strlen($row) > 1)
+ {
+ // Remove spaces at the beginning and end
+ $row = trim($row);
+ // change the ' and ; in null
+ $search = array ( "'&(apostrophe|#39);'i", "'&(semicolon|#59);'i", "'([\r\n])[\s]+'" );
+ // replace in null
+ $replace = array ( "", "", "" );
+ $riga = preg_replace($search, $replace, $riga);
+ // I'll put your details in the row into an array divided by separator
+ $arrayrow = explode( ',', $row);
+ // number of elements in the array
+ $num_elements = count($arrayrow);
+ // Insert query
+ if($num_elements == 9 && strlen($arrayrow[0]) > 0) {
+ // per tutti i campi all'interno della stessa riga...
+ for ($c = 0; $c < $num_elements; $c++)
+ {
+ //Form imported save
+ $obj->setVars(array('import_mid' => $arrayrow[0][$c], 'import_name' => $arrayrow[1][$c],
+ 'import_nbtables' => $arrayrow[2][$c], 'import_tablename' => $arrayrow[3][$c],
+ 'import_nbfields' => $arrayrow[4][$c], 'import_fieldname' => $arrayrow[5][$c],
+ 'import_fieldtype' => $arrayrow[6][$c], 'import_fieldvalue' => $arrayrow[7][$c],
+ 'import_nbfieldefault' => $arrayrow[8][$c]));
+ }
+ } else {
+ $xoops->redirect('import.php?op=list', 3, 'Error: data in text file do not match. Row: '.$row);
+ }
+ }
+ }
+ // reset for the next insertion
+ $arrayrow = array_slice($arrayrrow, 0, 0);
+ $row = '';
+ }
+ } else {
+ $xoops->redirect('import.php', 3, 'Could not open file for reading!');
+ }
+ $xoops->redirect('import.php', 3, 'Data entered successfull!');
+ fclose($handle);
+ } else {
+ $xoops->redirect('import.php', 3, 'Not sql file or data entered!');
+ }
- // Check that the file was inserted and that there is
- if ( ($handle = fopen($filename, "r") ) !== false) {
- // Use a counter to see what line are comments
- $counts = 0;
- // Use the fgets function to retrieve the information in the sql file
- // The second parameter is the size of the file, we have recovered over
- while ( ( $data = fget($handle, $filesize) ) !== false ) {
- if ( preg_match( '/\#/', $data ) ) {
- $counts++;
- // Check for a $fields_table variable, the first row of the field name of the sql
- $fields_table = $data;
- } else {
- // Recupero i nomi dei campi
- $campo_nome = $fields_table[0];
- $campo_cognome = $fields_table[1];
- $campo_indirizzo = $fields_table[2];
- $campo_mail = $fields_table[3];
- $campo_telefono = $fields_table[4];
-
- // Recupero i valori dei campi
- $nome = $data[0];
- $cognome = $data[1];
- $indirizzo = $data[2];
- $mail = $data[3];
- $telefono = $data[4];
-
- // Creo una query di inserimento e la eseguo
- $sql = "
- INSERT INTO utenti SET
- $campo_nome = '$nome',
- $campo_cognome = '$cognome',
- $campo_indirizzo = '$indirizzo',
- $campo_mail = '$mail',
- $campo_telefono = '$telefono'
- ";
- $rssql = mysql_query( $sql );
- // Controllo che l'importazione sia avvenuta con successo
- //Form imported save
- $obj->setVars(array("import_mid" => $_POST["import_mid"], "import_name" => $_POST["import_name"],
- "import_nbtables" => $_POST["import_nbtables"], "import_tablename" => $_POST["import_tablename"],
- "import_nbfields" => $_POST["import_nbfields"], "import_fieldname" => $_POST["import_fieldname"]));
- }
- }
- }
- else
- redirect_header("import.php?op=list", 3, "Nessun file inserito");
-
- fclose($handle);
-
if ($import_Handler->insert($obj)) {
- redirect_header("import.php?op=list", 3, _AM_TDMCREATE_FORMOK);
+ $xoops->redirect('import.php', 3, _AM_TDMCREATE_FORMOK);
}
$xoops->error($obj->getHtmlErrors());
@@ -146,10 +184,10 @@
$xoops->tpl()->assign('form', $form->render());
break;
- case "edit":
- $admin_page->addItemButton(_AM_TDMCREATE_IMPORT, 'import.php?op=import', 'add');
- $admin_page->addItemButton(_AM_TDMCREATE_IMPORTS_LIST, 'import.php', 'application-view-detail');
- $admin_page->renderButton();
+ case 'edit':
+ $admin_menu->addItemButton(_AM_TDMCREATE_IMPORT, 'import.php?op=import', 'add');
+ $admin_menu->addItemButton(_AM_TDMCREATE_IMPORTS_LIST, 'import.php', 'application-view-detail');
+ $admin_menu->renderButton();
$id = $system->cleanVars($_REQUEST, 'import_id', 0, 'int');
if ($id > 0) {
@@ -161,21 +199,21 @@
}
break;
- case "delete":
+ case 'delete':
$id = $system->cleanVars($_REQUEST, 'import_id', 0, 'int');
if ($id > 0) {
$obj = $import_Handler->get($id);
- if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
- $xoops->redirect("import.php", 3, implode(",", $xoops->security()->getErrors()));
+ $xoops->redirect('import.php', 3, implode(',', $xoops->security()->getErrors()));
}
if ($import_Handler->delete($obj)) {
- $xoops->redirect("import.php", 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_IMPORT));
+ $xoops->redirect('import.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_IMPORT));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'import.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('import_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'import.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('import_name')) . '<br />');
}
} else {
$xoops->redirect('import.php', 1, _AM_SYSTEM_DBERROR);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-02-07 21:07:43 UTC (rev 11007)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-02-07 21:28:19 UTC (rev 11008)
@@ -11,12 +11,12 @@
/**
* 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: modules.php 10665 2012-12-27 10:14:15Z timgno $
+ * @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: modules.php 10665 2012-12-27 10:14:15Z timgno $
*/
include dirname(__FILE__) . '/header.php';
// Preferences Limit
@@ -48,6 +48,7 @@
$numrows_mods = $modules_Handler->getCount($criteria);
$mod_arr = $modules_Handler->getAll($criteria);
// Assign Template variables
+ $xoops->tpl()->assign('mimg_path', TDMC_MODULES_URL_IMG);
$xoops->tpl()->assign('modules_count', $numrows_mods);
unset($criteria);
if ($numrows_mods > 0) {
@@ -72,7 +73,7 @@
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
- $xoops->tpl()->assign('error_message', _AM_TDMCREATE_TABLE_ERROR_NOMODULES);
+ $xoops->tpl()->assign('error_message', _AM_TDMCREATE_MODULE_ERROR_NOMODULES);
}
break;
@@ -134,8 +135,8 @@
'mod_search' => (($_REQUEST['mod_search'] == 1) ? '1' : '0'),
'mod_comments' => (($_REQUEST['mod_comments'] == 1) ? '1' : '0'),
'mod_notifications' => (($_REQUEST['mod_notifications'] == 1) ? '1' : '0'),
- 'mod_paypal' => $_REQUEST['mod_paypal'],
- 'mod_subversion' => $_REQUEST['mod_subversion']));
+ 'mod_paypal' => $_POST['mod_paypal'],
+ 'mod_subversion' => $_POST['mod_subversion']));
// Insert Data
if ($modules_Handler->insert($obj)) {
redirect_header('modules.php?op=list', 2, _AM_TDMCREATE_FORMOK);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-02-07 21:07:43 UTC (rev 11007)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-02-07 21:28:19 UTC (rev 11008)
@@ -34,13 +34,13 @@
/* @var $tables_handler TDMCreateTablesHandler */
$tables_Handler = $xoops->getModuleHandler('tables');
-$admin_manu->renderNavigation('tables.php');
+$admin_menu->renderNavigation('tables.php');
switch ($op)
{
- case "list":
+ case 'list':
default:
- $admin_manu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
- $admin_manu->renderButton();
+ $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
+ $admin_menu->renderButton();
// Get modules list
$criteria = new CriteriaCompo();
$criteria->setSort('mod_name');
@@ -48,8 +48,9 @@
$criteria->setStart($start);
$criteria->setLimit($nb_pager);
$numrows_mods = $modules_Handler->getCount($criteria);
- $module_arr = $modules_Handler->getAll($criteria);
+ $mod_arr = $modules_Handler->getAll($criteria);
$xoops->tpl()->assign('modules_count', $numrows_mods);
+ $xoops->tpl()->assign('mimg_path', TDMC_MODULES_URL_IMG);
unset($criteria);
// Redirect if there aren't modules
/* if ( $numrows_mods == 0 ) {
@@ -62,14 +63,15 @@
$criteria->setLimit($nb_pager);
$numrows_tables = $tables_Handler->getCount($criteria);
$table_arr = $tables_Handler->getAll($criteria);
- $xoops->tpl()->assign('mods_count', $numrows_tables);
+ $xoops->tpl()->assign('tables_count', $numrows_tables);
+ $xoops->tpl()->assign('timg_path', TDMC_TABLES_URL_IMG);
unset($criteria);
// Assign Template variables
- $xoops->tpl()->assign('mods_count', $numrows);
+ $xoops->tpl()->assign('mods_count', $numrows_mods);
$mytree = new XoopsObjectTree($table_arr, 'table_id', 'table_mid');
if ($numrows_mods > 0) {
- foreach (array_keys($module_arr) as $i) {
+ 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');
@@ -89,7 +91,7 @@
$tables['name'] = $table_arr[$i]->getVar('table_name');
$tables['modname'] = TDMCreate_getPathTree($mytree, $table_arr[$i]->getVar('table_mid'), $table_arr, 'table_name');
$tables['image'] = $table_arr[$i]->getVar('table_image');
- $tables['submenu'] = $table_arr[$i]->getVar('mod_submenu');
+ $tables['submenu'] = $table_arr[$i]->getVar('table_submenu');
$xoops->tpl()->append_by_ref('tables', $tables);
unset($tables);
}
@@ -105,16 +107,16 @@
}
break;
- case "new":
- $admin_manu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'application-view-detail');
- $admin_manu->renderButton();
+ case 'new':
+ $admin_menu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'application-view-detail');
+ $admin_menu->renderButton();
$obj = $tables_Handler->create();
$form = $xoops->getModuleForm($obj, 'tables');
$xoops->tpl()->assign('form', $form->render());
break;
- case "save":
+ case 'save':
if (!$xoops->security()->check()) {
$xoops->redirect('tables.php', 3, implode(',', $xoops->security()->getErrors()));
}
@@ -125,50 +127,50 @@
$obj = $tables_Handler->create();
}
//Form tables
- $obj->setVars(array("table_module" => $_POST["table_module"], "table_name" => $_POST["table_name"],
- "table_nbfields" => $_POST["table_nbfields"], "table_fieldname" => $_POST["table_fieldname"]));
+ $obj->setVars(array('table_module' => $_POST['table_module'], 'table_name' => $_POST['table_name'],
+ 'table_nbfields' => $_POST['table_nbfields'], 'table_fieldname' => $_POST['table_fieldname']));
//Form table_image
- $pathIcon32 = XOOPS_ROOT_PATH . "/media/xoops/images/icons/32";
+ $pathIcon32 = XOOPS_ROOT_PATH . '/media/xoops/images/icons/32';
if(is_dir($pathIcon32)){
$uploaddir = $pathIcon32;
}else{
- $uploaddir = XOOPS_UPLOAD_PATH."/tdmcreate/images/tables";
+ $uploaddir = XOOPS_UPLOAD_PATH.'/tdmcreate/images/tables';
}
$uploader_img = new XoopsMediaUploader($uploaddir, $xoops->getModuleConfig('mimetypes'),
$xoops->getModuleConfig('maxsize'), null, null);
- if ($uploader_img->fetchMedia("tables_image")) {
- $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["mod_image"]['name']);
- $name_img = $_GET['mod_name'].'_slogo.'.$extension;
+ if ($uploader_img->fetchMedia('tables_image')) {
+ $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['table_image']['name']);
+ $name_img = $_GET['table_name'].'.'.$extension;
$uploader_img->setPrefix($name_img);
- $uploader_img->fetchMedia("tables_image");
+ $uploader_img->fetchMedia('tables_image');
if (!$uploader_img->upload()) {
$errors = $uploader_img->getErrors();
- $xoops->redirect("javascript:history.go(-1)", 3, $errors);
+ $xoops->redirect('javascript:history.go(-1)', 3, $errors);
} else {
- $obj->setVar("table_image", $uploaddir . $uploader_img->getSavedFileName());
+ $obj->setVar('table_image', $uploaddir . $uploader_img->getSavedFileName());
}
} else {
- if ($_POST["tables_image"] == 'blank.gif') {
- $obj->setVar("table_image", $_POST["table_image"]);
+ if ($_POST['tables_image'] == 'blank.gif') {
+ $obj->setVar('table_image', $_POST['table_image']);
} else {
- $obj->setVar("table_image", $uploaddir . $_POST["table_image"]);
+ $obj->setVar('table_image', $uploaddir . $_POST['table_image']);
}
}
//Form tables
- $obj->setVars(array("table_blocks" => (($_REQUEST["table_blocks"] == 1) ? "1" : "0"),
- "table_display_admin" => (($_REQUEST["table_display_admin"] == 1) ? "1" : "0"),
- "table_display_user" => (($_REQUEST["table_display_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_notify" => (($_REQUEST["table_notify"] == 1) ? "1" : "0")));
+ $obj->setVars(array('table_blocks' => (($_REQUEST['table_blocks'] == 1) ? '1' : '0'),
+ 'table_display_admin' => (($_REQUEST['table_display_admin'] == 1) ? '1' : '0'),
+ 'table_display_user' => (($_REQUEST['table_display_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_notify' => (($_REQUEST['table_notify'] == 1) ? '1' : '0')));
if( $tables_Handler->insert($obj) && $obj->isNew() ) {
- redirect_header("fields.php?op=new", 3, _AM_TDMCREATE_FORMOK);
+ redirect_header('fields.php?op=new', 3, _AM_TDMCREATE_FORMOK);
} else {
- redirect_header("tables.php?op=list", 3, _AM_TDMCREATE_FORMOK);
+ redirect_header('tables.php?op=list', 3, _AM_TDMCREATE_FORMOK);
}
$xoops->error($obj->getHtmlErrors());
@@ -176,10 +178,10 @@
$xoops->tpl()->assign('form', $form->render());
break;
- case "edit":
- $admin_manu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
- $admin_manu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'application-view-detail');
- $admin_manu->renderButton();
+ case 'edit':
+ $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
+ $admin_menu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'application-view-detail');
+ $admin_menu->renderButton();
$id = $system->cleanVars($_REQUEST, 'table_id', 0, 'int');
if ($id > 0) {
@@ -191,21 +193,21 @@
}
break;
- case "delete":
+ case 'delete':
$id = $system->cleanVars($_REQUEST, 'table_id', 0, 'int');
if ($id > 0) {
$obj = $tables_Handler->get($id);
- if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
- $xoops->redirect("tables.php", 3, implode(",", $xoops->security()->getErrors()));
+ $xoops->redirect('tables.php', 3, implode(',', $xoops->security()->getErrors()));
}
if ($tables_Handler->delete($obj)) {
- $xoops->redirect("tables.php", 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_TABLE));
+ $xoops->redirect('tables.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_TABLE));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'tables.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('table_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'tables.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('table_name')) . '<br />');
}
} else {
$xoops->redirect('tables.php', 1, _AM_SYSTEM_DBERROR);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php 2013-02-07 21:07:43 UTC (rev 11007)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php 2013-02-07 21:28:19 UTC (rev 11008)
@@ -28,32 +28,32 @@
*/
public function __construct()
{
- $this->initVar("field_id", XOBJ_DTYPE_INT, null);
- $this->initVar("field_table", XOBJ_DTYPE_INT, null);
- $this->initVar("field_name", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("field_type", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("field_value", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("field_attribute", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("field_null", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("field_default", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("field_key", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("field_auto_increment", XOBJ_DTYPE_INT);
- $this->initVar("field_display_admin", XOBJ_DTYPE_INT);
- $this->initVar("field_display_user", XOBJ_DTYPE_INT);
- $this->initVar("field_display_block", XOBJ_DTYPE_INT);
- $this->initVar("field_mainfield", XOBJ_DTYPE_INT);
- $this->initVar("field_search", XOBJ_DTYPE_INT);
- $this->initVar("field_required", XOBJ_DTYPE_INT);
+ $this->initVar('field_id', XOBJ_DTYPE_INT, null);
+ $this->initVar('field_tid', XOBJ_DTYPE_INT, null);
+ $this->initVar('field_name', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('field_type', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('field_value', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('field_attribute', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('field_null', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('field_default', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('field_key', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('field_auto_increment', XOBJ_DTYPE_INT);
+ $this->initVar('field_admin', XOBJ_DTYPE_INT);
+ $this->initVar('field_user', XOBJ_DTYPE_INT);
+ $this->initVar('field_block', XOBJ_DTYPE_INT);
+ $this->initVar('field_mainfield', XOBJ_DTYPE_INT);
+ $this->initVar('field_search', XOBJ_DTYPE_INT);
+ $this->initVar('field_required', XOBJ_DTYPE_INT);
// For relationship
- $this->initVar("table_id", XOBJ_DTYPE_INT, null);
- $this->initVar("table_module", XOBJ_DTYPE_INT, null);
- $this->initVar("table_name", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("table_nbfields", XOBJ_DTYPE_INT, null);
- $this->initVar("table_fieldname", XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('table_id', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_module', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_name', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('table_nbfields', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_fieldname', XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("fieldtype_id", XOBJ_DTYPE_INT, null);
- $this->initVar("fieldtype_value", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("fieldtype_name", XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('fieldtype_id', XOBJ_DTYPE_INT, null);
+ $this->initVar('fieldtype_value', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('fieldtype_name', XOBJ_DTYPE_TXTBOX, null);
}
}
@@ -64,7 +64,6 @@
*/
public function __construct(XoopsDatabase $db = null)
{
- parent::__construct($db, "tdmcreate_fields", "tdmcreatefields", "field_id", "field_name");
+ parent::__construct($db, 'tdmcreate_fields', 'tdmcreatefields', 'field_id', 'field_name');
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/import.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/import.php 2013-02-07 21:07:43 UTC (rev 11007)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/import.php 2013-02-07 21:28:19 UTC (rev 11008)
@@ -19,7 +19,7 @@
* @author Timgno <txm...@gm...>
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') or die('XOOPS root path not defined');
class TDMCreateImportForm extends XoopsThemeForm
{
@@ -33,14 +33,14 @@
parent::__construct(_AM_TDMCREATE_MODULE_IMPORT_TITLE, 'form', false, 'post', true);
$this->setExtra('enctype="multipart/form-data"');
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_NAME, "import_name", 50, 255, $obj->getVar('import_name')), true);
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_NAME, 'import_name', 50, 255, $obj->getVar('import_name')), true);
$filetray = new XoopsFormElementTray('','<br />');
- $filetray->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD , "import_oldmod", $xoops->getModuleConfig("maxsize")));
+ $filetray->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD , 'importfile', $xoops->getModuleConfig('maxsize')));
$filetray->addElement(new XoopsFormLabel(''));
$this->addElement($filetray);
$this->addElement(new XoopsFormHidden('op', 'save' ) );
- $this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit' ) );
+ $this->addElement(new XoopsFormButton('', 'upload', _SUBMIT, 'submit' ) );
}
}
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php 2013-02-07 21:07:43 UTC (rev 11007)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php 2013-02-07 21:28:19 UTC (rev 11008)
@@ -39,18 +39,18 @@
$this->addElement(new XoopsFormHidden('id', $obj->getVar('table_id')));
}
- $modules_Handler =& $xoops->getModuleHandler('modules');
+ $modules_Handler = $xoops->getModuleHandler('modules');
$mods_select = new XoopsFormSelect(_AM_TDMCREATE_MODULES_LIST, 'table_mid', $obj->getVar('table_mid'));
$mods_select->addOptionArray($modules_Handler->getList());
$this->addElement($mods_select, true);
- $table_name = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, "table_name", 50, 255, $obj->getVar('table_name'));
+ $table_name = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, 'table_name', 50, 255, $obj->getVar('table_name'));
//$table_name->setDescription(_AM_TDMCREATE_TABLENAME_DESC);
$this->addElement($table_name, true);
- $table_fieldname = new XoopsFormText(_AM_TDMCREATE_TABLE_FIELDNAME, "table_fieldname", 30, 50, $obj->getVar('table_fieldname'));
+ $table_fieldname = new XoopsFormText(_AM_TDMCREATE_TABLE_FIELDNAME, 'table_fieldname', 3, 50, $obj->getVar('table_fieldname'));
//$table_fieldname->setDescription(_AM_TDMCREATE_FIELDNAME_DESC);
$this->addElement($table_fieldname);
- $table_nbfield = new XoopsFormText(_AM_TDMCREATE_TABLE_NBFIELDS, "table_nbfields", 30, 50, $obj->getVar('table_nbfields'));
+ $table_nbfield = new XoopsFormText(_AM_TDMCREATE_TABLE_NBFIELDS, 'table_nbfields', 2, 50, $obj->getVar('table_nbfields'));
//$table_nbfield->setDescription(_AM_TDMCREATE_NBFIELDS_DESC);
$this->addElement($table_nbfield, true);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/import.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/import.php 2013-02-07 21:07:43 UTC (rev 11007)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/import.php 2013-02-07 21:28:19 UTC (rev 11008)
@@ -28,13 +28,16 @@
*/
public function __construct()
{
- $this->initVar("import_id",XOBJ_DTYPE_INT, null, true);
- $this->initVar("import_mid",XOBJ_DTYPE_INT, null);
- $this->initVar("import_name",XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("import_nbtables",XOBJ_DTYPE_INT, null);
- $this->initVar("import_tablename",XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("import_nbfields",XOBJ_DTYPE_INT, null);
- $this->initVar("import_fieldname",XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('import_id',XOBJ_DTYPE_INT, null, true);
+ $this->initVar('import_mid',XOBJ_DTYPE_INT, null);
+ $this->initVar('import_name',XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('import_nbtables',XOBJ_DTYPE_INT, null);
+ $this->initVar('import_tablename',XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('import_nbfields',XOBJ_DTYPE_INT, null);
+ $this->initVar('import_fieldname',XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('import_fieldtype',XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('import_fieldvalue',XOBJ_DTYPE_INT, null);
+ $this->initVar('import_fieldefault',XOBJ_DTYPE_TXTBOX, null);
}
}
@@ -45,6 +48,6 @@
*/
public function __construct(XoopsDatabase $db = null)
{
- parent::__construct($db, "tdmcreate_import", 'tdmcreateimport', 'import_id', 'import_name');
+ parent::__construct($db, 'tdmcreate_import', 'tdmcreateimport', 'import_id', 'import_name');
}
}
\ No newline at end of file
Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/common.php
==================================...
[truncated message content] |
