From: <lor...@us...> - 2012-07-11 17:36:41
|
Revision: 9846 http://xoops.svn.sourceforge.net/xoops/?rev=9846&view=rev Author: lord_venom Date: 2012-07-11 17:36:32 +0000 (Wed, 11 Jul 2012) Log Message: ----------- file_ext Modified Paths: -------------- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php XoopsModules/TDMPicture/trunk/TDMPicture/index.php XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php XoopsModules/TDMPicture/trunk/TDMPicture/submit.php XoopsModules/TDMPicture/trunk/TDMPicture/user.php XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -82,7 +82,7 @@ $obj->setVar('file_display', $_REQUEST['file_display']); $obj->setVar('file_indate', time()); $obj->setVar('file_uid', !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0); - $obj->setVar('file_ext', $_REQUEST['file_ext']); + //$obj->setVar('file_ext', $_REQUEST['file_ext']); //upload Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -41,7 +41,7 @@ define("TDMPICTURE_RSS", $xoopsModuleConfig['tdmpicture_rss']); define("TDMPICTURE_SOCIAL", $xoopsModuleConfig['tdmpicture_social']); define("TDMPICTURE_PDF", $xoopsModuleConfig['tdmpicture_pdf']); -define("TDMPICTURE_DISPLAY_CAT", $xoopsModuleConfig['tdmpicture_cat_display']); +//define("TDMPICTURE_DISPLAY_CAT", $xoopsModuleConfig['tdmpicture_cat_display']); //define("TDMPICTURE_THUMB_DECO", $xoopsModuleConfig['tdmpicture_thumb_deco']); define("TDMPICTURE_SLIDE_WIDTH", $xoopsModuleConfig['tdmpicture_slide_width']); define("TDMPICTURE_SLIDE_HEIGHT", $xoopsModuleConfig['tdmpicture_slide_height']); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -143,7 +143,7 @@ $obj->setVar('file_display', $_REQUEST['file_display']); $obj->setVar('file_indate', time()); $obj->setVar('file_uid', !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0); - $obj->setVar('file_ext', $_REQUEST['file_ext']); + //$obj->setVar('file_ext', $_REQUEST['file_ext']); foreach ($_FILES as $file => $fileArray) { @@ -310,11 +310,11 @@ $file['file_track'] = 'track_p_'.$f; //$file['file_trackurl'] = $ret->getVar("file_img"); - if ($ret->getVar("file_ext") == 0) { - $file['file_trackurl'] = XOOPS_URL."/modules/".$xoopsModule->dirname()."/sound/".$ret->getVar("file_img"); - } else { - $file['file_trackurl'] = $ret->getVar("file_img"); - } + //if ($ret->getVar("file_ext") == 0) { + //$file['file_trackurl'] = XOOPS_URL."/modules/".$xoopsModule->dirname()."/sound/".$ret->getVar("file_img"); + //} else { + //$file['file_trackurl'] = $ret->getVar("file_img"); + //} //creer le path fichier $filename = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/sound/".$ret->getVar('file_img'); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -75,8 +75,8 @@ define("TDM_CAT_URL", TDMPICTURE_CAT_URL); define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH); define("TDM_CAT_LINK", "viewcat.php"); - $cat_display = $xoopsModuleConfig['tdmpicture_cat_display']; - $cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel']; + //$cat_display = $xoopsModuleConfig['tdmpicture_cat_display']; + //$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel']; $display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false); $xoopsTpl->assign('display_cat', $display_cat); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -65,11 +65,11 @@ //define("_MI_TDMPICTURE_FULL_HEIGTH", "Maximum height of the real image"); define("_MI_TDMPICTURE_JAVA_WIDTH", "Width of java applet (upload)"); define("_MI_TDMPICTURE_JAVA_HEIGTH", "Height of java applet (upload)"); -define("_MI_TDMPICTURE_CAT_CEL", "Category: Number of Column"); -define("_MI_TDMPICTURE_CAT_DISPLAY", "Category: Style category"); -define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT", "text"); -define("_MI_TDMPICTURE_CAT_DISPLAY_IMG", "Image"); -define("_MI_TDMPICTURE_CAT_SOUSCEL", "Category: Number of sub-category"); +//define("_MI_TDMPICTURE_CAT_CEL", "Category: Number of Column"); +//define("_MI_TDMPICTURE_CAT_DISPLAY", "Category: Style category"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT", "text"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_IMG", "Image"); +//define("_MI_TDMPICTURE_CAT_SOUSCEL", "Category: Number of sub-category"); define("_MI_TDMPICTURE_VIEWMYALBUM", "See my album"); define("_MI_TDMPICTURE_VIEWALBUM", "Album List"); define("_MI_TDMPICTURE_UPLOAD", "Upload"); @@ -84,11 +84,11 @@ // Version 1.5 -define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG", "Category and subcategory (with image) "); -define("_MI_TDMPICTURE_CAT_DISPLAY_SUB", "Category and subcategory (without image) "); -define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG", "Category and subcategory (with image) "); +//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG", "Category and subcategory (with image) "); +//define("_MI_TDMPICTURE_CAT_DISPLAY_SUB", "Category and subcategory (without image) "); +//define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG", "Category and subcategory (with image) "); -define("_MI_TDMPICTURE_CAT_DISPLAY_NONE", "No "); +//define("_MI_TDMPICTURE_CAT_DISPLAY_NONE", "No "); define("_MI_TDMPICTURE_THUMB_STYLE", "Miniature: centering thumb"); define("_MI_TDMPICTURE_THUMB_STYLE_CENTER", "Center (on Carrer center width"); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -78,15 +78,15 @@ //define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image"); //version 1.5 -define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne"); -define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories"); -define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)"); -define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)"); -define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)"); -define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)"); -define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image"); -define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non"); -define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie"); +//define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne"); +//define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non"); +//define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie"); define("_MI_TDMPICTURE_THUMB_STYLE","Miniature : centrage thumb"); define("_MI_TDMPICTURE_THUMB_STYLE_CENTER","Centrer (carrer sur centre largeur"); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -78,15 +78,15 @@ //define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image"); //version 1.5 -define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne"); -define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories"); -define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)"); -define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)"); -define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)"); -define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)"); -define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image"); -define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non"); -define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie"); +//define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne"); +//define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image"); +//define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non"); +//define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie"); define("_MI_TDMPICTURE_THUMB_STYLE","Miniature : centrage thumb"); define("_MI_TDMPICTURE_THUMB_STYLE_CENTER","Centrer (carrer sur centre largeur"); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/submit.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -141,7 +141,7 @@ $obj->setVar('file_display', $_REQUEST['file_display']); $obj->setVar('file_indate', time()); $obj->setVar('file_uid', !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0); - $obj->setVar('file_ext', $_REQUEST['file_ext']); + //$obj->setVar('file_ext', $_REQUEST['file_ext']); //upload foreach ($_FILES['tdmfile']['error'] as $key => $value) Modified: XoopsModules/TDMPicture/trunk/TDMPicture/user.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -82,8 +82,8 @@ define("TDM_CAT_URL", TDMPICTURE_CAT_URL); define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH); define("TDM_CAT_LINK", "viewcat.php"); - $cat_display = $xoopsModuleConfig['tdmpicture_cat_display']; - $cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel']; + //$cat_display = $xoopsModuleConfig['tdmpicture_cat_display']; + //$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel']; $display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false); $xoopsTpl->assign('display_cat', $display_cat); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -93,8 +93,8 @@ //asigne les URL define("TDM_CAT_URL", TDMPICTURE_CAT_URL); define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH); - $cat_display = $xoopsModuleConfig['tdmpicture_cat_display']; - $cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel']; + //$cat_display = $xoopsModuleConfig['tdmpicture_cat_display']; + //$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel']; $display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct); $xoopsTpl->assign('display_cat', $display_cat); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -92,8 +92,8 @@ //asigne les URL define("TDM_CAT_URL", TDMPICTURE_CAT_URL); define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH); - $cat_display = $xoopsModuleConfig['tdmpicture_cat_display']; - $cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel']; + //$cat_display = $xoopsModuleConfig['tdmpicture_cat_display']; + //$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel']; $display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct); $xoopsTpl->assign('display_cat', $display_cat); $xoopsTpl->assign('numfile', $GLOBALS['cat_count']); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-11 09:45:31 UTC (rev 9845) +++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-11 17:36:32 UTC (rev 9846) @@ -272,14 +272,14 @@ $modversion['config'][$i]['default'] = 400; $i++; //version 1.5 -$modversion['config'][$i]['name'] = 'tdmpicture_cat_display'; -$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_DISPLAY'; -$modversion['config'][$i]['description'] = ''; -$modversion['config'][$i]['formtype'] = 'select'; -$modversion['config'][$i]['valuetype'] = 'text'; -$modversion['config'][$i]['default'] = 'text'; -$modversion['config'][$i]['options'] = array(_MI_TDMPICTURE_CAT_DISPLAY_NONE => 'none' , _MI_TDMPICTURE_CAT_DISPLAY_SUB => 'sub', _MI_TDMPICTURE_CAT_DISPLAY_SUBIMG => 'subimg', _MI_TDMPICTURE_CAT_DISPLAY_TEXT => 'text', _MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG => 'textimg', _MI_TDMPICTURE_CAT_DISPLAY_IMG => 'img'); -$i++; +//$modversion['config'][$i]['name'] = 'tdmpicture_cat_display'; +//$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_DISPLAY'; +//$modversion['config'][$i]['description'] = ''; +//$modversion['config'][$i]['formtype'] = 'select'; +//$modversion['config'][$i]['valuetype'] = 'text'; +//$modversion['config'][$i]['default'] = 'text'; +//$modversion['config'][$i]['options'] = array(_MI_TDMPICTURE_CAT_DISPLAY_NONE => 'none' , _MI_TDMPICTURE_CAT_DISPLAY_SUB => 'sub', _MI_TDMPICTURE_CAT_DISPLAY_SUBIMG => 'subimg', _MI_TDMPICTURE_CAT_DISPLAY_TEXT => 'text', _MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG => 'textimg', _MI_TDMPICTURE_CAT_DISPLAY_IMG => 'img'); +//$i++; $modversion['config'][$i]['name'] = 'tdmpicture_cat_cel'; $modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_CEL'; $modversion['config'][$i]['description'] = ''; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |