From: <be...@us...> - 2012-01-30 09:42:43
|
Revision: 8835 http://xoops.svn.sourceforge.net/xoops/?rev=8835&view=rev Author: beckmi Date: 2012-01-30 09:42:33 +0000 (Mon, 30 Jan 2012) Log Message: ----------- Updating to 1.38 Beta 1 (Timgno) Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/const.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/filesmanager.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/menu.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/tdmcreate_languages.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/tdmcreate_modules.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/tdmcreate_tables.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/const/const_admin_footer.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/const/const_admin_header.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/const/const_admin_language.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/const/const_architecture.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/const/const_blocks_language.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/const/const_include_functions.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/const/const_main_language.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/const/const_modinfo_language.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/const/const_xoopsversion.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/docs/changelog.txt XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/include/functions.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/include/functions_const.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/english/admin.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/english/modinfo.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/italian/admin.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/italian/modinfo.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/sql/mysql.sql XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/xoops_version.php Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/addmodule.png XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/addtable.png XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/builder.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/jquery.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/icons/loading.gif XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/ams_slogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/feedsLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/gearthLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/gearth_slogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/gviewLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/imprintLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/mytubeLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/partadsLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/passgenLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/radiostreamLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/videostreamLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/xnews_slogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/modules/xsitemapLogo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/ads.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/broken.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/cat.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/contact.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/feed.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/links.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/param.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/plugin.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/radio.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/shoutbox.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/topic.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/uploads/tables/video.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/index.html XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/js/ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/js/filemanager.js XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/js/index.html XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/js/jqueryFileTree.js XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/update language 1.15 to 1.37.txt XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/update language 1.37 to 1.38.txt XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/admin/ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/admin/help.html XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/admin/index.html XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/admin/tdmcreate_filemanager.html XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/blocks/ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/blocks/index.html XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/help/ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/help/help.html XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/help/index.html XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/templates/index.html Removed Paths: ------------- XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/16/ XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/file-manager.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/menu.php XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/images/logo.png XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/update language 1.1 to 1.37.txt Added: XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/addmodule.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/addmodule.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/addtable.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/addtable.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/builder.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/builder.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: XoopsModules/TDMCreate/branches/timgno/Frameworks/moduleclasses/icons/32/file-manager.png =================================================================== (Binary files differ) Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/const.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/const.php 2012-01-30 09:37:51 UTC (rev 8834) +++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/const.php 2012-01-30 09:42:33 UTC (rev 8835) @@ -22,8 +22,8 @@ include 'admin_header.php'; xoops_cp_header(); - $indexAdmin = new ModuleAdmin(); - echo $indexAdmin->addNavigation('const.php'); +$indexAdmin = new ModuleAdmin(); +echo $indexAdmin->addNavigation('const.php'); $op = TDMCreate_CleanVars($_REQUEST, 'op', 'default', 'string'); Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/filesmanager.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/filesmanager.php 2012-01-30 09:37:51 UTC (rev 8834) +++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/filesmanager.php 2012-01-30 09:42:33 UTC (rev 8835) @@ -36,54 +36,221 @@ * **************************************************************************** */ include 'admin_header.php'; -xoops_cp_header(); - // Get Action type $op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' ); +// Define main template +$xoopsOption['template_main'] = 'tdmcreate_filemanager.html'; +// Call Header +xoops_cp_header(); +$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js'); +$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); +$xoTheme->addScript('modules/system/js/jquery.easing.js'); +$xoTheme->addScript('modules/TDMCreate/js/jqueryFileTree.js'); +$xoTheme->addScript('modules/TDMCreate/js/filemanager.js'); +// Define Stylesheet +$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css'); +$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/code_mirror/docs.css'); +$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'); + xoops_load('XoopsFile'); XoopsFile::load('file'); switch ($op) { default: - -echo '<br class="clear" /> -<div class="spacer"> - <table class="outer ui-corner-all" cellspacing="1"> - <tr> - <th>'._AM_TDMCREATE_YOUR_MODULES.'</th> - <th> </th> - </tr> - <tr> - <td class="aligntop width10"><div id="fileTree" class="display_folder"></div></td> - <td class="aligntop"> - <div id="display_form"><{$form}></div> - <div id="display_contenu"></div> - <div id="display_message" class="txtcenter" style="display:none;"></div> - <div id="loading" class="txtcenter" style="display:none;"><br /><br /><img src="images/loading.gif" title="Loading" alt="Loading" /></div> - </td> - </tr> - </table> -<br class="clear" /> -</div>'; + $nbcolonnes_file = 4; + $width = 100/$nbcolonnes_file; + $root = XOOPS_ROOT_PATH.'/modules/TDMCreate/modules/'; + $url_file = XOOPS_URL.'/modules/TDMCreate/modules/'; + $xoopsTpl->assign('width', $width); + if( file_exists($root) ) + { + $files = scandir($root); + natcasesort($files); + if( count($files) > 2 ) + { + $count_file = 1; + $file_arr = array(); + $edit = false; + // All files + foreach( $files as $file ) + { + if (!preg_match('#.back#', $file)) + { + if( file_exists($root . $file) && $file != '.' && $file != '..' && !is_dir($root . $file) ) + { + $folder = XoopsFile::getHandler('file', $root.$file); + $extension_verif = $folder->ext(); + + switch ( $extension_verif ) { + case 'ico': case 'png': case 'gif': case 'jpg': case 'jpeg': + $extension_verif = 'picture'; + break; + case 'html': case 'htm': + $extension_verif = 'html'; + $edit = true; + break; + case 'zip': case 'rar': case 'tar': case 'gz': + $extension_verif = 'rar'; + $edit = true; + $unzip = '<img class="cursorpointer" src="./images/icons/untar.png" onclick=\'filemanager_unzip_file("'.$path_file . $file.'", "'.$path_file.'", "'.$file.'");\' width="16" alt="edit" /> '; + break; + case 'css': + $extension_verif = 'css'; + $edit = true; + break; + case 'avi': case 'mov': case 'real': case 'flv': case 'swf': + $extension_verif = 'movie'; + break; + case 'log': + $extension_verif = 'log'; + $edit = true; + break; + case 'php': + $extension_verif = 'php'; + $edit = true; + break; + case 'info': case 'htaccess': + $extension_verif = 'info'; + break; + case 'sql': + $extension_verif = 'sql'; + $edit = true; + break; + default: + $extension_verif = 'file'; + $edit = true; + break; + } + + //Edit ? + $file_arr['edit'] = $edit; + //File + $file_arr['path_file'] = $root.$file; + $file_arr['path'] = $root; + //Chmod + $file_arr['chmod'] = substr($folder->perms(), 1); + + $file_arr['chmod'] = modify_chmod($file_arr['chmod'], $file_arr['path_file'], $count_file); + + if($extension_verif == 'picture') { + list($width, $height) = getimagesize($root . $file); + if($height > 60){ + $file_arr['img'] = '<img src="'.$url_file.$file.'" height="47" title="" alt="" />'; + } else { + $file_arr['img'] = '<img src="'.$url_file.$file.'" title="" alt="" />'; + } + } else { + $file_arr['img'] = '<img src="'.XOOPS_URL.'/modules/system/images/mimetypes/'.$extension_verif.'_48.png" title="" alt="" />'; + } + $file_arr['extension'] = $extension_verif; + $file_arr['file'] = htmlentities($file); + $count_file++; + $file_arr['newline'] = ($count_file % $nbcolonnes_file == 1) ? true : false; + $xoopsTpl->assign('newline', $file_arr['newline']); + $xoopsTpl->append('files', $file_arr); + } + $edit = false; + } + } + } + } break; //save case 'filemanager_save': - + //Save the file or restore file + if(isset($_REQUEST['path_file'])) + { + //save file + $copy_file = $_REQUEST['path_file']; + copy($copy_file, $_REQUEST['path'].$_REQUEST['file'].'.back'); + //Save modif + if(isset($_REQUEST['filemanager'])) + { + $open = fopen("".$_REQUEST['path_file']."","w+"); + if(!fwrite($open, utf8_encode(stripslashes($_REQUEST['filemanager'])))) + { + redirect_header("filemanager.php", 2, _AM_TDMCREATE_FILEMANAGER_ERROR); + } + fclose($open); + } + redirect_header("filemanager.php", 2, _AM_TDMCREATE_DBUPDATED); + } else { + //restore + $old_file = $_REQUEST['path_file'].'.back'; + //echo $old_file; + $new_file = $_REQUEST['path_file']; + //echo $new_file; + if(file_exists($old_file)) + { + if(unlink($new_file)) + { + if(rename($old_file, $new_file)) + { + redirect_header("filemanager.php", 2, _AM_TDMCREATE_DBUPDATED); + }else{ + redirect_header("filemanager.php", 2, _AM_TDMCREATE_FILEMANAGER_RESTORE_ERROR_FILE_RENAME); + } + }else{ + redirect_header("filemanager.php", 2, _AM_TDMCREATE_FILEMANAGER_RESTORE_ERROR_FILE_DELETE); + } + }else{ + redirect_header("filemanager.php", 2, _AM_TDMCREATE_FILEMANAGER_RESTORE_ERROR_FILE_EXISTS); + } + } break; case 'filemanager_upload_save': - - break; + if($_REQUEST['path'] != '') { + $path = trim($_REQUEST['path']); + } else { + $path = XOOPS_ROOT_PATH.'/'; + } + include_once XOOPS_ROOT_PATH . '/class/uploader.php'; + $mimetypes = include $GLOBALS['xoops']->path('include/mimetypes.inc.php'); + $uploader = new XoopsMediaUploader( $path, $mimetypes, 500000); + if ($uploader->fetchMedia('upload_file')) { + if (!$uploader->upload()) { + $err[] = $uploader->getErrors(); + } + } + if ( isset($err) ) { + foreach ( $err as $line ){ + echo $line; + } + } + redirect_header("filemanager.php", 2, _AM_TDMCREATE_FILEMANAGER_UPLOAD_FILE); + break; + case 'filemanager_add_dir_save': - - break; + $path = TDMCreate_CleanVars ( $_REQUEST, 'path', XOOPS_ROOT_PATH . '/modules/TDMCreate/modules/', 'string' ); + xoops_load('XoopsFile'); + XoopsFile::load('folder'); + $folder = XoopsFile::getHandler('folder'); + if ($folder->create ($path . $_REQUEST['dir_name'], 0777)) { + $indexFile = XOOPS_ROOT_PATH."/modules/TDMCreate/index.html"; + copy($indexFile, $path.$_REQUEST['dir_name']."/index.html"); + redirect_header( 'filemanager.php', 2, _AM_TDMCREATE_FILEMANAGER_DIR_SUCCESS ); + } else { + redirect_header( 'filemanager.php', 2, _AM_TDMCREATE_FILEMANAGER_DIR_ERROR ); + } + break; + case 'filemanager_add_file_save': - - break; + $path = TDMCreate_CleanVars ( $_REQUEST, 'path', XOOPS_ROOT_PATH . '/', 'string' ); + if ( $path == '' ) $path = XOOPS_ROOT_PATH . '/modules/TDMCreate/modules/'; + $open = fopen($path . $_REQUEST['file_name'],"w+"); + fclose($open); + redirect_header( 'filemanager.php', 2, _AM_TDMCREATE_FILEMANAGER_FILE_SUCCESS ); + //if ($file->create ($path . $_REQUEST['file_name'])) { + // redirect_header( 'filemanager.php', 2, _AM_TDMCREATE_FILEMANAGER_DIR_SUCCESS ); + //} else { + // redirect_header( 'filemanager.php', 2, _AM_TDMCREATE_FILEMANAGER_DIR_ERROR ); + //} + break; } include "admin_footer.php"; \ No newline at end of file Added: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/jquery.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/jquery.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/jquery.php 2012-01-30 09:42:33 UTC (rev 8835) @@ -0,0 +1,472 @@ +<?php +/** + * Filemanager settings + * jQuery File Tree PHP Connector + * Output a list of files for jQuery File Tree + * + * 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. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Maxime Cointin (AKA Kraven30) + * @package system + * @version $Id: jquery.php 8066 2011-11-06 05:09:33Z beckmi $ + */ + +// Require mainfile +require '../../../../mainfile.php'; +// Check Xoops define +if ( !defined('XOOPS_ROOT_PATH') ) die('XOOPS ROOT path not defined'); +error_reporting(0); +$GLOBALS['xoopsLogger']->activated = false; +// Include module functions +include $GLOBALS['xoops']->path('modules/TDMCreate/include/functions.php'); +// Load language +TDMCreate_loadLanguage('admin', 'TDMCreate'); +// Get Action type +$op = TDMCreate_CleanVars ( $_REQUEST, 'op', 'filemanager_display_folder', 'string' ); + +xoops_load('xoopsformloader'); + +switch ($op) { + + // Display files in tree + case 'filemanager_display_folder': + + $_REQUEST['dir'] = urldecode($_REQUEST['dir']); + $root = XOOPS_ROOT_PATH.'/modules/TDMCreate/modules/'; + + if( file_exists($root . $_REQUEST['dir']) ) + { + $files = scandir($root . $_REQUEST['dir']); + natcasesort($files); + + if( count($files) > 2 ) { /* The 2 accounts for . and .. */ + echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">"; + if ('/' == $_REQUEST['dir']) + echo "<a href=\"filemanager.php\"><strong>/</strong></a>"; + // All dirs + foreach( $files as $file ) { + if( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_REQUEST['dir'] . $file) ) { + //retirer .svn + $file_no_valid = array('.svn', 'conf', 'db', 'locks', 'hooks', 'cache', 'templates_c'); + + if(!in_array($file, $file_no_valid)) + { + echo "<li class=\"directory collapsed\"><a href='".$_REQUEST['dir'] . $file."' rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>"; + } + } + } + echo "</ul>"; + } + } + break; + + // Display files + case 'filemanager_display_file': + $nbcolonnes_file = 4; + $width = 100/$nbcolonnes_file; + $_REQUEST['file'] = urldecode($_REQUEST['file']); + //For come back and display files + if ($_REQUEST['status'] == 1 ) { + $path_file = $_REQUEST['file']; + } else { + $file_arr = explode("/",$_REQUEST['file']); + $path_file = XOOPS_ROOT_PATH.'/modules/TDMCreate/modules/'; + $url_file = XOOPS_URL.'/modules/TDMCreate/modules/'; + + for ($i=3 ; $i<count($file_arr) ; $i++ ) { + $path_file .= $file_arr[$i].'/modules/TDMCreate/modules/'; + $url_file .= $file_arr[$i].'/modules/TDMCreate/modules/'; + } + } + + if( file_exists($path_file) ) { + $files = scandir($path_file); + natcasesort($files); + xoops_load('XoopsFile'); + XoopsFile::load('file'); + // The 2 accounts for . and .. + if( count($files) > 2 ) { + echo ' + <div class="xo-btn-actions"> + <div class="xo-buttons"> + <button class="ui-corner-all tooltip" type="button" onclick="filemanager_load_tree();filemanager_display_file(\'\', 0)" title="'._AM_TDMCREATE_FILEMANAGER_HOME.'"> + <img src="'.TDMCreate_AdminIcons('home.png').'" alt="'._AM_TDMCREATE_FILEMANAGER_HOME.'" /> + </button> + <button class="ui-corner-all tooltip" onclick="filemanager_add_directory(\''.$path_file.'\')" title="'._AM_TDMCREATE_FILEMANAGER_ADDDIR.'"> + <img src="'.TDMCreate_AdminIcons('folder_add.png').'" alt="'._AM_TDMCREATE_FILEMANAGER_ADDDIR.'" /> + </button>'; + $verif = true; + $protected = array('', 'class', 'Frameworks', 'images', 'include', 'kernel', 'language', 'modules', 'themes', 'uploads', 'xoops_lib', 'xoops_data' ); + foreach ( $protected as $folder ) { + $root_path = XOOPS_ROOT_PATH . '/' . $folder.'/'; + if (eregi($root_path, $path_file)) { + if ( ($root_path == $path_file) ) { + $verif = false; + } + } + if ( XOOPS_ROOT_PATH.'/' == $path_file ) { + $verif = false; + } + } + if( $verif ) { + echo '<button class="ui-corner-all tooltip" onclick="filemanager_confirm_delete_directory(\''.$path_file.'\')" title="'._AM_TDMCREATE_FILEMANAGER_DELDIR.'"> + <img src="'.TDMCreate_AdminIcons('folder_delete.png').'" alt="'._AM_TDMCREATE_FILEMANAGER_DELDIR.'" /> + </button>'; + } + echo '<button class="ui-corner-all tooltip" onclick="filemanager_add_file(\''.$path_file.'\')" title="'._AM_TDMCREATE_FILEMANAGER_ADDFILE.'"> + <img src="'.TDMCreate_AdminIcons('add.png').'" alt="'._AM_TDMCREATE_FILEMANAGER_ADDFILE.'" /> + </button> + <button class="ui-corner-all tooltip" onclick="filemanager_upload(\''.$path_file.'\')" title="'._AM_TDMCREATE_FILEMANAGER_UPLOAD.'"> + <img src="'.TDMCreate_AdminIcons('upload.png').'" alt="'._AM_TDMCREATE_FILEMANAGER_UPLOAD.'" /> + </button> + </div> + <div class="clear"> </div> + </div>'; + $count_file = 1; + // All files + echo '<table cellpadding="0" cellspacing="0" border="0" align="center"> + <tr> + <td align="center" width="'.$width.'%" style="padding-bottom:12px">'; + foreach( $files as $file ) + { + if (!preg_match('#.back#', $file)) + { + if( file_exists($path_file . $file) && $file != '.' && $file != '..' && !is_dir($path_file . $file) ) + { + //echo $path_file . $file.'<br />'; + $unzip = ''; + $edit = false; + $file1 = XoopsFile::getHandler('file', $path_file . $file); + $extension_verif = $file1->ext(); + + switch ( $extension_verif ) { + case 'ico': case 'png': case 'gif': case 'jpg': case 'jpeg': + $extension_verif = 'picture'; + break; + case 'html': case 'htm': + $extension_verif = 'html'; + $edit = true; + break; + case 'zip': case 'rar': case 'tar': case 'gz': + $extension_verif = 'rar'; + $edit = true; + $unzip = '<img class="cursorpointer" src="./images/icons/untar.png" onclick=\'filemanager_unzip_file("'.$path_file . $file.'", "'.$path_file.'", "'.$file.'");\' width="16" alt="edit" /> '; + break; + case 'css': + $extension_verif = 'css'; + $edit = true; + break; + case 'avi': case 'mov': case 'real': case 'flv': case 'swf': + $extension_verif = 'movie'; + break; + case 'log': + $extension_verif = 'log'; + $edit = true; + break; + case 'php': + $extension_verif = 'php'; + $edit = true; + break; + case 'info': case 'htaccess': + $extension_verif = 'info'; + break; + case 'sql': + $extension_verif = 'sql'; + $edit = true; + break; + default: + $extension_verif = 'file'; + $edit = true; + break; + } + if($edit == true) { + $edit = '<img class="cursorpointer" src="'.TDMCreate_AdminIcons('edit.png').'" onclick=\'filemanager_edit_file("'.$path_file . $file.'", "'.$path_file.'", "'.$file.'", "'.$extension_verif.'");\' width="16" alt="edit" />'; + } else { + $edit = ''; + } + //Chmod + $chmod = substr($file1->perms(), 1); + + $chmod = modify_chmod($chmod, $path_file.$file, $count_file); + + //Img + if($extension_verif == 'picture') { + list($width, $height) = getimagesize($path_file . $file); + if($height > 60){ + $img = '<img src="'.$url_file.$file.'" height="47" title="" alt="" />'; + } else { + $img = '<img src="'.$url_file.$file.'" title="" alt="" />'; + } + } else { + $img = '<img src="./images/mimetypes/'.$extension_verif.'_48.png" title="" alt="" />'; + } + echo '<div style="border: 1px solid #cccccc;"> + <table cellpadding="0" cellspacing="0"> + <tr class="odd"> + <td align="left">'.$chmod.'</td> + <td align="right">'.$unzip.$edit.' <img class="cursorpointer" src="'.TDMCreate_AdminIcons('delete.png').'" onclick=\'filemanager_confirm_delete_file("'.$path_file . $file.'", "'.$path_file.'");\' width="16" alt="delete" /></td> + </tr> + <tr> + <td colspan="2" align="center" height="60px"><br />'.$img.'</td> + </tr> + <tr> + <td colspan="2" align="center">'.$file.'<br /><br /></td> + </tr> + </table> + </div> + </td>'; + + $count_file++; + $newline = ($count_file % $nbcolonnes_file == 1) ? true : false; + + if ($newline) { + echo '</tr><tr><td align="center" style="padding-bottom:12px">'; + } else { + echo '<td align="center" style="padding-bottom:12px">'; + } + } + } + } + echo '</tr></table>'; + } + } + break; + + //Edit file + case 'filemanager_edit_file': + $path_file = trim($_REQUEST['path_file']); + + if($_REQUEST['path'] != '') { + $path = trim($_REQUEST['path']); + } else { + $path = XOOPS_ROOT_PATH.'/modules/TDMCreate/modules/'; + } + + //Button restore + if(file_exists($path_file.'.back')){ + $restore = '<button class="ui-corner-all tooltip" type="button" onclick="filemanager_restore(\''.$path_file.'\')" value="'._AM_TDMCREATE_FILEMANAGER_RESTORE.'" title="'._AM_TDMCREATE_FILEMANAGER_RESTORE.'"> + <img src="'.TDMCreate_AdminIcons('revert.png').'" alt="'._AM_TDMCREATE_FILEMANAGER_RESTORE.'" /> + </button>'; + }else{ + $restore = ''; + } + xoops_load('XoopsFile'); + XoopsFile::load('file'); + + $file = XoopsFile::getHandler('file', $path_file); + $content = $file->read(); + if(empty($content)) + { + echo _AM_TDMCREATE_FILEMANAGER_EMPTY_FILE; + } + + $ext = preg_replace('/^.*\./', '', $_REQUEST['file']); + + echo '<form name="back" action="filemanager.php&op=filemanager_save" method="POST"> + <table border="0"> + <tr> + <td> + <div class="xo-btn-actions"> + <div class="xo-buttons"> + <button class="ui-corner-all tooltip" type="submit" value="'._AM_TDMCREATE_FILEMANAGER_SAVE.'" title="'._AM_TDMCREATE_FILEMANAGER_SAVE.'"> + <img src="'.TDMCreate_AdminIcons('save.png').'" alt="'._AM_TDMCREATE_FILEMANAGER_SAVE.'" /> + </button> + '.$restore.' + <button class="ui-corner-all tooltip" type="button" onclick="$(\'#edit_file\').fadeOut(\'fast\');$(\'#display_file\').fadeIn(\'fast\');" title="'._AM_TDMCREATE_FILEMANAGER_CANCEL.'"> + <img src="'.TDMCreate_AdminIcons('cancel.png').'" alt="'._AM_TDMCREATE_FILEMANAGER_CANCEL.'" /> + </button> + <div class="clear"></div> + </div> + </div> + </td> + </tr> + <tr><td> + <textarea id="code_mirror" name="filemanager" rows=24 cols=110>'.$content.'</textarea> + </td></tr> + </table>'; + echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="path" value="'.$path.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>'; + break; + + case 'filemanager_unzip_file': + $path_file = trim($_REQUEST['path_file']); + + if($_REQUEST['path'] != '') { + $path = trim($_REQUEST['path']); + } else { + $path = XOOPS_ROOT_PATH.'/'; + } + $file = $_REQUEST['file']; + + xoops_load('pclzip','system'); + xoops_load('pcltar','system'); + xoops_load('XoopsFile'); + XoopsFile::load('file'); + $file1 = XoopsFile::getHandler('file', $path_file ); + $extension = $file1->ext(); + switch ( $extension ) { + case 'zip': + $archive = new PclZip( $path_file ); + if ($archive->extract(PCLZIP_OPT_PATH, $path) == 0) { + xoops_error( _AM_TDMCREATE_FILEMANAGER_EXTRACT_ERROR ); + } else { + xoops_result( _AM_TDMCREATE_FILEMANAGER_EXTRACT_FILE ); + } + break; + case 'tar': case 'gz': + PclTarExtract( $path_file, $path ); + break; + } + + break; + + //Confirm delete file + case 'filemanager_confirm_delete_file': + echo '<div class="confirmMsg">'.sprintf(_AM_TDMCREATE_FILEMANAGER_SUREDEL, $_REQUEST['file']).'<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" onclick="filemanager_delete_file(\''.$_REQUEST['path_file'].'\', \''.$_REQUEST['path'].'\');">'._AM_TDMCREATE_FILEMANAGER_DELETE.'</a> <a href="#" class="ui-corner-all" onclick="$(\'#confirm_delete\').hide();filemanager_load_tree(); filemanager_display_file(\'\', 0)">'._AM_TDMCREATE_FILEMANAGER_CANCEL.'</a></div></div>'; + break; + + //Delete one file + case 'filemanager_delete_file': + xoops_load('XoopsFile'); + XoopsFile::load('file'); + $file = XoopsFile::getHandler('file', $_REQUEST['path_file']); + if(!$file->delete()) + { + xoops_error(_AM_TDMCREATE_FILEMANAGER_ERROR); + } else { + xoops_result(_AM_TDMCREATE_FILEMANAGER_DELETE_FILE); + } + break; + + case 'filemanager_upload': + + if($_REQUEST['path'] != '') { + $path = trim($_REQUEST['path']); + } else { + $path = XOOPS_ROOT_PATH.'/'; + } + + xoops_load('xoopsformloader'); + + $form = new XoopsThemeForm( '', 'upload_form', 'filemanager.php', "post", true); + $form->setExtra('enctype="multipart/form-data"'); + $form->addElement( new XoopsFormFile( _AM_TDMCREATE_FILEMANAGER_UPLOAD_CHOOSE, 'upload_file', 500000), false ); + $form->addElement( new XoopsFormHidden( 'op', 'filemanager_upload_save') ); + $form->addElement( new XoopsFormHidden( 'path', $path)); + $form->addElement( new XoopsFormButton( '', 'up_button', _SUBMIT, 'submit')); + echo $form->render(); + break; + + case 'filemanager_add_dir': + if($_REQUEST['path'] != '') { + $path = trim($_REQUEST['path']); + } else { + $path = XOOPS_ROOT_PATH.'/'; + } + + $form = new XoopsThemeForm( '', 'newdir_form', 'filemanager.php', "post", true); + $form->setExtra('enctype="multipart/form-data"'); + $form->addElement( new XoopsFormText( _AM_TDMCREATE_FILEMANAGER_ADDDIR_NAME, 'dir_name', 50, 255), true ); + $form->addElement( new XoopsFormHidden( 'op', 'filemanager_add_dir_save') ); + $form->addElement( new XoopsFormHidden( 'path', $path)); + $form->addElement( new XoopsFormButton( '', 'dir_button', _SUBMIT, 'submit')); + echo $form->render(); + break; + + //Confirm delete directory + case 'filemanager_confirm_delete_directory': + $path = system_CleanVars ( $_REQUEST, 'path', '', 'string' ); + echo '<div class="confirmMsg">'.sprintf(_AM_TDMCREATE_FILEMANAGER_DIR_SUREDEL, $path).'<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" onclick="filemanager_delete_directory(\''.$path.'\');">'._AM_TDMCREATE_FILEMANAGER_DELETE.'</a> <a href="#" class="ui-corner-all" onclick="$(\'#confirm_delete\').hide();filemanager_load_tree(); filemanager_display_file(\'\', 0)">'._AM_TDMCREATE_FILEMANAGER_CANCEL.'</a></div></div>'; + break; + + // Delete one directory + case 'filemanager_delete_directory': + $path = system_CleanVars ( $_REQUEST, 'path', '', 'string' ); + + function deltree($dossier){ + if(($dir=opendir($dossier))===false) + return; + + while($name=readdir($dir)){ + if($name==='.' or $name==='..') + continue; + $full_name=$dossier.'/'.$name; + + if(is_dir($full_name)) + deltree($full_name); + else unlink($full_name); + } + closedir($dir); + @rmdir($dossier); + return true; + } + + if(deltree($_REQUEST['path'])) { + xoops_result(_AM_TDMCREATE_FILEMANAGER_DELDIR_OK); + } else { + xoops_error(_AM_TDMCREATE_FILEMANAGER_DELDIR_NOTOK); + } + break; + + case 'filemanager_add_file': + if($_REQUEST['path'] != '') { + $path = trim($_REQUEST['path']); + } else { + $path = XOOPS_ROOT_PATH.'/modules/TDMCreate/modules/'; + } + + $form = new XoopsThemeForm( '', 'newdir_form', 'filemanager.php', "post", true); + $form->setExtra('enctype="multipart/form-data"'); + $form->addElement( new XoopsFormText( _AM_TDMCREATE_FILEMANAGER_ADDFILE, 'file_name', 50, 255), true ); + $form->addElement( new XoopsFormHidden( 'op', 'filemanager_add_file_save') ); + $form->addElement( new XoopsFormHidden( 'path', $path)); + $form->addElement( new XoopsFormButton( '', 'dir_button', _SUBMIT, 'submit')); + echo $form->render(); + break; + break; + + case 'filemanager_modify_chmod': + + if($_REQUEST['path_file'] != '') { + $path = trim($_REQUEST['path_file']); + } else { + $path = XOOPS_ROOT_PATH.'/modules/TDMCreate/modules/'; + } + + if(chmod($path,'0'.$_REQUEST['chmod'])) { + $new_chmod = modify_chmod($_REQUEST['chmod'], $path, $_REQUEST['id']); + echo $new_chmod; + } + //echo $_REQUEST['chmod']; + break; + + //Restore + case 'filemanager_restore': + $old_file = $_REQUEST['path_file'].'.back'; + $new_file = $_REQUEST['path_file']; + if(file_exists($old_file)) + { + if(unlink($new_file)) + { + if(rename($old_file, $new_file)) + { + //redirect_header("admin.php?fct=tplsets", 2, _AM_TDMCREATE_DBUPDATED); + }else{ + //redirect_header("admin.php?fct=tplsets", 2, _AM_TDMCREATE_TEMPLATES_RESTORE_ERROR_FILE_RENAME); + } + }else{ + //redirect_header("admin.php?fct=tplsets", 2, _AM_TDMCREATE_TEMPLATES_RESTORE_ERROR_FILE_DELETE); + } + }else{ + //redirect_header("admin.php?fct=tplsets", 2, _AM_TDMCREATE_TEMPLATES_RESTORE_ERROR_FILE_EXISTS); + } + break; +} + +?> \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/menu.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/menu.php 2012-01-30 09:37:51 UTC (rev 8834) +++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/menu.php 2012-01-30 09:42:33 UTC (rev 8835) @@ -54,12 +54,12 @@ $adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU2; //$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU2_DESC $adminmenu[$i]["link"] = "admin/modules.php"; -$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/add.png"; +$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."/index.png"; +$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/addtable.png"; $i++; $adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU4; //$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU4_DESC @@ -69,7 +69,7 @@ $adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU5; //$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU5_DESC $adminmenu[$i]["link"] = 'admin/const.php'; -$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/modifiedlink.png'; +$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/builder.png'; $i++; $adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU6; //$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU6_DESC Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php 2012-01-30 09:37:51 UTC (rev 8834) +++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php 2012-01-30 09:42:33 UTC (rev 8835) @@ -49,18 +49,22 @@ { $obj->setVar('tables_module_table', strtolower($modules_name.'_topic')); $obj->setVar('tables_name', 'topic'); - $obj->setVar('tables_blocs', 0); - $obj->setVar('tables_display_admin', 1); - $obj->setVar('tables_display_user', 1); + $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_date_created', 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_search', 0); $obj->setVar('tables_coms', 0); $obj->setVar('tables_nb_champs', 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_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|XoopsFormSelectBox:0:0:0:0:0:1|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1'; + $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'; @@ -91,11 +95,15 @@ $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_submitter', $_REQUEST['tables_submitter']); - $obj->setVar('tables_date_created', $_REQUEST['tables_date_created']); + $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_search', $_REQUEST['tables_search']); $obj->setVar('tables_coms', $_REQUEST['tables_coms']); @@ -107,7 +115,7 @@ { //Rajouts des parametres: 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_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:"; @@ -117,21 +125,37 @@ } //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]."" : " "; + $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 { - $tables_parametres .= '|XoopsFormSelectBox:1:1:1:0:0:1|XoopsFormSelectUser:1:1:1:0:0:1|XoopsFormTextDateSelect:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1'; + } 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:'; + // Parameters + $tables_parametres .= '|XoopsFormSelect:1:1:1:0:0:1|XoopsFormSelectUser:1:1:1:0:0:1|XoopsFormTextDateSelect:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1'; } } } @@ -160,11 +184,15 @@ $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_submitter = (isset($_REQUEST['tables_submitter'])) ? $_REQUEST['tables_submitter'] : '0'; - $tables_date_created = (isset($_REQUEST['tables_date_created'])) ? $_REQUEST['tables_date_created'] : '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_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0'; $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0'; @@ -197,11 +225,15 @@ $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_submitter', $_REQUEST['tables_submitter']); - $obj->setVar('tables_date_created', $_REQUEST['tables_date_created']); + $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']); //mettre des isset pour search if ( isset($_REQUEST['tables_search']) ) @@ -346,11 +378,15 @@ } 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_submitter = (isset($_REQUEST['tables_submitter'])) ? $_REQUEST['tables_submitter'] : '0'; - $tables_date_created = (isset($_REQUEST['tables_date_created'])) ? $_REQUEST['tables_date_created'] : '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_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0'; $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0'; @@ -383,7 +419,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_submitter, $tables_date_created, $tables_online, $tables_search, $tables_coms, intval($_REQUEST['tables_nb_champs']), $select); + $form = $obj->getFormChamps(false, $tables_id, intval($_REQUEST['tables_modules']), strtolower($_REQUEST['tables_name']), $tables_blocks, $tables_display_admin, $tables_display_user, $tables_submitter, $tables_publisher, $tables_created, $tables_published, $tables_expired, $tables_status, $tables_online, $tables_search, $tables_coms, intval($_REQUEST['tables_nb_champs']), $select); } } else { redirect_header('tables.php?op=list_tables', 2, _AM_TDMCREATE_TABLES_EXIST); Deleted: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/menu.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/menu.php 2012-01-30 09:37:51 UTC (rev 8834) +++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/menu.php 2012-01-30 09:42:33 UTC (rev 8835) @@ -1,205 +0,0 @@ -<?php -/** - * **************************************************************************** - * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS - * - Licence GPL Copyright (c) (http://www.tdmxoops.net) - * - * Cette licence, contient des limitations!!! - * - * 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 - * - * **************************************************************************** - */ - -class TDMCreateMenu -{ - public $Width = 80; - public $Height = 85; - public $BgColor = 'transparent'; - public $OverBgColor = '#FFF6C1'; - public $BorderWidth = 1; - public $BorderColor = '#CCCCCC'; - public $OverBorderColor = '#FF9900'; - public $BorderStyle = 'solid'; - public $OverBorderStyle = 'solid'; - public $Font = 'Tahoma, Arial, Helvetica'; - public $FontColor = '#666666'; - public $OverFontColor = '#1E90FF'; - public $FontDeco = 'none'; - public $OverFontDeco = 'none'; - public $FontSize = 11; - public $FontWeight = 'bold'; - public $FontExtra = 'Tahoma, Arial, Helvetica'; - public $FontExtraColor = '#A98952'; - public $OverFontExtraColor = '#0033FF'; - public $FontExtraDeco = 'underline'; - public $OverFontExtraDeco = 'underline'; - public $FontExtraSize = 9; - public $FontExtraWeight = 'normal'; - public $TextAlign = 'center'; - private $_items = array(); - - public function addItem($id, $link='', $icon='', $name='', $extra='', $alt=''){ - if (isset($this->_items[$id])) return false; - $rtn['link'] = $link; - $rtn['icon'] = $icon; - $rtn['name'] = $name; - $rtn['extra'] = $extra; - $rtn['alt'] = $alt; - $this->_items[$id] = $rtn; - return true; - } - - public function setLink($id, $link){ - if (isset($this->_items[$id])){ - $this->_items[$id]['link'] = $link; - return true; - } else { - return false; - } - } - - public function setIcon($id, $icon){ - if (isset($this->_items[$id])){ - $this->_items[$id]['icon'] = $icon; - return true; - } else { - return false; - } - } - - public function setName($id, $name){ - if (isset($this->_items[$id])){ - $this->_items[$id]['name'] = $name; - return true; - } else { - return false; - } - } - - public function setExtra($id, $extra){ - if (isset($this->_items[$id])){ - $this->_items[$id]['extra'] = $extra; - return true; - } else { - return false; - } - } - - public function setAlt($id, $alt){ - if (isset($this->_items[$id])){ - $this->_items[$id]['alt'] = $alt; - return true; - } else { - return false; - } - } - - public function getCSS($ws = true){ - if ($ws) $csscode = "<style type=\"text/css\">\n<!--"; - $csscode .= "div.rmmenuicon{ - margin: 3px; - font-family: $this->Font; - text-align: ".$this->TextAlign."; - } - div.rmmenuicon a { - display: block; float: left; - height: ".$this->Height."px !important; - height: ".$this->Height."px; - width: ".$this->Width."px !important; - width: ".$this->Width."px; - vertical-align: middle; - text-decoration : none; - border: ".$this->BorderWidth."px $this->BorderStyle $this->BorderColor; - padding: 2px 5px 1px 5px; - margin: 3px; - color: $this->FontColor; - - - background-color: #f0f0f0; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - -khtml-border-radius: 6px; - border-radius: 6px; - } - div.rmmenuicon img { margin-top: 8px; margin-bottom: 8px; } - div.rmmenuicon a span { - font-size: ".$this->FontSize."px; - font-weight: $this->FontWeight; - display: block; - } - div.rmmenuicon a span.uno{ - font-size: ".$this->FontExtraSize."px; - font-weight: $this->FontExtraWeight; - text-decoration: $this->FontExtraDeco; - color: $this->FontExtraColor; - } - div.rmmenuicon a:hover{ - background-color: $this->OverBgColor; - border: ".$this->BorderWidth."px $this->BorderStyle $this->OverBorderColor; - color: $this->OverFontColor; - } - div.rmmenuicon a:hover span{ - text-decoration: $t... [truncated message content] |