Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12194] XoopsModules/TDMCreate/trunk/TDMCreate
|
From: <be...@us...> - 2013-10-23 01:22:48
|
Revision: 12194
http://sourceforge.net/p/xoops/svn/12194
Author: beckmi
Date: 2013-10-23 01:22:43 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Updating trunk: to version 1.38.1 Beta 1
Modified Paths:
--------------
XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_footer.php
XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_header.php
XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php
XoopsModules/TDMCreate/trunk/TDMCreate/admin/includes.php
XoopsModules/TDMCreate/trunk/TDMCreate/admin/menu.php
XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_header.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_language.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_menu.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_pages.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_permissions.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_architecture.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_blocks.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_blocks_language.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_blocks_templates.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_css_style.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_comments_functions.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_configs.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_install.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_search.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_main_language.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_modinfo_language.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_sql.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_footer.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_header.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_index.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_pages.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_user_comments.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_user_index.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_user_pages.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_xoopsversion.php
XoopsModules/TDMCreate/trunk/TDMCreate/docs/changelog.TXT
XoopsModules/TDMCreate/trunk/TDMCreate/docs/credits.txt
XoopsModules/TDMCreate/trunk/TDMCreate/docs/install.txt
XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/english/modinfo.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/update language 1.0 to 1.1.txt
XoopsModules/TDMCreate/trunk/TDMCreate/language/update language 1.1 to 1.15.txt
XoopsModules/TDMCreate/trunk/TDMCreate/language/update language 1.1 to 1.37.txt
XoopsModules/TDMCreate/trunk/TDMCreate/language/update language 1.15 to 1.37.txt
XoopsModules/TDMCreate/trunk/TDMCreate/language/update language 1.37 to 1.38.txt
XoopsModules/TDMCreate/trunk/TDMCreate/sql/mysql.sql
XoopsModules/TDMCreate/trunk/TDMCreate/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMCreate/trunk/TDMCreate/class/logoGenerator.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_comments.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_waiting.php
XoopsModules/TDMCreate/trunk/TDMCreate/images/icons/blank.gif
XoopsModules/TDMCreate/trunk/TDMCreate/images/logos/
XoopsModules/TDMCreate/trunk/TDMCreate/images/logos/VeraBd.ttf
XoopsModules/TDMCreate/trunk/TDMCreate/images/logos/green.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/logos/red.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/logos/xoops2.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/module_logo.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/empty.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/module_logo.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/test3_logo.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/test4_logo.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/test5_logo.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/test6_logo.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/test7_logo.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/xoops2.png
XoopsModules/TDMCreate/trunk/TDMCreate/js/
XoopsModules/TDMCreate/trunk/TDMCreate/js/functions.js
XoopsModules/TDMCreate/trunk/TDMCreate/js/index.html
XoopsModules/TDMCreate/trunk/TDMCreate/templates/
Removed Paths:
-------------
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_include_coms.php
XoopsModules/TDMCreate/trunk/TDMCreate/docs/licence.txt
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/blank.gif
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/default_slogo.png
XoopsModules/TDMCreate/trunk/TDMCreate/images/uploads/modules/naked.png
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_footer.php 2013-10-22 21:51:58 UTC (rev 12193)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_footer.php 2013-10-23 01:22:43 UTC (rev 12194)
@@ -16,6 +16,7 @@
* @author Mamba (www.xoops.org)
* @version $Id $
**/
+
echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . $pathIcon32.'/xoopsmicrobutton.gif'.' '." alt='XOOPS' title='XOOPS'></a></div>";
echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_header.php 2013-10-22 21:51:58 UTC (rev 12193)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_header.php 2013-10-23 01:22:43 UTC (rev 12194)
@@ -23,9 +23,11 @@
//
$thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
//
-$pathIcon16 = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons16');
-$pathIcon32 = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons32');
-$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
+
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
//load class
$modulesHandler =& xoops_getModuleHandler('tdmcreate_modules', 'TDMCreate');
$tablesHandler =& xoops_getModuleHandler('tdmcreate_tables', 'TDMCreate');
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php 2013-10-22 21:51:58 UTC (rev 12193)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php 2013-10-23 01:22:43 UTC (rev 12194)
@@ -21,19 +21,29 @@
include 'admin_header.php';
echo $adminMenu->addNavigation('const.php');
$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
-//Name of module
-$modules =& $modulesHandler->get($_REQUEST['modules_name']);
-$modules_name = $modules->getVar('modules_name');
-$modules_desc = $modules->getVar('modules_description');
+
+if (isset($_REQUEST['modules_name'])) {
+ $modules =& $modulesHandler->get($_REQUEST['modules_name']);
+} else {
+ $modules = & $modulesHandler;
+}
+
+$modules_name = $modules->getVar('modules_name');
+$modules_desc = $modules->getVar('modules_description');
$modules_author_website_name = $modules->getVar('modules_author_website_name');
-$modules_author_website_url = $modules->getVar('modules_author_website_url');
-$modules_image = $modules->getVar('modules_image');
-$modules_active_search = $modules->getVar('modules_active_search');
-$modules_active_comments = $modules->getVar('modules_active_comments');
-
+$modules_author_website_url = $modules->getVar('modules_author_website_url');
+$modules_image = $modules->getVar('modules_image');
+$modules_active_search = $modules->getVar('modules_active_search');
+$modules_active_comments = $modules->getVar('modules_active_comments');
+
//Nom des tables et combien de tables
$criteria = new CriteriaCompo();
-$criteria->add(new Criteria('tables_modules', $_REQUEST['modules_name']));
+if (isset($_REQUEST['modules_name'])) {
+ $criteria->add(new Criteria('tables_modules', $_REQUEST['modules_name']));
+} else {
+ $criteria->add(new Criteria('tables_modules'));
+}
+
$nb_tables = $tablesHandler->getCount($criteria);
$tables_arr = $tablesHandler->getall($criteria);
@@ -61,60 +71,71 @@
//Variables
$tables_id = $tables_arr[$i]->getVar('tables_id');
$tables_name = $tables_arr[$i]->getVar('tables_name');
+ $tables_category = $tables_arr[$i]->getVar('tables_category');
$tables_module_table = $tables_arr[$i]->getVar('tables_module_table');
$tables_img = $tables_arr[$i]->getVar('tables_img');
- $tables_champs = $tables_arr[$i]->getVar('tables_champs');
- $tables_parametres = $tables_arr[$i]->getVar('tables_parametres');
- $tables_blocks = $tables_arr[$i]->getVar('tables_blocs');
+ $tables_fields = $tables_arr[$i]->getVar('tables_fields');
+ $tables_parameters = $tables_arr[$i]->getVar('tables_parameters');
+ $tables_blocks = $tables_arr[$i]->getVar('tables_blocks');
$tables_display_admin = $tables_arr[$i]->getVar('tables_display_admin');
$tables_display_user = $tables_arr[$i]->getVar('tables_display_user');
$tables_search = $tables_arr[$i]->getVar('tables_search');
- $tables_coms = $tables_arr[$i]->getVar('tables_coms');
+ $tables_comments = $tables_arr[$i]->getVar('tables_comments');
+ $tables_waiting = $tables_arr[$i]->getVar('tables_waiting');
//Fabrication
//Copie of images tables
$tables_img1 = $modPath."/images/uploads/tables/".$tables_img;
if (file_exists($tables_img1)) {
- copy($tables_img1, $modPath."/modules/".$modules_name."/images/deco/".$tables_img);
+ copy($tables_img1, $modPath."/modules/".$modules_name."/images/icons/".$tables_img);
}
//Creation des classes
- const_class($modules, $modules_name, $tables_module_table, $tables_name, $tables_champs, $tables_parametres);
-
+ const_class($modules, $modules_name, $tables_module_table, $tables_name, $tables_fields, $tables_parameters);
+
+ if ( $tables_category == 1) { //|| $tables_module_table != null
+ const_admin_permissions($modules, $modules_name, $tables_name, $tables_category);
+ }
+
//Creation of pages admin
if ( $tables_display_admin == 1 ) {
- const_admin_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_img, $tables_champs, $tables_parametres);
+ const_admin_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_category, $tables_name, $tables_img, $tables_fields, $tables_parameters);
}
//Creation of pages and templates user
- if ( $tables_display_user == 1 && $tables_module_table != null ) {
- const_user_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_img, $tables_champs, $tables_parametres);
- const_templates_pages($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
+ if ( $tables_display_user == 1 && $tables_module_table != NULL ) {
+ const_user_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_img, $tables_fields, $tables_parameters);
+ const_templates_pages($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters);
}
//Creation de search
if ( $modules_active_search == 1 && $tables_search == 1 ) {
- const_include_search($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres, $tables_img);
+ const_include_search($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters, $tables_img);
}
- //Creation des coms
- if ( $modules_active_comments == 1 && $tables_coms == 1 ) {
- const_include_coms($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres, $tables_img);
+ //Creation of comments
+ if ( $modules_active_comments == 1 && $tables_comments == 1 ) {
+ const_include_comments($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters, $tables_img);
}
-
+
//Creation of the file mysql.sql
- const_sql($modules_name, $tables_module_table, $tables_name, $tables_champs);
+ const_sql($modules_name, $tables_module_table, $tables_name, $tables_fields);
- $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE tables_name = 'topic'");
- list( $topic ) = $xoopsDB->fetchRow($result);
- //Creation des blocs
+ $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE tables_name = 'category'");
+ list( $category ) = $xoopsDB->fetchRow($result);
+ //Creation des blocks
if ( $tables_blocks == 1 ) {
- const_blocks($modules, $modules_name, $tables_module_table, $tables_name, $tables_champs, $tables_parametres, $topic);
+ const_blocks($modules, $modules_name, $tables_module_table, $tables_name, $tables_fields, $tables_parameters, $category);
//Creation du template des blocks
- const_blocks_templates($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
+ const_blocks_templates($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters);
}
- }
+ }
+
+ //Creation of Waiting Plugin
+ const_waiting($modules, $modules_name, $tables_arr);
+
+
//Creation de xoopsversion.php
/*Mettre xoops version vers la fin pour integrer les bloc, etc*/
const_xoopsversion($modules, $modules_name, $tables_arr, $tables_module_table);
// Creation of template index
- const_templates_index($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
+ const_templates_index($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters);
// Creation of template header
const_templates_header($modules, $modules_name);
// Creation of template footer
@@ -124,9 +145,7 @@
// Creation of template admin help
const_templates_admin_help($modules, $modules_name);
//Creation du fichier permissions
- if ( $topic == 1) { //|| $tables_module_table != null
- const_admin_permissions($modules, $modules_name, $tables_arr, $topic);
- }
+
//Include
//Configs
@@ -143,7 +162,7 @@
//Creation du language main.php
const_main_language($modules, $modules_name, $modules_desc, $tables_arr);
//Creation du language modinfo.php
- const_modinfo_language($modules, $modules_name, $modules_desc, $tables_arr, $topic);
+ const_modinfo_language($modules, $modules_name, $modules_desc, $tables_arr, $category);
//Creation du language admin.php
const_admin_language($modules, $modules_name, $tables_arr, $tables_name);
//Creation du language blocks.php
@@ -162,7 +181,7 @@
//Creation de admin footer.php
const_admin_footer($modules, $modules_name, $tables_arr);
//Creation de admin menu.php
- const_admin_menu($modules, $modules_name, $tables_arr, $topic);
+ const_admin_menu($modules, $modules_name, $tables_arr, $category);
//Creation de admin about.php
//$menu++;
const_admin_about($modules, $modules_name);
@@ -170,7 +189,7 @@
/*Admin*/
/************************************************/
const_user_header($modules, $modules_name, $tables_id, $tables_module_table, $tables_name);
- const_user_index($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_champs, $tables_parametres);
+ const_user_index($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_fields, $tables_parameters);
CloseTable();
break;
@@ -181,11 +200,11 @@
include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
$action = $_SERVER['REQUEST_URI'];
- $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'form_creation', $action, 'post', true);
+ $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'form_creation', $action, 'post', TRUE);
$modules_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'modules_name', 'modules_name');
$modules_select->addOptionArray($modulesHandler->getList());
- $form->addElement($modules_select, true);
+ $form->addElement($modules_select, TRUE);
foreach (array_keys($tables_arr) as $i)
{
@@ -195,7 +214,7 @@
$tables_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_TABLES, 'tables_name', $tables_name, 4);
$tables_select->addOptionArray($tablesHandler->getList());
- $form->addElement($tables_select, false);
+ $form->addElement($tables_select, FALSE);
$form->addElement(new XoopsFormHidden('op', 'creation'));
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/includes.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/includes.php 2013-10-22 21:51:58 UTC (rev 12193)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/includes.php 2013-10-23 01:22:43 UTC (rev 12194)
@@ -28,10 +28,11 @@
include_once $cPath.'/const_xoopsversion.php';
include_once $cPath.'/const_changelog.php';
include_once $cPath.'/const_include_search.php';
-include_once $cPath.'/const_include_coms.php';
+include_once $cPath.'/const_include_comments.php';
include_once $cPath.'/const_include_configs.php';
include_once $cPath.'/const_include_functions.php';
include_once $cPath.'/const_include_install.php';
+include_once $cPath.'/const_waiting.php';
//include_once $cPath.'/const_include_style.php';
include_once $cPath.'/const_sql.php';
include_once $cPath.'/const_blocks.php';
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/menu.php 2013-10-22 21:51:58 UTC (rev 12193)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/menu.php 2013-10-23 01:22:43 UTC (rev 12194)
@@ -21,12 +21,12 @@
$module_handler =& xoops_gethandler('module');
$xoopsModule =& XoopsModule::getByDirname('TDMCreate');
$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathImageAdmin = $moduleInfo->getInfo('icons32');
+$pathIcon32 = $moduleInfo->getInfo('icons32');
$adminmenu = array();
$i = 1;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_INDEX;
$adminmenu[$i]["link"] = 'admin/index.php';
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/dashboard.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_MODULES;
$adminmenu[$i]["link"] = 'admin/modules.php';
@@ -42,5 +42,5 @@
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_ABOUT;
$adminmenu[$i]["link"] = 'admin/about.php';
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/about.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
unset($i);
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php 2013-10-22 21:51:58 UTC (rev 12193)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php 2013-10-23 01:22:43 UTC (rev 12194)
@@ -50,8 +50,10 @@
} else {
$obj->setVar('modules_image', $_REQUEST['modules_image']);
}
+ //remove all spaces from the new name
+ $spacesRemoved = str_replace(' ', '', $_REQUEST['modules_name']);
- $obj->setVar('modules_name', $_REQUEST['modules_name']);
+ $obj->setVar('modules_name', $spacesRemoved );
$obj->setVar('modules_version', $_REQUEST['modules_version']);
$obj->setVar('modules_description', $_REQUEST['modules_description']);
$obj->setVar('modules_author', $_REQUEST['modules_author']);
@@ -131,8 +133,8 @@
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_BLOCS.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_NB_CHAMPS.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_BLOCKS.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_NB_FIELDS.'</th>';
echo '<th width="10%">'._AM_TDMCREATE_FORMACTION.'</th>';
echo '</tr>';
$class = 'odd';
@@ -140,8 +142,8 @@
{
$modules_id = $modules_arr[$i]->getVar('modules_id');
$modules_name = $modules_arr[$i]->getVar('modules_name');
- $modules_image = $modules_arr[$i]->getVar('modules_image');
- //$modules_blocks = $modules_arr[$i]->getVar('modules_blocs');
+ $modules_image = $modules_arr[$i]->getVar('modules_image');
+ //$modules_blocks = $modules_arr[$i]->getVar('modules_blocks');
$modules_display_admin = $modules_arr[$i]->getVar('modules_display_admin');
$modules_display_user = $modules_arr[$i]->getVar('modules_display_user');
$display_admin = ($modules_display_admin == 1) ? _YES : _NO;
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-22 21:51:58 UTC (rev 12193)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-23 01:22:43 UTC (rev 12194)
@@ -28,7 +28,7 @@
$obj =& $tablesHandler->create();
}
- //Nom du module
+ //Module Name
$modules =& $modulesHandler->get($_REQUEST['tables_modules']);
$modules_name = $modules->getVar('modules_name');
@@ -36,21 +36,22 @@
if ( $_REQUEST['select'] == 1 )
{
- $obj->setVar('tables_module_table', strtolower($modules_name.'_topic'));
- $obj->setVar('tables_name', 'topic');
- $obj->setVar('tables_blocs', 0);
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_category'));
+ $obj->setVar('tables_category', 1);
+ $obj->setVar('tables_name', 'category');
+ $obj->setVar('tables_blocks', 0);
$obj->setVar('tables_display_admin', 1);
$obj->setVar('tables_display_user', 1);
$obj->setVar('tables_status', 0);
$obj->setVar('tables_waiting', 0);
$obj->setVar('tables_online', 0);
$obj->setVar('tables_search', 0);
- $obj->setVar('tables_coms', 0);
- $obj->setVar('tables_nb_champs', 7);
+ $obj->setVar('tables_comments', 0);
+ $obj->setVar('tables_nb_fields', 7);
- $tables_champs = 'topic_id:int:11:unsigned:NOT NULL: :|topic_pid:int:5:unsigned:NOT NULL:0:|topic_title:varchar:255: :NOT NULL: :|topic_desc:text: : :NOT NULL: :|topic_img:varchar:255: :NOT NULL: :|topic_weight:int:5: :NOT NULL:0:|topic_color:varchar:10: :NULL: :';
+ $tables_fields = 'category_id:int:11:unsigned:NOT NULL: :|category_pid:int:5:unsigned:NOT NULL:0:|category_title:varchar:255: :NOT NULL: :|category_desc:text: : :NOT NULL: :|category_img:varchar:255: :NOT NULL: :|category_weight:int:5: :NOT NULL:0:|category_color:varchar:10: :NULL: :';
- $tables_parametres = 'XoopsFormTopic:0:0:0:0:0:0|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:1|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';
+ $tables_parameters = 'XoopsFormCategory:0:0:0:0:0:0|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';
@@ -65,7 +66,7 @@
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
- $name_img = 'topic.'.$extension;
+ $name_img = 'category.'.$extension;
$uploader->setTargetFileName($name_img);
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
@@ -81,53 +82,54 @@
$obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
$obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
- $obj->setVar('tables_blocs', $_REQUEST['tables_blocs']);
+ $obj->setVar('tables_blocks', $_REQUEST['tables_blocks']);
$obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']);
$obj->setVar('tables_display_user', $_REQUEST['tables_display_user']);
$obj->setVar('tables_status', $_REQUEST['tables_status']);
$obj->setVar('tables_waiting', $_REQUEST['tables_waiting']);
$obj->setVar('tables_online', $_REQUEST['tables_online']);
$obj->setVar('tables_search', $_REQUEST['tables_search']);
- $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
+ $obj->setVar('tables_comments', $_REQUEST['tables_comments']);
- $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
+ $obj->setVar('tables_nb_fields', $_REQUEST['tables_nb_fields']);
- $tables_champs = '';
- $tables_parametres = '';
- for($i=0; $i<$_REQUEST['tables_nb_champs']; $i++)
+ $tables_fields = '';
+ $tables_parameters = '';
+ for($i=0; $i<$_REQUEST['tables_nb_fields']; $i++)
{
- //Rajouts des parametres: text:on:off: ...
+ //Additions of parameters: text: on: off: ...
if ( $i != 0 ) {
- $tables_parametres .= ( !empty($_REQUEST['champs_param_elements'][$i]) ) ? "".$_REQUEST['champs_param_elements'][$i].":" : " :";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_display_admin'][$i]) ) ? "1:" : "0:";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_display_user'][$i]) ) ? "1:" : "0:";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_display_blocs'][$i]) ) ? "1:" : "0:";
- $tables_parametres .= ( $i == $_REQUEST['champs_param_main_field']) ? "1:" : "0:";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_search_field'][$i]) ) ? "1:" : "0:";
- $tables_parametres .= ( !empty($_REQUEST['champs_param_required_field'][$i]) ) ? "1" : "0";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_elements'][$i]) ) ? "".$_REQUEST['fields_param_elements'][$i].":" : " :";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_display_admin'][$i]) ) ? "1:" : "0:";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_display_user'][$i]) ) ? "1:" : "0:";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_display_blocks'][$i]) ) ? "1:" : "0:";
+ $tables_parameters .= ( $i == $_REQUEST['fields_param_main_field']) ? "1:" : "0:";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_search_field'][$i]) ) ? "1:" : "0:";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_required_field'][$i]) ) ? "1" : "0";
}
- //Rajouts des champs: test:int:4: ...
- $tables_champs .= (!empty($_REQUEST['champs_name'][$i])) ? "".$_REQUEST['champs_name'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_type'][$i])) ? "".$_REQUEST['champs_type'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_valeur'][$i])) ? "".$_REQUEST['champs_valeur'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_attributs'][$i])) ? "".$_REQUEST['champs_attributs'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_null'][$i])) ? "".strtoupper($_REQUEST['champs_null'][$i]).":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_default'][$i])) ? "".$_REQUEST['champs_default'][$i].":" : " :";
- $tables_champs .= (!empty($_REQUEST['champs_clef'][$i])) ? "".$_REQUEST['champs_clef'][$i]."" : " ";
+ //Additions of fields: test: int: 4: ...
+ $tables_fields .= (!empty($_REQUEST['fields_name'][$i])) ? "".$_REQUEST['fields_name'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_type'][$i])) ? "".$_REQUEST['fields_type'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_value'][$i])) ? "".$_REQUEST['fields_value'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_attributes'][$i])) ? "".$_REQUEST['fields_attributes'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_null'][$i])) ? "".strtoupper($_REQUEST['fields_null'][$i]).":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_default'][$i])) ? "".$_REQUEST['fields_default'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_index'][$i])) ? "".$_REQUEST['fields_index'][$i]."" : " ";
- //Coupure entre les champs et coupre entre les parametres
- if ( $i != $_REQUEST['tables_nb_champs'] - 1) {
- $tables_champs .= '|';
+ //Break between fields and between the parameters
+ if ( $i != $_REQUEST['tables_nb_fields'] - 1) {
+ $tables_fields .= '|';
if ( $i != 0 )
- $tables_parametres .= '|';
+ $tables_parameters .= '|';
} else {
- $tables_parametres .= '|XoopsFormSelectUser:1:1:1:0:0:1|XoopsFormTextDateSelect:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1';
+ $tables_fields .= '|'.strtolower($_REQUEST['tables_name']).'_status:int:10: :NOT NULL:0:|'.strtolower($_REQUEST['tables_name']).'_waiting:int:10: :NOT NULL:0:|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:';
+ $tables_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1';
}
}
}
- $obj->setVar('tables_champs', $tables_champs);
- $obj->setVar('tables_parametres', $tables_parametres);
+ $obj->setVar('tables_fields', $tables_fields);
+ $obj->setVar('tables_parameters', $tables_parameters);
if ($tablesHandler->insert($obj))
{
@@ -146,18 +148,18 @@
} else {
$obj =& $tablesHandler->create();
}
- //Nom du module
+ //Module Name
$modules =& $modulesHandler->get($_REQUEST['tables_modules']);
$modules_name = $modules->getVar('modules_name');
- $tables_blocks = (isset($_REQUEST['tables_blocs'])) ? $_REQUEST['tables_blocs'] : '0';
+ $tables_blocks = (isset($_REQUEST['tables_blocks'])) ? $_REQUEST['tables_blocks'] : '0';
$tables_display_admin = (isset($_REQUEST['tables_display_admin'])) ? $_REQUEST['tables_display_admin'] : '0';
$tables_display_user = (isset($_REQUEST['tables_display_user'])) ? $_REQUEST['tables_display_user'] : '0';
$tables_status = (isset($_REQUEST['tables_status'])) ? $_REQUEST['tables_status'] : '0';
$tables_waiting = (isset($_REQUEST['tables_waiting'])) ? $_REQUEST['tables_waiting'] : '0';
$tables_online = (isset($_REQUEST['tables_online'])) ? $_REQUEST['tables_online'] : '0';
$tables_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0';
- $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0';
+ $tables_comments = (isset($_REQUEST['tables_comments'])) ? $_REQUEST['tables_comments'] : '0';
$select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0';
//Image
@@ -183,22 +185,64 @@
} else {
$obj->setVar('tables_img', $_REQUEST['tables_img']);
}
-
+
+
+ $oldname=$obj->getVar('tables_name');
+
+
$obj->setVar('tables_modules', strtolower($_REQUEST['tables_modules']));
$obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
$obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
- $obj->setVar('tables_blocs', $_REQUEST['tables_blocs']);
+ $obj->setVar('tables_blocks', $_REQUEST['tables_blocks']);
$obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']);
$obj->setVar('tables_display_user', $_REQUEST['tables_display_user']);
$obj->setVar('tables_status', $_REQUEST['tables_status']);
$obj->setVar('tables_waiting', $_REQUEST['tables_waiting']);
$obj->setVar('tables_online', $_REQUEST['tables_online']);
- //mettre des isset pour search
+ //Setting isset for Search
if ( isset($_REQUEST['tables_search']) )
$obj->setVar('tables_search', $_REQUEST['tables_search']);
- if ( isset($_REQUEST['tables_coms']) )
- $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
- $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
+ if ( isset($_REQUEST['tables_comments']) )
+ $obj->setVar('tables_comments', $_REQUEST['tables_comments']);
+ $obj->setVar('tables_nb_fields', $_REQUEST['tables_nb_fields']);
+
+ $tables_fields = $obj->getVar('tables_fields');
+ $tables_nb_fields=$_REQUEST['tables_nb_fields'];
+
+ $fields_total = explode("|", $tables_fields);
+ $count_fields = count($fields_total);
+
+ $newname=strtolower($_REQUEST['tables_name']);
+ //echo $count_parameters;
+ //fields
+ for($i=0; $i<$count_fields; $i++)
+ {
+// if ( $i >= $count_fields ) {
+// $fields_name[$i] = '';
+// $fields_type[$i] = '';
+// $fields_value[$i] = '';
+// $fields_attributes[$i] = '';
+// $fields_null[$i] = '';
+// $fields_default[$i] = '';
+// $fields_index[$i] = '';
+// } else {
+ $fields = explode(":", $fields_total[$i]);
+
+ $fields[0] = $newname . substr($fields[0],stripos($fields[0],'_'));
+// $fields_type[$i] = $fields[1];
+// $fields_value[$i] = $fields[2];
+// $fields_attributes[$i] = $fields[3];
+// $fields_null[$i] = $fields[4];
+// $fields_default[$i] = $fields[5];
+// $fields_index[$i] = $fields[6];
+ $newfields[$i]=implode(":",$fields);
+ //}
+ }
+
+$newTableFields=implode("|",$newfields);
+ $obj->setVar('tables_fields', $newTableFields);
+
+
if ($tablesHandler->insert($obj)) {
redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
@@ -210,9 +254,9 @@
$form = $obj->getFormTable();
break;
- case "edit_champs":
+ case "edit_fields":
$obj =& $tablesHandler->get($_REQUEST['tables_id']);
- $form = $obj->getFormEditChamps(false, $_REQUEST['tables_id']);
+ $form = $obj->getFormEditFields(false, $_REQUEST['tables_id']);
break;
case "delete_tables":
@@ -230,7 +274,7 @@
xoops_confirm(array('ok' => 1, 'tables_id' => $_REQUEST['tables_id'], 'op' => 'delete_tables'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('tables_name')));
}
break;
-
+ //-------------- MODULE -------------------------
case "modules_save":
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -260,8 +304,8 @@
} else {
$obj->setVar('modules_image', $_REQUEST['modules_image']);
}
-
- $obj->setVar('modules_name', $_REQUEST['modules_name']);
+ $spacesRemoved = str_replace(' ', '', $_REQUEST['modules_name']);
+ $obj->setVar('modules_name', $spacesRemoved);
$obj->setVar('modules_version', $_REQUEST['modules_version']);
$obj->setVar('modules_description', $_REQUEST['modules_description']);
$obj->setVar('modules_author', $_REQUEST['modules_author']);
@@ -288,6 +332,17 @@
$obj->setVar('modules_active_comments', $_REQUEST['modules_active_comments']);
if ($modulesHandler->insert($obj)) {
+$modules_id=$obj->getVar('modules_id');
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('tables_modules', $modules_id));
+ $tables_arr = $tablesHandler->getall($criteria);
+ foreach (array_keys($tables_arr) as $i)
+ {
+ //Variables
+ $tables_arr[$i]->setVar('tables_module_table', $spacesRemoved.'_'.$tables_arr[$i]->getVar('tables_name'));
+ $tablesHandler->insert($tables_arr[$i]);
+ }
+
redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
}
break;
@@ -314,13 +369,13 @@
}
break;
- case "tables_champs":
+ case "tables_fields":
echo $adminMenu->addNavigation('tables.php');
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=tables_list', 'list');
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_champs', 'add');
+ $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_fields', 'add');
echo $adminMenu->renderButton();
- //Champs existe deja ?
+ //fields existe deja ?
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('tables_name', $_REQUEST['tables_name']));
$nb_tables1 = $tablesHandler->getCount($criteria);
@@ -335,20 +390,20 @@
} else {
$obj =& $tablesHandler->create();
}
- $tables_blocks = (isset($_REQUEST['tables_blocs'])) ? $_REQUEST['tables_blocs'] : '0';
+ $tables_blocks = (isset($_REQUEST['tables_blocks'])) ? $_REQUEST['tables_blocks'] : '0';
$tables_display_admin = (isset($_REQUEST['tables_display_admin'])) ? $_REQUEST['tables_display_admin'] : '0';
$tables_display_user = (isset($_REQUEST['tables_display_user'])) ? $_REQUEST['tables_display_user'] : '0';
$tables_status = (isset($_REQUEST['tables_status'])) ? $_REQUEST['tables_status'] : '0';
$tables_waiting = (isset($_REQUEST['tables_waiting'])) ? $_REQUEST['tables_waiting'] : '0';
$tables_online = (isset($_REQUEST['tables_online'])) ? $_REQUEST['tables_online'] : '0';
$tables_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0';
- $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0';
+ $tables_comments = (isset($_REQUEST['tables_comments'])) ? $_REQUEST['tables_comments'] : '0';
$select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0';
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- if(!is_dir($pathImageAdmin)){
- $uploaddir = $pathImageAdmin;
+ if(!is_dir($pathIcon32)){
+ $uploaddir = $pathIcon32;
}else{
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
}
@@ -372,7 +427,7 @@
if ($tablesHandler->insert($obj)) {
$tables_id = $xoopsDB->getInsertId();
$obj = $tablesHandler->get($tables_id);
- $form = $obj->getFormChamps(false, $tables_id, intval($_REQUEST['tables_modules']), strtolower($_REQUEST['tables_name']), $tables_blocks, $tables_display_admin, $tables_display_user, $tables_status, $tables_waiting, $tables_online, $tables_search, $tables_coms, intval($_REQUEST['tables_nb_champs']), $select);
+ $form = $obj->getFormFields(false, $tables_id, intval($_REQUEST['tables_modules']), strtolower($_REQUEST['tables_name']), $tables_blocks, $tables_display_admin, $tables_display_user, $tables_status, $tables_waiting, $tables_online, $tables_search, $tables_comments, intval($_REQUEST['tables_nb_fields']), $select);
}
} else {
redirect_header('tables.php?op=list_tables', 2, _AM_TDMCREATE_TABLES_EXIST);
@@ -381,7 +436,7 @@
case "tables_create":
echo $adminMenu->addNavigation('tables.php');
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_TOPICS, 'tables.php?op=topics_create', 'add');
+ $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_CATEGORIES, 'tables.php?op=categories_create', 'add');
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=tables_list', 'list');
echo $adminMenu->renderButton();
@@ -389,17 +444,17 @@
$form = $obj->getFormTable();
break;
- case "topics_create":
+ case "categories_create":
echo $adminMenu->addNavigation('tables.php');
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_create', 'add');
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=tables_list', 'list');
echo $adminMenu->renderButton();
- $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE tables_name = 'topic'");
- list( $topic ) = $xoopsDB->fetchRow($result);
+ $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE tables_name = 'category'");
+ list( $category ) = $xoopsDB->fetchRow($result);
$obj =& $tablesHandler->get($_REQUEST['tables_id']);
- if ( $topic >= 0 ) {
- $form = $obj->getFormTopic();
+ if ( $category >= 0 ) {
+ $form = $obj->getFormCategory();
}
break;
@@ -407,8 +462,14 @@
default:
echo $adminMenu->addNavigation('tables.php');
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_create', 'add');
- $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_TOPICS, 'tables.php?op=topics_create', 'add');
+ $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_CATEGORIES, 'tables.php?op=categories_create', 'add');
echo $adminMenu->renderButton();
+
+ $module_handler =& xoops_gethandler('module');
+ $xoopsModule =& XoopsModule::getByDirname('TDMCreate');
+ $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+ //$pathIcon32 = $moduleInfo->getInfo('icons32');
+ global $pathIcon32;
//Retirer les tables inutiles
$sql = "SELECT tables_id FROM ".$xoopsDB->prefix("tdmcreate_tables")." WHERE tables_modules = 0";
@@ -433,8 +494,8 @@
echo '<th align="center" width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
echo '<th align="center" width="10%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
echo '<th align="center" width="10%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
- echo '<th align="center" width="10%">'._AM_TDMCREATE_BLOCS.'</th>';
- echo '<th align="center" width="10%">'._AM_TDMCREATE_NB_CHAMPS.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_BLOCKS.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMCREATE_NB_FIELDS.'</th>';
echo '<th align="center" width="20%">'._AM_TDMCREATE_FORMACTION.'</th>';
echo '</tr>';
$class = 'odd';
@@ -473,28 +534,29 @@
$tables_modules = $tables_arr[$i]->getVar('tables_modules');
$tables_name = $tables_arr[$i]->getVar('tables_name');
$tables_img = $tables_arr[$i]->getVar('tables_img');
- $tables_blocks = $tables_arr[$i]->getVar('tables_blocs');
- $tables_champs = $tables_arr[$i]->getVar('tables_champs');
+ $tables_blocks = $tables_arr[$i]->getVar('tables_blocks');
+ $tables_fields = $tables_arr[$i]->getVar('tables_fields');
$tables_display_admin = $tables_arr[$i]->getVar('tables_display_admin');
$tables_display_user = $tables_arr[$i]->getVar('tables_display_user');
- $champs = explode("|", $tables_champs);
- $nb_champs = $tables_arr[$i]->getVar('tables_nb_champs');
+ $fields = explode("|", $tables_fields);
+ $nb_fields = $tables_arr[$i]->getVar('tables_nb_fields');
$display_admin = ($tables_display_admin == 1) ? _YES : _NO;
$display_user = ($tables_display_user == 1) ? _YES : _NO;
- $blocs = ($tables_blocks == 1) ? _YES : _NO;
+ $blocks = ($tables_blocks == 1) ? _YES : _NO;
echo '<tr class="even center">';
echo '<td class="left"> <b>- '.$tables_name.'</b></a></td>';
- if(!is_dir($pathImageAdmin)){
+
+// if(!is_dir($pathIcon32)){
echo '<td><img src="'.$pathIcon32.'/'.$tables_img.'" height="30px"></td>';
- }else{
- echo '<td><img src="../images/uploads/tables/'.$tables_img.'" height="30px"></td>';
- }
+// }else{
+// echo '<td><img src="../images/uploads/tables/'.$tables_img.'" height="30px"></td>';
+// }
echo '<td>'.$display_admin.'</td>';
echo '<td>'.$display_user.'</td>';
- echo '<td>'.$blocs.'</td>';
- echo '<td>'.$nb_champs.'</td>';
+ echo '<td>'.$blocks.'</td>';
+ echo '<td>'.$nb_fields.'</td>';
echo '<td>';
- echo '<a href="tables.php?op=edit_tables&tables_id='.$tables_id.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_champs&tables_id='.$tables_id.'"><img src="'. $pathIcon16 .'/inserttable.png" alt="'._AM_TDMCREATE_FORMCHAMPS.'" title="'._AM_TDMCREATE_FORMCHAMPS.'"></a> <a href="tables.php?op=delete_tables&tables_id='.$tables_id.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
+ echo '<a href="tables.php?op=edit_tables&tables_id='.$tables_id.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_fields&tables_id='.$tables_id.'"><img src="'. $pathIcon16 .'/inserttable.png" alt="'._AM_TDMCREATE_FORMFIELDS.'" title="'._AM_TDMCREATE_FORMFIELDS.'"></a> <a href="tables.php?op=delete_tables&tables_id='.$tables_id.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
echo '</td>';
echo '</tr>';
}
Added: XoopsModules/TDMCreate/trunk/TDMCreate/class/logoGenerator.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/class/logoGenerator.php (rev 0)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/class/logoGenerator.php 2013-10-23 01:22:43 UTC (rev 12194)
@@ -0,0 +1,61 @@
+<?php
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+
+if(function_exists($_GET['f'])) { // get function name and parameter $_GET['f']($_GET["p"]);
+ include_once 'logoGenerator.php';
+ $ret = logoGenerator::createLogo($_GET["iconName"],$_GET["caption"]);
+ phpFunction($ret);
+} else {
+echo 'Method Not Exist';
+}
+
+
+function phpFunction($val=''){ // create php function here
+echo $val;
+ }
+
+class logoGenerator
+{
+
+ static function createLogo($logoIcon, $moduleName)
+ {
+ if (!extension_loaded("gd")) {
+ return false;
+ } else {
+ $required_functions = array("imagecreatefrompng", "imagefttext", "imagecopy", "imagepng", "imagedestroy", "imagecolorallocate");
+ foreach ($required_functions as $func) {
+ if (!function_exists($func)) {
+ return false;
+ }
+ }
+ }
+
+ $dirname = 'TDMCreate';
+ $iconFileName = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/icons/32/".basename($logoIcon);
+
+ if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/logos/xoops2.png") || !file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/logos/VeraBd.ttf") || !file_exists($iconFile = $iconFileName)) {
+ return false;
+ }
+
+ $imageModule = imagecreatefrompng($imageBase);
+ $imageIcon = imagecreatefrompng($iconFile);
+
+ // Write text
+ $text_color = imagecolorallocate($imageModule, 0, 0, 0);
+ $space_to_border = (85 - strlen($moduleName) * 6.5) / 2;
+ imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $text_color, $font, ucfirst($moduleName), array());
+
+ imagecopy($imageModule, $imageIcon, 29, 2, 0, 0, 30, 30);
+
+ $targetImage= "/modules/" . $dirname . "/images/uploads/modules/".$moduleName."_logo.png";
+
+ imagepng($imageModule,XOOPS_ROOT_PATH . $targetImage );
+
+ imagedestroy($imageModule);
+ imagedestroy($imageIcon);
+
+ return XOOPS_URL.$targetImage;
+ }
+
+}
\ No newline at end of file
Property changes on: XoopsModules/TDMCreate/trunk/TDMCreate/class/logoGenerator.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php
===================================================================
--- XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php 2013-10-22 21:51:58 UTC (rev 12193)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php 2013-10-23 01:22:43 UTC (rev 12194)
@@ -27,63 +27,61 @@
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/class/object.php';
}
+//include_once 'iconGenerator.php';
+
class tdmcreate_modules extends XoopsObject
{
// constructor
function __construct()
{
+ global $xoopsModuleConfig;;
$this->XoopsObject();
$this->initVar("modules_id",XOBJ_DTYPE_INT, 0,false,5);
- $this->initVar("modules_name",XOBJ_DTYPE_TXTBOX, 'Module Name',false);
- $this->initVar("modules_version",XOBJ_DTYPE_TXTBOX, '1.00',false);
- $this->initVar("modules_description",XOBJ_DTYPE_TXTAREA, 'Description of the module', false);
- $this->initVar("modules_author",XOBJ_DTYPE_TXTBOX, 'TXMod Xoops (Timgno)', false);
- $this->initVar("modules_author_mail",XOBJ_DTYPE_TXTBOX, 'su...@tx...',false);
- $this->initVar("modules_author_website_url",XOBJ_DTYPE_TXTBOX, 'http://www.txmodxoops.org',false);
- $this->initVar("modules_author_website_name",XOBJ_DTYPE_TXTBOX, 'TXMod Xoops (Timgno)', false);
- $this->initVar("modules_credits",XOBJ_DTYPE_TXTBOX, 'Timgno', false);
- $this->initVar("modules_license",XOBJ_DTYPE_TXTBOX, 'GNU GPL see License', false);
- $this->initVar("modules_release_info",XOBJ_DTYPE_TXTBOX, 'Beta 1 15/04/2012', false);
- $this->initVar("modules_release_file",XOBJ_DTYPE_TXTBOX, 'changelog.txt', false);
- $this->initVar("modules_manual",XOBJ_DTYPE_TXTBOX, 'Manual', false);
- $this->initVar("modules_manual_file",XOBJ_DTYPE_TXTBOX, 'install.txt', false);
+ $this->initVar("modules_name",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_name"],false);
+ $this->initVar("modules_version",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_version"],false);
+ $this->initVar("modules_description",XOBJ_DTYPE_TXTAREA, $xoopsModuleConfig["module_description"], false);
+ $this->initVar("modules_author",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_author"], false);
+ $this->initVar("modules_author_mail",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_author_email"],false);
+ $this->initVar("modules_author_website_url",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_author_website_url"],false);
+ $this->initVar("modules_author_website_name",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_author_website"],false);
+ $this->initVar("modules_credits",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_credits"], false);
+ $this->initVar("modules_license",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_license"], false);
+ $this->initVar("modules_release_info",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_release_info"], false);
+ $this->initVar("modules_release_file",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_release_file"], false);
+ $this->initVar("modules_manual",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_manual"], false);
+ $this->initVar("modules_manual_file",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_manual_file"], false);
$this->initVar("modules_image",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_demo_site_url",XOBJ_DTYPE_TXTBOX, 'http://www.txmodxoops.org/modules/', false);
- $this->initVar("modules_demo_site_name",XOBJ_DTYPE_TXTBOX, 'Module TXMod Xoops', false);
- $this->initVar("modules_forum_site_url",XOBJ_DTYPE_TXTBOX, 'http://www.txmodxoops.org/modules/newbb', false);
- $this->initVar("modules_forum_site_name",XOBJ_DTYPE_TXTBOX, 'TXMod Xoops Community', false);
- $this->initVar("modules_module_website_url",XOBJ_DTYPE_TXTBOX, 'http://www.txmodxoops.org/', false);
- $this->initVar("modules_module_website_name",XOBJ_DTYPE_TXTBOX, 'TXMod Xoops', false);
- $this->initVar("modules_release",XOBJ_DTYPE_TXTBOX, '15/04/2012', false);
- $this->initVar("modules_module_status",XOBJ_DTYPE_TXTBOX, 'Beta 1', false);
- $this->initVar("modules_display_admin",XOBJ_DTYPE_INT, 0, false, 1);
- $this->initVar("modules_display_user",XOBJ_DTYPE_INT, 0, false, 1);
- $this->initVar("modules_active_search",XOBJ_DTYPE_INT, 0, false, 1);
- $this->initVar("modules_active_comments",XOBJ_DTYPE_INT, 0, false, 1);
+ $this->initVar("modules_demo_site_url",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_demo_site_url"], false);
+ $this->initVar("modules_demo_site_name",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_demo_site_name"], false);
+ $this->initVar("modules_forum_site_url",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_forum_site_url"], false);
+ $this->initVar("modules_forum_site_name",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_forum_site_name"], false);
+ $this->initVar("modules_module_website_url",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_website_url"], false);
+ $this->initVar("modules_module_website_name",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_website_name"], false);
+ $this->initVar("modules_release",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_release"], false);
+ $this->initVar("modules_module_status",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_module_status"], false);
+ $this->initVar("modules_display_admin",XOBJ_DTYPE_INT,$xoopsModuleConfig["module_display_admin"], false, 1);
+ $this->initVar("modules_display_user",XOBJ_DTYPE_INT, $xoopsModuleConfig["module_display_user"], false, 1);
+ $this->initVar("modules_active_search",XOBJ_DTYPE_INT, $xoopsModuleConfig["module_active_search"], false, 1);
+ $this->initVar("modules_active_comments",XOBJ_DTYPE_INT, $xoopsModuleConfig["module_active_comments"], false, 1);
}
- function tdmcreate_modules()
- {
- $this->__construct();
- }
-
function getForm($action = false)
{
- global $xoopsDB, $xoopsModule, $xoopsModuleConfig;
+ global $xoopsDB, $xoopsModule, $xoopsModuleConfig, $pathIcon32;
- if ($action === false) {
+ if ($action === FALSE) {
$action = $_SERVER['REQUEST_URI'];
}
$title = $this->isNew() ? sprintf(_AM_TDMCREATE_MODULES_ADD) : sprintf(_AM_TDMCREATE_MODULES_EDIT);
include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, 'form_modules', $action, 'post', true);
+ $form = new XoopsThemeForm($title, 'form_modules', $action, 'post', TRUE);
$form->setExtra('enctype="multipart/form-data"');
$form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_IMPORTANT.'</b></div>','head');
- $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_NAME, 'modules_name', 50, 255, $this->getVar('modules_name')), true);
- $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'modules_version', 50, 255, $this->getVar('modules_version')), true);
+ $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_NAME, 'modules_name', 50, 255, $this->getVar('modules_name')), TRUE);
+ $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'modules_version', 50, 255, $this->getVar('modules_version')), TRUE);
// Name description
$editor_configs=array();
$editor_configs["name"] ="modules_description";
@@ -92,11 +90,11 @@
$editor_configs["cols"] = 100;
$editor_configs["width"] = "100%";
$editor_configs["height"] = "100px";
- $editor_configs["editor"] = $GLOBALS['xoopsModuleConfig']['TDMCreate_editor'];
- $form->addElement( new XoopsFormEditor(_AM_TDMCREATE_MODULES_DESCRIPTION, "modules_description", $editor_configs), true);
+ $editor_configs["editor"] = $GLOBALS['xoopsModuleConfig']['tdmcreate_editor'];
+ $form->addElement( new XoopsFormEditor(_AM_TDMCREATE_MODULES_DESCRIPTION, "modules_description", $editor_configs), TRUE);
// Author
- $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR, 'modules_author', 50, 255, $this->getVar('modules_author')), true);
- $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_LICENSE, 'modules_license', 50, 255, $this->getVar('modules_license')), true);
+ $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR, 'modules_author', 50, 255, $this->getVar('modules_author')), TRUE);
+ $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_LICENSE, 'modules_license', 50, 255, $this->getVar('modules_license')), TRUE);
$modules_display_admin = $this->isNew() ? 0 : $this->getVar('modules_display_admin');
$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_DISPLAY_ADMIN, 'modules_display_admin', $modules_display_admin, _YES, _NO));
$modules_display_user = $this->isNew() ? 0 : $this->getVar('modules_display_user');
@@ -106,7 +104,7 @@
$modules_active_comments = $this->isNew() ? 0 : $this->getVar('modules_active_comments');
$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_ACTIVE_COMMENTS, 'modules_active_comments', $modules_active_comments, _YES, _NO));
- $modules_image = $this->getVar('modules_image') ? $this->getVar('modules_image') : 'blank.gif';
+ $modules_image = $this->getVar('modules_image') ? $this->getVar('modules_image') : 'module_logo.png';
$uploadirectory = "/modules/".$xoopsModule->dirname()."/images/uploads/modules";
$imgtray = new XoopsFormElementTray(_AM_TDMCREATE_MODULES_IMAGE,'<br />');
@@ -117,32 +115,151 @@
$imageselect->addOption("$image", $image);
}
$imageselect->setExtra( "onchange='showImgSelected(\"image3\", \"modules_image\", \"" . $uploadirectory . "\", \"\", \"" . XOOPS_URL . "\")'" );
- $imgtray->addElement($imageselect,false);
+ $imgtray->addElement($imageselect,FALSE);
$imgtray -> addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_URL . "/" . $uploadirectory . "/" . $modules_image . "' name='image3' id='image3' alt='' />" ) );
-
- $fileseltray= new XoopsFormElementTray('','<br />');
- $fileseltray->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD , 'attachedfile', 104857600),false);
- $fileseltray->addElement(new XoopsFormLabel(''), false);
- $imgtray->addElement($fileseltray);
- $form->addElement($imgtray);
+
+// $fileseltray= new XoopsFormElementTray('','<br />');
+// $fileseltray->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD , 'attachedfile', 104857600),FALSE);
+// $fileseltray->addElement(new XoopsFormLabel(''), FALSE);
+// $imgtray->addElement($fileseltray);
+
+ $form->addElement($imgtray);
+
+//---------- START -----------------
+ ?>
+
+ <script type="text/javascript">
+
+ function showImgSelected2(imgId, selectId, imgDir, extra, xoopsUrl) {
+ if (xoopsUrl == null) {
+ xoopsUrl = "./";
+ }
+ imgDom = xoopsGetElementById(imgId);
+ selectDom = xoopsGetElementById(selectId);
+ if (selectDom.options[selectDom.selectedIndex].value != "") {
+ imgDom...
[truncated message content] |
