Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12196] XoopsModules/TDMCreate/trunk/TDMCreate
|
From: <be...@us...> - 2013-10-23 01:53:41
|
Revision: 12196
http://sourceforge.net/p/xoops/svn/12196
Author: beckmi
Date: 2013-10-23 01:53:35 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Updating trunk to revision 9009 (timgno): Added new releases 1.39 alpha 1, added new files
Revision Links:
--------------
http://sourceforge.net/p/xoops/svn/9009
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/languages.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_champs.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_modules.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_tables.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_about.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_admin_header.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_architecture.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_class.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_header.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_main_language.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_footer.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_templates_pages.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_user_header.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/lang_diff.txt
XoopsModules/TDMCreate/trunk/TDMCreate/include/functions.php
XoopsModules/TDMCreate/trunk/TDMCreate/include/functions_const.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/arabic/admin.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/arabic/modinfo.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/bulgarian/admin.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/bulgarian/modinfo.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/english/help.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/english/modinfo.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/french/admin.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/french/modinfo.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/italian/admin.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/italian/help.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/italian/modinfo.php
XoopsModules/TDMCreate/trunk/TDMCreate/language/update language 1.38 to 1.39.txt
XoopsModules/TDMCreate/trunk/TDMCreate/sql/mysql.sql
Added Paths:
-----------
XoopsModules/TDMCreate/trunk/TDMCreate/admin/
XoopsModules/TDMCreate/trunk/TDMCreate/class/
XoopsModules/TDMCreate/trunk/TDMCreate/const/
XoopsModules/TDMCreate/trunk/TDMCreate/css/
XoopsModules/TDMCreate/trunk/TDMCreate/docs/
XoopsModules/TDMCreate/trunk/TDMCreate/images/
XoopsModules/TDMCreate/trunk/TDMCreate/include/
XoopsModules/TDMCreate/trunk/TDMCreate/index.html
XoopsModules/TDMCreate/trunk/TDMCreate/js/
XoopsModules/TDMCreate/trunk/TDMCreate/language/
XoopsModules/TDMCreate/trunk/TDMCreate/modules/
XoopsModules/TDMCreate/trunk/TDMCreate/sql/
XoopsModules/TDMCreate/trunk/TDMCreate/templates/
XoopsModules/TDMCreate/trunk/TDMCreate/xoops_version.php
Removed Paths:
-------------
XoopsModules/TDMCreate/trunk/TDMCreate/admin/
XoopsModules/TDMCreate/trunk/TDMCreate/admin/readme.php
XoopsModules/TDMCreate/trunk/TDMCreate/class/
XoopsModules/TDMCreate/trunk/TDMCreate/class/tdmcreate_architecture.php
XoopsModules/TDMCreate/trunk/TDMCreate/const/
XoopsModules/TDMCreate/trunk/TDMCreate/const/const_js_jquery.php
XoopsModules/TDMCreate/trunk/TDMCreate/css/
XoopsModules/TDMCreate/trunk/TDMCreate/docs/
XoopsModules/TDMCreate/trunk/TDMCreate/images/
XoopsModules/TDMCreate/trunk/TDMCreate/include/
XoopsModules/TDMCreate/trunk/TDMCreate/index.html
XoopsModules/TDMCreate/trunk/TDMCreate/js/
XoopsModules/TDMCreate/trunk/TDMCreate/language/
XoopsModules/TDMCreate/trunk/TDMCreate/modules/
XoopsModules/TDMCreate/trunk/TDMCreate/sql/
XoopsModules/TDMCreate/trunk/TDMCreate/sql/mysql137.sql
XoopsModules/TDMCreate/trunk/TDMCreate/sql/mysql139a.sql
XoopsModules/TDMCreate/trunk/TDMCreate/templates/
XoopsModules/TDMCreate/trunk/TDMCreate/xoops_version.php
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/admin_footer.php 2013-10-22 17:13:44 UTC (rev 12192)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_footer.php 2013-10-23 01:53:35 UTC (rev 12196)
@@ -22,7 +22,6 @@
* ****************************************************************************
*/
global $pathImageAdmin;
- echo "<div align='center'><a href='http://www.xoops.org' target='_blank'>
- <img src='".$pathImageAdmin."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a></div>";
+ echo "<div align='center'><a href='http://www.xoops.org' target='_blank'><img src='".$pathImageAdmin."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a></div>";
echo "<div class='center pad5'>" . sprintf(_AM_TDMCREATE_MAINTAINEDBY, $xoopsModule->getVar('name')) . "</div>";
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/admin_header.php 2013-10-22 17:13:44 UTC (rev 12192)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/admin_header.php 2013-10-23 01:53:35 UTC (rev 12196)
@@ -22,21 +22,28 @@
* ****************************************************************************
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
include_once '../include/functions.php';
include_once 'includes.php';
//echo TDMCreate_adminMenu(_AM_ERROR_NOFRAMEWORKS);
$pathDir = $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin');
+$globlang = $GLOBALS['xoopsConfig']['language'];
+if ( file_exists($pathDir.'/language/'.$globlang.'/main.php')){
+ include_once $pathDir.'/language/'.$globlang.'/main.php';
+ }else{
+ include_once $pathDir.'/language/english/main.php';
+ }
+
if ( file_exists($pathDir.'/moduleadmin.php')){
- include_once $pathDir.'/moduleadmin.php';
- //return true;
-}else{
- xoops_cp_header();
- echo xoops_error(_AM_MODULEADMIN_MISSING);
- xoops_cp_footer();
- //return false;
-}
+ include_once $pathDir.'/moduleadmin.php';
+ //return true;
+ }else{
+ xoops_cp_header();
+ echo xoops_error(_AM_MODULEADMIN_MISSING);
+ xoops_cp_footer();
+ //return false;
+ }
$dirname = basename(dirname(dirname( __FILE__ ) ));
$module_handler =& xoops_gethandler('module');
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/building.php 2013-10-22 17:13:44 UTC (rev 12192)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/building.php 2013-10-23 01:53:35 UTC (rev 12196)
@@ -21,6 +21,7 @@
* Version : 1.39 Tue 2012/02/14 16:20:18 : Timgno Exp $
* ****************************************************************************
*/
+
include 'admin_header.php';
xoops_cp_header();
@@ -33,16 +34,14 @@
case "creation":
$mods =& $modsHandler->get($_REQUEST['modules_name']);
$mods_name = $mods->getVar('modules_name');
- $mods_fname = $mods->getVar('modules_fname');
$mods_desc = $mods->getVar('modules_description');
$mods_author_website_name = $mods->getVar('modules_author_website_name');
$mods_author_website_url = $mods->getVar('modules_author_website_url');
$mods_image = $mods->getVar('modules_image');
$mods_display_admin = $mods->getVar('modules_display_admin');
$mods_display_user = $mods->getVar('modules_display_user');
- $mods_donations = $mods->getVar('modules_donations');
//Remove the new module directory if it exists
- //clearDir($modPath.'/modules/'.$modules_fname);
+ clearDir($modPath.'/modules/'.$mods_name);
//Nom des tables et combien de tables
$criteria = new CriteriaCompo();
@@ -58,9 +57,9 @@
/*Structure*/
/************************************************/
//Creation de l'architecture
- const_architecture($mods_fname, $mods_image);
+ const_architecture($mods_name, $mods_image);
//Creation du changelog.txt
- const_changelog($mods, $mods_fname);
+ const_changelog($mods, $mods_name);
// Files cicles
foreach (array_keys($tbls_arr) as $i)
@@ -87,41 +86,43 @@
copy($tbls_img1, $modPath."/modules/".$mods_name."/images/deco/".$tbls_img);
}
//Creation des classes
- const_class($mods, $mods_fname, $tbls_module_table, $tbls_name, $tbls_champs, $tbls_parametres);
+ const_class($mods, $mods_name, $tbls_module_table, $tbls_name, $tbls_champs, $tbls_parametres);
//Creation of pages admin
if ( $mods_display_admin == 1 ) {
- const_admin_pages($mods, $mods_fname, $tbls_id, $tbls_module_table, $tbls_name, $tbls_img, $tbls_champs, $tbls_parametres, $tbls_online, $tbls_pending);
+ const_admin_pages($mods, $mods_name, $tbls_id, $tbls_module_table, $tbls_name, $tbls_img, $tbls_champs, $tbls_parametres, $tbls_online, $tbls_pending);
}
//Creation of pages and templates user
if ( $mods_display_user == 1 ) {
- const_user_pages($mods, $mods_fname, $tbls_name, $tbls_champs, $tbls_champs, $tbls_parametres);
+ const_user_pages($mods, $mods_name, $tbls_name, $tbls_champs, $tbls_champs, $tbls_parametres);
// Creation of templates pages
- const_templates_pages($mods, $mods_fname, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
+ const_templates_pages($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
}
//Creation of search
if ( $tbls_search == 1 ) {
- const_include_search($mods, $mods_fname, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres, $tbls_img);
+ const_include_search($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres, $tbls_img);
}
//Creation of the comments
if ( $tbls_coms == 1 ) {
- const_include_coms($mods, $mods_fname, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
+ const_include_coms($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
}
//Creation of the file mysql.sql
- const_sql($mods_fname, $tbls_module_table, $tbls_name, $tbls_champs);
- $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix('tdmcreate_tables').
- " WHERE tables_name = 'cat' OR tables_name = 'category'
- OR tables_name = 'categories'
- OR tables_name = '".$tbls_name."_cat'
- OR tables_name = '".$tbls_name."_category'
- OR tables_name = '".$tbls_name."_categories' ");
+ const_sql($mods_name, $tbls_module_table, $tbls_name, $tbls_champs);
+ $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables").
+ " WHERE tables_name = 'topic' OR tables_name = '".$tbls_name."_topic'
+ OR tables_name = 'cat'
+ OR tables_name = 'category'
+ OR tables_name = 'categories'
+ OR tables_name = '".$tbls_name."_cat'
+ OR tables_name = '".$tbls_name."_category'
+ OR tables_name = '".$tbls_name."_categories' ");
list( $topic ) = $xoopsDB->fetchRow($result);
//Creation of the blocks
if ( $tbls_blocks != 1 ) {
- const_blocks($mods, $mods_fname, $tbls_module_table, $tbls_name, $tbls_champs, $tbls_parametres, $topic);
+ const_blocks($mods, $mods_name, $tbls_module_table, $tbls_name, $tbls_champs, $tbls_parametres, $topic);
//Creation of template blocks
- const_blocks_templates($mods, $mods_fname, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
+ const_blocks_templates($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
}
}
//Variables
@@ -140,44 +141,43 @@
$tbls_coms = $tblsHandler->getVar('tables_coms');
//Creation of xoopsversion.php file
//Xoops version set to integrate the end of the block, etc.
- const_xoopsversion($mods, $mods_fname, $tbls_arr, $tbls_module_table, $tbls_blocks);
+ const_xoopsversion($mods, $mods_name, $tbls_arr, $tbls_module_table, $tbls_blocks);
if($mods_display_user == 1){
// Creation of template index
- const_templates_index($mods, $mods_fname, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
+ const_templates_index($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
// Creation of template header
- const_templates_header($mods, $mods_fname);
+ const_templates_header($mods, $mods_name);
// Creation of template footer
- const_templates_footer($mods, $mods_fname, $tbls_module_table);
+ const_templates_footer($mods, $mods_name, $tbls_module_table);
}
//Creation of the file permissions
$topic = 0;
if ( $topic == 1 || $tbls_module_table != null) { //
- const_admin_permissions($mods, $mods_fname, $tbls_name, $topic);
+ const_admin_permissions($mods, $mods_name, $tbls_name, $topic);
}
- // JQuery
- const_js_jquery($mods, $mods_name);
- //Include
+
+ //Include
//Configs
- const_include_configs($mods, $mods_fname, $mods_author_website_name, $mods_author_website_url);
+ const_include_configs($mods, $mods_name, $mods_author_website_name, $mods_author_website_url);
//Style
- const_css_admin($mods, $mods_fname);
- const_css_style($mods, $mods_fname);
+ const_css_admin($mods, $mods_name);
+ const_css_style($mods, $mods_name);
//Functions
- const_include_functions($mods, $mods_fname);
+ const_include_functions($mods, $mods_name);
//Creation of the install file for uploads
- const_include_install($mods, $mods_fname, $tbls_arr);
+ const_include_install($mods, $mods_name, $tbls_arr);
//Language
///////////////////////////////////////////////////////////////////////
//Creation of language main.php
- const_main_language($mods, $mods_fname, $mods_desc);
+ const_main_language($mods, $mods_name, $mods_desc);
//Creation of language modinfo.php
- const_modinfo_language($mods, $mods_fname, $tbls_arr, $mods_desc);
+ const_modinfo_language($mods, $mods_name, $tbls_arr, $mods_desc);
//Creation of language admin.php
- const_admin_language($mods, $mods_fname, $mods_desc, $tbls_name, $tbls_arr, $tbls_pending);
+ const_admin_language($mods, $mods_name, $mods_desc, $tbls_name, $tbls_arr, $tbls_pending);
//Creation of language blocks.php
- const_blocks_language($mods, $mods_fname);
+ const_blocks_language($mods, $mods_name);
//Creation of language help.php
- const_help_language($mods, $mods_fname, $mods_desc);
+ const_help_language($mods, $mods_name, $mods_desc);
//Creation of language
//const_language($mods, $mods_name);
///////////////////////////////////////////////////////////////////////
@@ -186,22 +186,22 @@
/************************************************/
if ( $mods_display_admin == 1 ) {
//Creation of admin file admin_header.php
- const_admin_header($mods, $mods_fname, $tbls_arr);
+ const_admin_header($mods, $mods_name, $tbls_arr);
//Creation of admin file admin_footer.php
- const_admin_footer($mods, $mods_fname, $tbls_arr);
+ const_admin_footer($mods, $mods_name, $tbls_arr);
//Creation of admin file menu.php
- const_admin_menu($mods, $mods_fname, $tbls_arr, $topic);
+ const_admin_menu($mods, $mods_name, $tbls_arr, $topic);
//Creation of admin file about.php
- const_admin_about($mods, $mods_fname, $mods_donations);
+ const_admin_about($mods, $mods_name);
//Creation of admin file index.php
- const_admin_index($mods, $mods_fname, $tbls_arr, $tbls_online, $tbls_pending);
+ const_admin_index($mods, $mods_name, $tbls_arr, $tbls_online, $tbls_pending);
}
/************************************************/
/*User*/
/************************************************/
if ( $mods_display_user == 1 ) {
- const_user_header($mods, $mods_fname, $tbls_arr, $tbls_module_table);
- const_user_index($mods, $mods_fname);
+ const_user_header($mods, $mods_name, $tbls_arr, $tbls_module_table);
+ const_user_index($mods, $mods_name);
}
echo '</td></tr></table>';
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/languages.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/languages.php 2013-10-22 17:13:44 UTC (rev 12192)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/languages.php 2013-10-23 01:53:35 UTC (rev 12196)
@@ -127,10 +127,7 @@
$langAdmin->addItemButton(_AM_TDMCREATE_LANGUAGES_NEWFOLDER, 'languages.php?op=add_folder', 'add');
$langAdmin->addItemButton(_AM_TDMCREATE_LANGUAGES_NEWFILE, 'languages.php?op=add_file', 'add');
echo $langAdmin->renderButton();
- $numrows_modules = $modsHandler->getCount();
- if($numrows_modules == 0){
- redirect_header('modules.php', 3, _AM_TDMCREATE_NOMODULES);
- }
+
$criteria = new CriteriaCompo();
$criteria->setSort("languages_id");
$criteria->setOrder("ASC");
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/menu.php 2013-10-22 17:13:44 UTC (rev 12192)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/menu.php 2013-10-23 01:53:35 UTC (rev 12196)
@@ -22,50 +22,58 @@
* ****************************************************************************
*/
$dirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+
$module_handler =& xoops_gethandler("module");
$xoopsModule =& XoopsModule::getByDirname($dirname);
$moduleInfo =& $module_handler->get($xoopsModule->getVar("mid"));
$pathImageAdmin = $moduleInfo->getInfo("icons32");
-$adminmenu = array(); $i = 1;
+$adminmenu = array();
+
+$i = 1;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU1;
+//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU1_DESC;
$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/dashboard.png";
+$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/home.png";
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU2;
+//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU2_DESC
$adminmenu[$i]["link"] = "admin/modules.php";
$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/addmodule.png";
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU3;
+//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU3_DESC
$adminmenu[$i]["link"] = "admin/tables.php";
$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/addtable.png";
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU4;
+//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU4_DESC
$adminmenu[$i]["link"] = "admin/languages.php";
$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/languages.png";
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU5;
+//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU5_DESC
$adminmenu[$i]["link"] = "admin/css.php";
$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/stylesheet.png";
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU6;
+//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU6_DESC
$adminmenu[$i]["link"] = "admin/changelog.php";
$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/changelog.png";
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU7;
-$adminmenu[$i]["link"] = "admin/building.php";
-$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/builder.png";
+//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU7_DESC
+$adminmenu[$i]["link"] = 'admin/building.php';
+$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/builder.png';
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU8;
-$adminmenu[$i]["link"] = "admin/filesmanager.php";
-$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/file-manager.png";
+//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU8_DESC
+$adminmenu[$i]["link"] = 'admin/filesmanager.php';
+$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/file-manager.png';
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU9;
+//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU9_DESC;
$adminmenu[$i]["link"] = "admin/about.php";
$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/about.png";
-$i++;
-$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU10;
-$adminmenu[$i]["link"] = "admin/readme.php";
-$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/document.png";
unset( $i );
?>
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/modules.php 2013-10-22 17:13:44 UTC (rev 12192)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/modules.php 2013-10-23 01:53:35 UTC (rev 12196)
@@ -40,11 +40,10 @@
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/modules/";
- $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes'],
- $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']);
- $name_img = $_GET['modules_fname'].'_slogo.'.$extension;
+ $name_img = $_REQUEST['modules_name'].'_slogo.'.$extension;
$uploader->setTargetFileName($name_img);
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
@@ -58,7 +57,6 @@
}
$obj->setVar('modules_name', $_REQUEST['modules_name']);
- $obj->setVar('modules_fname', $_REQUEST['modules_fname']);
$obj->setVar('modules_version', $_REQUEST['modules_version']);
$obj->setVar('modules_description', $_REQUEST['modules_description']);
$obj->setVar('modules_author', $_REQUEST['modules_author']);
@@ -75,11 +73,10 @@
$obj->setVar('modules_demo_site_name', $_REQUEST['modules_demo_site_name']);
$obj->setVar('modules_forum_site_url', $_REQUEST['modules_forum_site_url']);
$obj->setVar('modules_forum_site_name', $_REQUEST['modules_forum_site_name']);
- $obj->setVar('modules_website_url', $_REQUEST['modules_website_url']);
- $obj->setVar('modules_website_name', $_REQUEST['modules_website_name']);
+ $obj->setVar('modules_module_website_url', $_REQUEST['modules_module_website_url']);
+ $obj->setVar('modules_module_website_name', $_REQUEST['modules_module_website_name']);
$obj->setVar('modules_release', $_REQUEST['modules_release']);
- $obj->setVar('modules_status', $_REQUEST['modules_status']);
- $obj->setVar('modules_donations', $_REQUEST['modules_donations']);
+ $obj->setVar('modules_module_status', $_REQUEST['modules_module_status']);
$obj->setVar('modules_display_admin', $_REQUEST['modules_display_admin']);
$obj->setVar('modules_display_user', $_REQUEST['modules_display_user']);
$obj->setVar('modules_active_search', $_REQUEST['modules_active_search']);
@@ -128,16 +125,15 @@
echo $modAdmin->renderButton();
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('modules_id', 0, '>'));
- $criteria->setSort('modules_id ASC, modules_fname');
+ $criteria->setSort('modules_name');
$criteria->setOrder('ASC');
- $numrows = $modsHandler->getCount();
+ $numrows_modules = $modsHandler->getCount();
if (isset($_REQUEST['limit'])) {
$criteria->setLimit($_REQUEST['limit']);
$limit = $_REQUEST['limit'];
} else {
- $criteria->setLimit($GLOBALS['xoopsModuleConfig']['adminperpage']);
- $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ $criteria->setLimit($GLOBALS['xoopsModuleConfig']['admin_perpage']);
+ $limit = $GLOBALS['xoopsModuleConfig']['admin_perpage'];
}
if (isset($_REQUEST['start'])) {
$criteria->setStart($_REQUEST['start']);
@@ -146,62 +142,74 @@
$criteria->setStart(0);
$start = 0;
}
- $tri = 1;
- $order = 1;
- if (isset($_REQUEST['order'])) {
- if ($_REQUEST['order'] ==1 ) {
+ $document_tri = 1;
+ $document_order = 1;
+ if (isset($_REQUEST['document_order'])) {
+ if ($_REQUEST['document_order'] ==1 ) {
$criteria->setOrder('ASC');
- $order=1;
+ $document_order=1;
}
- if ($_REQUEST['order'] == 2) {
+ if ($_REQUEST['document_order'] == 2) {
$criteria->setOrder('DESC');
- $order=2;
+ $document_order=2;
}
} else {
$criteria->setOrder('DESC');
}
- $mods_arr = $modsHandler->getall($criteria);
- if ( $numrows > $limit ) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=modules_list&limit='.$limit.'&tri='.$tri.'&order='.$order);
+ $mods_arr = $modsHandler->getall($criteria);
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ if ( $numrows_modules > $limit ) {
+ $pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=modules_list&limit='.$limit.'&document_tri='.$document_tri.'&document_order='.$document_order);
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
}
//echo "<div class='center'>".$pagenav."</div>";
- if ( $numrows > 0 )
+ if ( $numrows_modules > 0 )
{
- echo '<table width="100%" cellspacing="1" class="outer"><tr class="center">';
- echo '<th width="5%">'._AM_TDMCREATE_ID.'</th>';
- echo '<th width="10%">'._AM_TDMCREATE_FOLDER.'</th>';
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<tr class="center">';
+ echo '<th width="10%">'._AM_TDMCREATE_ID.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
- echo '<th width="5%">'._AM_TDMCREATE_VERSION.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_VERSION.'</th>';
echo '<th width="10%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
echo '<th width="10%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
echo '<th width="10%">'._AM_TDMCREATE_RELEASE.'</th>';
- echo '<th width="8%">'._AM_TDMCREATE_STATUS.'</th>';
- echo '<th width="8%">'._AM_TDMCREATE_SEARCH.'</th>';
- echo '<th width="8%">'._AM_TDMCREATE_COMMENTS.'</th>';
- echo '<th width="8%">'._AM_TDMCREATE_FORMACTION.' </th></tr>';
- $class = 'odd';
+ echo '<th width="10%">'._AM_TDMCREATE_STATUS.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_SEARCH.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_FORMACTION.' </th>';
+ echo '</tr>';
+ $class = 'odd';
+
foreach (array_keys($mods_arr) as $i)
{
$mods_id = $mods_arr[$i]->getVar('modules_id');
- $display_admin = ($mods_arr[$i]->getVar('modules_display_admin') == 1) ? _YES : _NO;
- $display_user = ($mods_arr[$i]->getVar('modules_display_user') == 1) ? _YES : _NO;
- $active_search = ($mods_arr[$i]->getVar('modules_active_search') == 1) ? _YES : _NO;
- $active_comms = ($mods_arr[$i]->getVar('modules_active_comments') == 1) ? _YES : _NO;
- echo '<tr class="odd center"><td><b>'.$mods_id.'</b></td>';
- echo '<td><b>'.$mods_arr[$i]->getVar('modules_name').'</b></td>';
- echo '<td><img src="../images/uploads/modules/'.$mods_arr[$i]->getVar('modules_image').'" height="30px"></td>';
- echo '<td><b>'.$mods_arr[$i]->getVar('modules_version').'</b></td>';
- echo '<td>'.$display_admin.'</td><td>'.$display_user.'</td>';
- echo '<td>'.$mods_arr[$i]->getVar('modules_release').'</td>';
- echo '<td>'.$mods_arr[$i]->getVar('modules_status').'</td>';
- echo '<td>'.$active_search.'</td><td>'.$active_comms.'</td>';
+ $mods_name = $mods_arr[$i]->getVar('modules_name');
+ $mods_image = $mods_arr[$i]->getVar('modules_image');
+ $mods_version = $mods_arr[$i]->getVar('modules_version');
+ $mods_release = $mods_arr[$i]->getVar('modules_release');
+ $mods_module_status = $mods_arr[$i]->getVar('modules_module_status');
+ $mods_display_admin = $mods_arr[$i]->getVar('modules_display_admin');
+ $mods_display_user = $mods_arr[$i]->getVar('modules_display_user');
+ $mods_active_search = $mods_arr[$i]->getVar('modules_active_search');
+ $display_admin = ($mods_display_admin == 1) ? _YES : _NO;
+ $display_user = ($mods_display_user == 1) ? _YES : _NO;
+ $active_search = ($mods_active_search == 1) ? _YES : _NO;
+ echo '<tr class="odd center">';
+ echo '<td><b>'.$mods_id.'</b></td>';
+ echo '<td><b>'.$mods_name.'</b></td>';
+ echo '<td><img src="../images/uploads/modules/'.$mods_image.'" height="30px"></td>';
+ echo '<td><b>'.$mods_version.'</b></td>';
+ echo '<td>'.$display_admin.'</td>';
+ echo '<td>'.$display_user.'</td>';
+ echo '<td>'.$mods_release.'</td>';
+ echo '<td>'.$mods_module_status.'</td>';
+ echo '<td>'.$active_search.'</td>';
echo '<td>';
echo '<a href="modules.php?op=modules_edit&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="modules.php?op=modules_delete&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
- echo '</td></tr>';
+ echo '</td>';
+ echo '</tr>';
}
echo '</table><br />';
echo "<div class='center'>".$pagenav."</div><br />";
Deleted: XoopsModules/TDMCreate/trunk/TDMCreate/admin/readme.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/readme.php 2013-10-22 17:13:44 UTC (rev 12192)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/readme.php 2013-10-23 01:53:35 UTC (rev 12196)
@@ -1,97 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
- * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
- * - Revision Copyright (c) (http://www.txmodxoops.org)
- *
- * This license contains restrictions!!!
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @license TDM GPL license
- * @author TDM TEAM DEV MODULE
- * @author TXMod Xoops (in...@tx...)
- *
- * Version : 1.39 Tue 2012/02/14 16:20:18 : Timgno Exp $
- * ****************************************************************************
- */
-include "admin_header.php";
-xoops_cp_header();
-$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
-$readAdmin = new ModuleAdmin();
-switch ($op) {
- case 'default':
- case 'readme':
- default:
- echo $readAdmin->addNavigation('readme.php');
- $readAdmin->addItemButton(_AM_TDMCREATE_CHANGELOG, 'readme.php?op=changelog', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_CREDITS, 'readme.php?op=credits', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_INSTALL, 'readme.php?op=install', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LICENCE, 'readme.php?op=licence', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LANGDIFF, 'readme.php?op=lang_diff', 'list');
- echo $readAdmin->renderButton();
- echo TDMCreate_readData('readme.txt', _AM_TDMCREATE_README);
- break;
-
- case 'changelog':
- echo $readAdmin->addNavigation('readme.php');
- $readAdmin->addItemButton(_AM_TDMCREATE_README, 'readme.php?op=readme', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_CREDITS, 'readme.php?op=credits', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_INSTALL, 'readme.php?op=install', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LICENCE, 'readme.php?op=licence', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LANGDIFF, 'readme.php?op=lang_diff', 'list');
- echo $readAdmin->renderButton();
- echo TDMCreate_readData('changelog.txt', _AM_TDMCREATE_CHANGELOG);
- break;
-
- case 'credits':
- echo $readAdmin->addNavigation('readme.php');
- $readAdmin->addItemButton(_AM_TDMCREATE_README, 'readme.php?op=readme', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_CHANGELOG, 'readme.php?op=changelog', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_INSTALL, 'readme.php?op=install', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LICENCE, 'readme.php?op=licence', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LANGDIFF, 'readme.php?op=lang_diff', 'list');
- echo $readAdmin->renderButton();
- echo TDMCreate_readData('credits.txt', _AM_TDMCREATE_CREDITS);
- break;
-
- case 'install':
- echo $readAdmin->addNavigation('readme.php');
- $readAdmin->addItemButton(_AM_TDMCREATE_README, 'readme.php?op=readme', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_CHANGELOG, 'readme.php?op=changelog', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_CREDITS, 'readme.php?op=credits', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LICENCE, 'readme.php?op=licence', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LANGDIFF, 'readme.php?op=lang_diff', 'list');
- echo $readAdmin->renderButton();
- echo TDMCreate_readData('install.txt', _AM_TDMCREATE_INSTALL);
- break;
-
- case 'licence':
- echo $readAdmin->addNavigation('readme.php');
- $readAdmin->addItemButton(_AM_TDMCREATE_README, 'readme.php?op=readme', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_CHANGELOG, 'readme.php?op=changelog', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_CREDITS, 'readme.php?op=credits', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_INSTALL, 'readme.php?op=install', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LANGDIFF, 'readme.php?op=lang_diff', 'list');
- echo $readAdmin->renderButton();
- echo TDMCreate_readData('licence.txt', _AM_TDMCREATE_LICENCE);
- break;
-
- case 'lang_diff':
- echo $readAdmin->addNavigation('readme.php');
- $readAdmin->addItemButton(_AM_TDMCREATE_README, 'readme.php?op=readme', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_CHANGELOG, 'readme.php?op=changelog', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_CREDITS, 'readme.php?op=credits', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_INSTALL, 'readme.php?op=install', 'list');
- $readAdmin->addItemButton(_AM_TDMCREATE_LICENCE, 'readme.php?op=licence', 'list');
- echo $readAdmin->renderButton();
- echo TDMCreate_readData('lang_diff.txt', _AM_TDMCREATE_LANGDIFF);
- break;
-}
-include "admin_footer.php";
\ No newline at end of file
Modified: XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/tables.php 2013-10-22 17:13:44 UTC (rev 12192)
+++ XoopsModules/TDMCreate/trunk/TDMCreate/admin/tables.php 2013-10-23 01:53:35 UTC (rev 12196)
@@ -27,26 +27,220 @@
$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'tables_list', 'string' );
$tablesAdmin = new ModuleAdmin();
switch ($op) {
- // Save the first step
- case "tables_save":
+ case "tables_save":
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ $tables_id = TDMCreate_CleanVars( $_REQUEST, 'tables_id', 0, 'int' );
+ if (isset($_REQUEST['tables_id'])) {
+ $obj =& $tblsHandler->get($tables_id);
+ } else {
+ $obj =& $tblsHandler->create();
+ }
+
+ //Name of the module
+ $modules =& $modsHandler->get($_REQUEST['tables_modules']);
+ $modules_name = $modsHandler->getVar('modules_name');
+
+ $obj->setVar('tables_modules', $_REQUEST['tables_modules']);
+
+ if ( $_REQUEST['select'] == 1 )
+ {
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_topic'));
+ $obj->setVar('tables_name', 'topic');
+ $obj->setVar('tables_blocks', 0);
+ $obj->setVar('tables_display_admin', 0);
+ $obj->setVar('tables_display_user', 0);
+ $obj->setVar('tables_submitter', 0);
+ $obj->setVar('tables_publisher', 0);
+ $obj->setVar('tables_created', 0);
+ $obj->setVar('tables_published', 0);
+ $obj->setVar('tables_expired', 0);
+ $obj->setVar('tables_status', 0);
+ $obj->setVar('tables_online', 0);
+ $obj->setVar('tables_pending', 0);
+ $obj->setVar('tables_search', 0);
+ $obj->setVar('tables_coms', 0);
+ $obj->setVar('tables_nb_champs', 15);
+
+ $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: :';
+
+ // Options Extra Champs
+ if ( isset($_REQUEST['tables_submitter']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_submitter:int:11: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_publisher']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_publisher:text: :NOT NULL: :';
+ if ( isset($_REQUEST['tables_created']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_created:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_published']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_published:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_expired']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_expired:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_status']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_status:tinyint:2: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_online']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_pending']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_pending:tinyint:1: :NOT NULL:0:';
+
+ $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|XoopsFormSelect:0:0:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1';
+
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+
+ if(is_dir($pathImageAdmin)){
+ $uploaddir = $pathImageAdmin;
+ }else{
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/";
+ }
+
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
+ $name_img = $_GET['tables_name'].'.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $obj->setVar('tables_img', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('tables_img', $_REQUEST['tables_img1']);
+ }
+ } else {
+
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
+ $obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
+ $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']);
+ if ( isset($_REQUEST['tables_submitter']) )
+ $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']);
+ if ( isset($_REQUEST['tables_publisher']) )
+ $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']);
+ if ( isset($_REQUEST['tables_created']) )
+ $obj->setVar('tables_created', $_REQUEST['tables_created']);
+ if ( isset($_REQUEST['tables_published']) )
+ $obj->setVar('tables_published', $_REQUEST['tables_published']);
+ if ( isset($_REQUEST['tables_expired']) )
+ $obj->setVar('tables_expired', $_REQUEST['tables_expired']);
+ if ( isset($_REQUEST['tables_status']) )
+ $obj->setVar('tables_status', $_REQUEST['tables_status']);
+ if ( isset($_REQUEST['tables_online']) )
+ $obj->setVar('tables_online', $_REQUEST['tables_online']);
+ if ( isset($_REQUEST['tables_pending']) )
+ $obj->setVar('tables_pending', $_REQUEST['tables_pending']);
+ 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']);
+
+ $tables_champs = '';
+ $tables_parametres = '';
+ for($i=0; $i<$_REQUEST['tables_nb_champs']; $i++)
+ {
+ //Repare 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_blocks'][$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";
+ }
+
+ //Repare of 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]."" : " ";
+
+ //Coupure entre les champs et coupre entre les parametres
+ if ( $i != $_REQUEST['tables_nb_champs'] - 1) {
+ $tables_champs .= '|';
+ if ( $i != 0 )
+ $tables_parametres .= '|';
+ } else {
+ // Options Extra Champs
+ if ( isset($_REQUEST['tables_submitter']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_submitter:int:11: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_publisher']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_publisher:text: :NOT NULL: :';
+ if ( isset($_REQUEST['tables_created']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_created:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_published']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_published:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_expired']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_expired:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_status']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_status:tinyint:2: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_online']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_pending']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_pending:tinyint:1: :NOT NULL:0:';
+ // Parameters
+ $tables_parametres .= '|XoopsFormSelectUser:1:1:1:0:0:1|XoopsFormTextDateSelect: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);
+
+ if ($tblsHandler->insert($obj))
+ {
+ redirect_header('tables.php?op=tables_list', 2, _AM_TDMCREATE_FORMOK);
+ }
+
+ break;
+
+ case "tables_save1":
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
+ }
+
+ $tables_id = TDMCreate_CleanVars( $_REQUEST, 'tables_id', 0, 'int' );
if (isset($_REQUEST['tables_id'])) {
- $obj =& $tblsHandler->get($_REQUEST['tables_id']);
+ $obj =& $tblsHandler->get($tables_id);
} else {
$obj =& $tblsHandler->create();
}
-
+ //Name of the module
+ $modules =& $modulesHandler->get($_REQUEST['tables_modules']);
+ $modules_name = $modules->getVar('modules_name');
+
+ $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_submitter = (isset($_REQUEST['tables_submitter'])) ? $_REQUEST['tables_submitter'] : '0';
+ $tables_publisher = (isset($_REQUEST['tables_publisher'])) ? $_REQUEST['tables_publisher'] : '0';
+ $tables_created = (isset($_REQUEST['tables_created'])) ? $_REQUEST['tables_created'] : '0';
+ $tables_published = (isset($_REQUEST['tables_published'])) ? $_REQUEST['tables_published'] : '0';
+ $tables_expired = (isset($_REQUEST['tables_expired'])) ? $_REQUEST['tables_expired'] : '0';
+ $tables_status = (isset($_REQUEST['tables_status'])) ? $_REQUEST['tables_status'] : '0';
+ $tables_online = (isset($_REQUEST['tables_online'])) ? $_REQUEST['tables_online'] : '0';
+ $tables_pending = (isset($_REQUEST['tables_pending'])) ? $_REQUEST['tables_pending'] : '0';
+ $tables_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0';
+ $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0';
+ $select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0';
+
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- if(is_dir($pathImageAdmin)){
+ if(is_dir($pathImageAdmin)){
$uploaddir = $pathImageAdmin;
}else{
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/";
}
- $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']["img_mimetypes"],
- $GLOBALS['xoopsModuleConfig']["img_size"], null, null);
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
$name_img = $_GET['tables_name'].'.'.$extension;
@@ -62,31 +256,36 @@
$obj->setVar('tables_img', $_REQUEST['tables_img']);
}
- //Name of the module
- $modules =& $modsHandler->get($_REQUEST['tables_modules']);
- $modules_name = $modsHandler->getVar('modules_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_prefix_champs', $_REQUEST['tables_prefix_champs']);
$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_submitter', $_REQUEST['tables_submitter']);
- $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']);
- $obj->setVar('tables_created', $_REQUEST['tables_created']);
- $obj->setVar('tables_published', $_REQUEST['tables_published']);
- $obj->setVar('tables_expired', $_REQUEST['tables_expired']);
- $obj->setVar('tables_status', $_REQUEST['tables_status']);
- $obj->setVar('tables_online', $_REQUEST['tables_online']);
- $obj->setVar('tables_pending', $_REQUEST['tables_pending']);
- $obj->setVar('tables_search', $_REQUEST['tables_search']);
- $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
+ if ( isset($_REQUEST['tables_submitter']) )
+ $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']);
+ if ( isset($_REQUEST['tables_publisher']) )
+ $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']);
+ if ( isset($_REQUEST['tables_created']) )
+ $obj->setVar('tables_created', $_REQUEST['tables_created']);
+ if ( isset($_REQUEST['tables_published']) )
+ $obj->setVar('tables_published', $_REQUEST['tables_published']);
+ if ( isset($_REQUEST['tables_expired']) )
+ $obj->setVar('tables_expired', $_REQUEST['tables_expired']);
+ if ( isset($_REQUEST['tables_status']) )
+ $obj->setVar('tables_status', $_REQUEST['tables_status']);
+ if ( isset($_REQUEST['tables_online']) )
+ $obj->setVar('tables_online', $_REQUEST['tables_online']);
+ if ( isset($_REQUEST['tables_pending']) )
+ $obj->setVar('tables_pending', $_REQUEST['tables_pending']);
+ 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 ($tblsHandler->insert($obj)) {
- redirect_header('tables.php?op=tables_list', 2, _AM_TDMCREATE_FORMOK);
+ redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
}
break;
@@ -99,71 +298,9 @@
$form->display();
break;
- // Save the second step
- case "champs_save":
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
-
- if (isset($_REQUEST['tables_id'])) {
- $obj =& $tblsHandler->get($_REQUEST['tables_id']);
- } else {
- $obj =& $tblsHandler->create();
- }
-
- //Name of the module
- $modules =& $modsHandler->get($_REQUEST['tables_modules']);
- $modules_name = $modsHandler->getVar('modules_name');
-
- $obj->setVar('tables_modules', $_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_prefix_champs', $_REQUEST['tables_prefix_champs']);
- $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_submitter', $_REQUEST['tables_submitter']);
- $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']);
- $obj->setVar('tables_created', $_REQUEST['tables_created']);
- $obj->setVar('tables_published', $_REQUEST['tables_published']);
- $obj->setVar('tables_expired', $_REQUEST['tables_expired']);
- $obj->setVar('tables_status', $_REQUEST['tables_status']);
- $obj->setVar('tables_online', $_REQUEST['tables_online']);
- $obj->setVar('tables_pending', $_REQUEST['tables_pending']);
- $obj->setVar('tables_search', $_REQUEST['tables_search']);
- $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
- $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
-
- for($i=0; $i<intval($_REQUEST['tables_nb_champs']); $i++)
- {
- $obj->setVar('champ_id', $_REQUEST['champ_id']);
- $obj->setVar('champ_name', $_REQUEST['champ_name']);
- $obj->setVar('champ_type', $_REQUEST['champ_type']);
- $obj->setVar('champ_value', $_REQUEST['champ_value']);
- $obj->setVar('champ_attribute', $_REQUEST['champ_attribute']);
- $obj->setVar('champ_null', $_REQUEST['champ_null']);
- $obj->setVar('champ_default', $_REQUEST['champ_default']);
- $obj->setVar('champ_key', $_REQUEST['champ_key']);
- $obj->setVar('champ_elements_id', $_REQUEST['champ_elements_id']);
- $obj->setVar('champ_elements_value', $_REQUEST['champ_elements_value']);
- $obj->setVar('champ_elements_name', $_REQUEST['champ_elements_name']);
- $obj->setVar('champ_elements_admin', $_REQUEST['champ_elements_admin']);
- $obj->setVar('champ_elements_user', $_REQUEST['champ_elements_block']);
- $obj->setVar('champ_elements_mfield', $_REQUEST['champ_elements_mfield']);
- $obj->setVar('champ_elements_search', $_REQUEST['champ_elements_search']);
- $obj->setVar('champ_elements_required', $_REQUEST['champ_elements_required']);
- }
-
- if ($tblsHandler->insert($obj))
- {
- redirect_header('tables.php?op=tables_list', 2, _AM_TDMCREATE_FORMOK);
- }
-
- break;
-
case "edit_champs":
$obj =& $tblsHandler->get($_REQUEST['tables_id']);
- $form = $obj->getFormChamps(false, $_REQUEST['tables_id']);
+ $form = $obj->getFormEditChamps(false, $_REQUEST['tables_id']);
$form->display();
break;
@@ -181,110 +318,189 @@
} else {
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;
+ break;
- case "tables_champs":
+ case "modules_save":
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($_REQUEST['tables_id'])) {
- $obj =& $tblsHandler->get($_REQUEST['tables_id']);
- } else {
- $obj =& $tblsHandler->create();
- }
- /*
- for($i=0; $i<intval($_REQUEST['tables_nb_champs']); $i++)
- {
- $obj->setVar('champ_id', $_REQUEST['champ_id']);
- $obj->setVar('champ_name', $_REQUEST['champ_name']);
- $obj->setVar('champ_tables_nb_champs', $_REQUEST['champ_tables_nb_champs']);
- $obj->setVar('champ_tables_champs', $_REQUEST['champ_tables_champs']);
- $obj->setVar('champ_type', $_REQUEST['champ_type']);
- $obj->setVar('champ_value', $_REQUEST['champ_value']);
- $obj->setVar('champ_attribute', $_REQUEST['champ_attribute']);
- $obj->setVar('champ_null', $_REQUEST['champ_null']);
- $obj->setVar('champ_default', $_REQUEST['champ_default']);
- $obj->setVar('champ_key', $_REQUEST['champ_key']);
- $obj->setVar('champ_parameters', $_REQUEST['champ_parameters']);
- $obj->setVar('champ_elements_id', $_REQUEST['champ_elements_id']);
- $obj->setVar('champ_elements_value', $_REQUEST['champ_elements_value']);
- $obj->setVar('champ_elements_name', $_REQUEST['champ_elements_name']);
- $obj->setVar('champ_elements_admin', $_REQUEST['champ_elements_admin']);
- $obj->setVar('champ_elements_user', $_REQUEST['champ_elements_block']);
- $obj->setVar('champ_elements_mfield', $_REQUEST['champ_elements_mfield']);
- $obj->setVar('champ_elements_search', $_REQUEST['champ_elements_search']);
- $obj->setVar('champ_elements_required', $_REQUEST['champ_elements_required']);
- } */
-
- //Name of the module
- $modules =& $modsHandler->get($_REQUEST['tables_modules']);
- $modules_name = $modsHandler->getVar('modules_name');
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if (isset($_REQUEST['modules_id'])) {
+ $obj =& $modsHandler->get($_REQUEST['modules_id']);
+ } else {
+ $obj =& $modsHandler->create();
+ }
- $obj->setVar('tables_modules', $_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_prefix_champs', $_REQUEST['tables_prefix_champs']);
- $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_submitter', $_REQUEST['tables_submitter']);
- $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']);
- $obj->setVar('tables_created', $_REQUEST['tables_created']);
- $obj->setVar('tables_published', $_REQUEST['tables_published']);
- $obj->setVar('tables_expired', $_REQUEST['tables_expired']);
- $obj->setVar('tables_status', $_REQUEST['tables_status']);
- $obj->setVar('tables_online', $_REQUEST['tables_online']);
- $obj->setVar('tables_pending', $_REQUEST['tables_pending']);
- $obj->setVar('tables_search', $_REQUEST['tables_search']);
- $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
- $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
-
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- if(!is_dir($pathImageAdmin)){
- $uploaddir = $pathImageAdmin;
- }else{
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
- }
- $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes...
[truncated message content] |
