From: <lor...@us...> - 2012-07-14 18:25:19
|
Revision: 9878 http://xoops.svn.sourceforge.net/xoops/?rev=9878&view=rev Author: lord_venom Date: 2012-07-14 18:25:12 +0000 (Sat, 14 Jul 2012) Log Message: ----------- Path url Modified Paths: -------------- XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php XoopsModules/TDMPicture/trunk/TDMPicture/admin/user.php XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css XoopsModules/TDMPicture/trunk/TDMPicture/download.php XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php XoopsModules/TDMPicture/trunk/TDMPicture/index.php XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php XoopsModules/TDMPicture/trunk/TDMPicture/submit.php XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_liste.html XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 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/cat.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -218,7 +218,7 @@ echo '</tr>'; $class = 'odd'; $mytree = new TDMObjectTree($assoc_cat, 'cat_id', 'cat_pid'); - $category_ArrayTree = $mytree->makeArrayTree('','<img src="'.TDMPICTURE_IMAGES_URL.'/decos/arrow.gif">'); + $category_ArrayTree = $mytree->makeArrayTree('','<img src="'.TDMPICTURE_IMAGES_URL.'decos/arrow.gif">'); foreach (array_keys($category_ArrayTree) as $i) { $class = ($class == 'even') ? 'odd' : 'even'; $cat_id = $assoc_cat[$i]->getVar('cat_id'); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/user.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/user.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/user.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -200,7 +200,7 @@ echo '</tr>'; $class = 'odd'; $mytree = new TDMObjectTree($assoc_user, 'user_id', 'user_pid'); - $useregory_ArrayTree = $mytree->makeArrayTree('','<img src="'.TDMPICTURE_IMAGES_URL.'/decos/arrow.gif">'); + $useregory_ArrayTree = $mytree->makeArrayTree('','<img src="'.TDMPICTURE_IMAGES_URL.'decos/arrow.gif">'); foreach (array_keys($useregory_ArrayTree) as $i) { $class = ($class == 'even') ? 'odd' : 'even'; $user_id = $assoc_user[$i]->getVar('user_id'); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -68,11 +68,11 @@ //$cat_link = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris ); $cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$this->_tree[$key]['obj']->getVar('cat_id')."&tris=".$tris."&limit=".$limit; //recherche image - $imgpath = TDM_CAT_PATH . $this->_tree[$key]['obj']->getVar('cat_img'); + $imgpath = TDMPICTURE_CAT_PATH . $this->_tree[$key]['obj']->getVar('cat_img'); if (file_exists($imgpath) && $this->_tree[$key]['obj']->getVar('cat_img') != "blank.gif") { - $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . $this->_tree[$key]['obj']->getVar('cat_img').'" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>'; + $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDMPICTURE_CAT_URL . $this->_tree[$key]['obj']->getVar('cat_img').'" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>'; } else { - $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . 'no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>'; + $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDMPICTURE_CAT_URL . 'no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>'; } @@ -104,7 +104,7 @@ $select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview'); - $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></li>'; + $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></div></li>'; } Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-14 18:25:12 UTC (rev 9878) @@ -54,7 +54,9 @@ float:left; } + #tdmpicture_text, ul#tree_menu #tree_text { + float:left; font-size: 13px; font-weight: normal; color: #728DA9; Modified: XoopsModules/TDMPicture/trunk/TDMPicture/download.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/download.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/download.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -40,9 +40,9 @@ } //on test l'existance de l'image - $imgpath = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/".$document->getVar("file_file"); + $imgpath = TDMPICTURE_UPLOADS_PATH.$document->getVar("file_file"); if (file_exists($imgpath)) { - $document_file = XOOPS_URL. "/modules/".$xoopsModule->dirname()."/upload/".$document->getVar("file_file"); + $document_file = TDMPICTURE_UPLOADS_URL.$document->getVar("file_file"); } else { redirect_header('index.php', 2, _AM_TDMPICTURE_BASEERROR); exit(); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -27,8 +27,8 @@ define("TDMPICTURE_DIRNAME", basename(dirname(dirname(__FILE__)))); define("TDMPICTURE_URL", XOOPS_URL . '/modules/' . TDMPICTURE_DIRNAME); -define("TDMPICTURE_IMAGES_URL", TDMPICTURE_URL . '/images'); -define("TDMPICTURE_UPLOADS_URL", TDMPICTURE_URL . '/upload'); +define("TDMPICTURE_IMAGES_URL", TDMPICTURE_URL . '/images/'); +define("TDMPICTURE_UPLOADS_URL", TDMPICTURE_URL . '/upload/'); define("TDMPICTURE_THUMB_URL", TDMPICTURE_URL . '/upload/thumb/'); define("TDMPICTURE_CAT_URL", TDMPICTURE_URL . '/upload/cat/'); @@ -45,6 +45,8 @@ //define("TDMPICTURE_THUMB_DECO", $xoopsModuleConfig['tdmpicture_thumb_deco']); define("TDMPICTURE_SLIDE_WIDTH", $xoopsModuleConfig['tdmpicture_slide_width']); define("TDMPICTURE_SLIDE_HEIGHT", $xoopsModuleConfig['tdmpicture_slide_height']); +define("TDMPICTURE_WIDTH", $xoopsModuleConfig['tdmpicture_width']); +define("TDMPICTURE_HEIGHT", $xoopsModuleConfig['tdmpicture_heigth']); include_once TDMPICTURE_ROOT_PATH . '/include/functions.php'; Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -72,9 +72,9 @@ $cat_arr = $cat_handler->getall($criteria); $mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid'); //asigne les URL - define("TDM_CAT_URL", TDMPICTURE_CAT_URL); - define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH); - define("TDM_CAT_LINK", "viewcat.php"); + //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']; $display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false); @@ -121,10 +121,10 @@ // $file['cat_nav'] = 'ct='.$file_arr[$f]->getVar('file_cat'); //on test l'existance de l'image - $imgpath = TDMPICTURE_UPLOADS_PATH . "/thumb/".$file_arr[$f]->getVar("file_file"); + $imgpath = TDMPICTURE_THUMB_PATH.$file_arr[$f]->getVar("file_file"); if (file_exists($imgpath)) { - $file['img'] = TDMPICTURE_UPLOADS_URL. "/thumb/".$file_arr[$f]->getVar("file_file"); - $file['img_popup'] = TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file"); + $file['img'] = TDMPICTURE_THUMB_URL.$file_arr[$f]->getVar("file_file"); + $file['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file"); } else { $file['img'] = false; } @@ -154,12 +154,12 @@ if (@$moyen == 0) { $file['moyen'] = ""; } else { - $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."/rate".$moyen.".png'/>"; + $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."rate".$moyen.".png'/>"; } //favorie if ($file['counts'] >= $xoopsModuleConfig['tdmpicture_favourite']) { - $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."/flag.png'/>"; + $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."flag.png'/>"; } else { $file['favourite'] = ""; } Modified: XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -44,10 +44,10 @@ exit(); } - if( file_exists(XOOPS_ROOT_PATH."/modules/TDMPicture/language/".$xoopsConfig['language']."/admin.php") ) { - include_once(XOOPS_ROOT_PATH."/modules/TDMPicture/language/".$xoopsConfig['language']."/admin.php"); + if( file_exists(TDMPICTURE_ROOT_PATH."/language/".$xoopsConfig['language']."/admin.php") ) { + include_once(TDMPICTURE_ROOT_PATH."/language/".$xoopsConfig['language']."/admin.php"); } else { - include_once(XOOPS_ROOT_PATH."/modules/TDMPicture/language/english/admin.php"); + include_once(TDMPICTURE_ROOT_PATH."/language/english/admin.php"); } $myts = & MyTextSanitizer :: getInstance(); // MyTextSanitizer object @@ -174,7 +174,7 @@ $pdf->AddPage(); //titre $absx=($wt-$w)/2; -$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$w); +$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$w); $pdf->Output(); break; @@ -204,7 +204,7 @@ //titre $size = '210'; $absx=(210-$size)/2; -$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$size); +$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$size); $pdf->Output(); break; @@ -234,7 +234,7 @@ //titre $size = '297'; $absx=(297-$size)/2; -$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$size); +$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$size); $pdf->Output(); break; @@ -265,7 +265,7 @@ //titre $size = '420'; $absx=(420-$size)/2; -$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$size); +$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$size); $pdf->Output(); break; @@ -295,7 +295,7 @@ //titre $size = '594'; $absx=(594-$size)/2; -$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$size); +$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$size); $pdf->Output(); break; Modified: XoopsModules/TDMPicture/trunk/TDMPicture/submit.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -212,7 +212,7 @@ case "list": default: - redirect_header(TDMPICTURE_URL, 2, _MD_TDMPICTURE_NOPERM); + redirect_header("index.php", 2, _MD_TDMPICTURE_NOPERM); exit(); } tdmpicture_header(); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html 2012-07-14 18:25:12 UTC (rev 9878) @@ -65,10 +65,10 @@ <td> <!--nav --> <div class="TDMNav""> - <a href="#" class="switch_thumb" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/view_choose.png" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"></span></a> - <a href="javascript:;" class="openSlideshow" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/diapo.png" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"></span></a> - <{if $xoops_userid}><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$xoops_userid}>" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"></span></a><{/if}> - <{if $perm_submit}><a href="<{$smarty.const.TDMPICTURE_URL}>/submit.php" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/upload.png" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"></span></a><{/if}> + <a href="#" class="switch_thumb" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>view_choose.png" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"></span></a> + <a href="javascript:;" class="openSlideshow" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>diapo.png" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"></span></a> + <{if $xoops_userid}><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$xoops_userid}>" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"></span></a><{/if}> + <{if $perm_submit}><a href="<{$smarty.const.TDMPICTURE_URL}>/submit.php" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>upload.png" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"></span></a><{/if}> </div> <br class="clear"/> <{include file="db:tdmpicture_tpfile.html"}> @@ -85,7 +85,7 @@ <!-- AddThis Button END --> <!-- Button RSS --> <{if $smarty.const.TDMPICTURE_RSS}> -<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div> +<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div> <{/if}> <!-- Button RSS END--> Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_liste.html =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_liste.html 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_liste.html 2012-07-14 18:25:12 UTC (rev 9878) @@ -14,7 +14,7 @@ <{foreach item=file from=$file}> <{cycle values=odd,even assign=class}> <tr class="<{$class}>"> - <td style="vertical-align: middle;"><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.file_uid}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/photo.png" /></a></td> + <td style="vertical-align: middle;"><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.file_uid}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>photo.png" /></a></td> <td align="center" style="vertical-align: middle;"><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.file_uid}>"><{$file.user_uname}>, <{$file.user_name}></a></td> <td align="center" style="vertical-align: middle;"><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.file_uid}>"><{$file.file_usercount}></a></td> </tr> Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html 2012-07-14 18:25:12 UTC (rev 9878) @@ -65,10 +65,10 @@ <td> <!--nav --> <div class="TDMNav"> - <a href="#" class="switch_thumb" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/view_choose.png" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"></span></a> - <a href="javascript:;" class="openSlideshow" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/diapo.png" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"></span></a> - <{if $xoops_userid}><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$xoops_userid}>" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"></span></a><{/if}> - <{if $perm_submit}><a href="<{$smarty.const.TDMPICTURE_URL}>/submit.php" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/upload.png" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"></span></a><{/if}> + <a href="#" class="switch_thumb" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>view_choose.png" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"></span></a> + <a href="javascript:;" class="openSlideshow" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>diapo.png" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"></span></a> + <{if $xoops_userid}><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$xoops_userid}>" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"></span></a><{/if}> + <{if $perm_submit}><a href="<{$smarty.const.TDMPICTURE_URL}>/submit.php" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>upload.png" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"></span></a><{/if}> </div> <br class="clear"/> <{include file="db:tdmpicture_tpfile.html"}> @@ -87,7 +87,7 @@ <!-- AddThis Button END --> <!-- Button RSS --> <{if $smarty.const.TDMPICTURE_RSS}> -<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div> +<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div> <{/if}> <!-- Button RSS END--> Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-14 18:25:12 UTC (rev 9878) @@ -29,9 +29,9 @@ <{foreach item=file from=$file}> <div class="TDMNav""> - <{if $perm_dl}><a href="<{$smarty.const.TDMPICTURE_URL}>/download.php?st=<{$file.id}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/down.png" title="<{$smarty.const._MD_TDMPICTURE_DL}>"></a><{/if}> - <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/zoom.png" title="<{$smarty.const._MD_TDMPICTURE_SCREEN}>" alt="<{$smarty.const._MD_TDMPICTURE_SCREEN}>" /></a> - <{if $file.useralb }><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWALBUM}> <{$file.postername}>"></a><{/if}> + <{if $perm_dl}><a href="<{$smarty.const.TDMPICTURE_URL}>/download.php?st=<{$file.id}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>down.png" title="<{$smarty.const._MD_TDMPICTURE_DL}>"></a><{/if}> + <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>zoom.png" title="<{$smarty.const._MD_TDMPICTURE_SCREEN}>" alt="<{$smarty.const._MD_TDMPICTURE_SCREEN}>" /></a> + <{if $file.useralb }><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWALBUM}> <{$file.postername}>"></a><{/if}> </div> <br class="clear"/> @@ -41,7 +41,8 @@ <tr><td class="even" align="center"> <div class="boxgrid"> - <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" ><{$file.img}> + <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" > + <img style="max-width:<{$smarty.const.TDMPICTURE_WIDTH}>px; max-height:<{$smarty.const.TDMPICTURE_HEIGHT}>px;" src="<{$file.img}>" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" /> </a></div> </td></tr><tr><td class="odd"> @@ -118,11 +119,11 @@ <{if $smarty.const.TDMPICTURE_PDF}> <tr><td class="odd"> <div style="float: left;"> -<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> -<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A4&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a> -<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a> -<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a> -<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a> +<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> +<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A4&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a> +<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a> +<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a> +<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a> </div> </li></ul> </td></tr> @@ -142,7 +143,7 @@ <!-- AddThis Button END --> <!-- Button RSS --> <{if $smarty.const.TDMPICTURE_RSS}> -<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div> +<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div> <{/if}> <!-- Button RSS END--> Modified: XoopsModules/TDMPicture/trunk/TDMPicture/user.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -79,8 +79,8 @@ $cat_arr = $cat_handler->getall($criteria); $mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid'); //asigne les URL - define("TDM_CAT_URL", TDMPICTURE_CAT_URL); - define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH); + //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']; @@ -131,10 +131,10 @@ // $file['cat_nav'] = 'ct='.$file_arr[$f]->getVar('file_cat'); //on test l'existance de l'image - $imgpath = TDMPICTURE_UPLOADS_PATH . "/thumb/".$file_arr[$f]->getVar("file_file"); + $imgpath = TDMPICTURE_THUMB_PATH.$file_arr[$f]->getVar("file_file"); if (file_exists($imgpath)) { - $file['img'] = TDMPICTURE_UPLOADS_URL. "/thumb/".$file_arr[$f]->getVar("file_file"); - $file['img_popup'] = TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file"); + $file['img'] = TDMPICTURE_THUMB_URL.$file_arr[$f]->getVar("file_file"); + $file['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file"); } else { $file['img'] = false; } @@ -164,12 +164,12 @@ if (@$moyen == 0) { $file['moyen'] = ""; } else { - $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."/rate".$moyen.".png'/>"; + $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."rate".$moyen.".png'/>"; } //favorie if ($file['counts'] >= $xoopsModuleConfig['tdmpicture_favourite']) { - $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."/flag.png'/>"; + $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."flag.png'/>"; } else { $file['favourite'] = ""; } Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -91,8 +91,8 @@ $cat_arr = $cat_handler->getall($criteria); $mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid'); //asigne les URL - define("TDM_CAT_URL", TDMPICTURE_CAT_URL); - define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH); + //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']; $display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct); @@ -145,17 +145,17 @@ $file['file_cat_id'] = $file_arr[$f]->getVar('file_cat'); // //on test l'existance de l'image - $imgpath = TDMPICTURE_UPLOADS_PATH . "/thumb/".$file_arr[$f]->getVar("file_file"); + $imgpath = TDMPICTURE_THUMB_PATH.$file_arr[$f]->getVar("file_file"); if (file_exists($imgpath)) { - $file['img'] = TDMPICTURE_UPLOADS_URL. "/thumb/".$file_arr[$f]->getVar("file_file"); - $file['img_popup'] = TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file"); + $file['img'] = TDMPICTURE_THUMB_URL.$file_arr[$f]->getVar("file_file"); + $file['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file"); } else { $file['img'] = false; } $file['id'] = $file_arr[$f]->getVar("file_id"); $file['title'] = $myts->displayTarea($file_arr[$f]->getVar("file_title")); - $file['text'] = $myts->displayTarea($file_arr[$f]->getVar("file_text")); + $file['text'] = $file_arr[$f]->getVar("file_text"); $file['file_catum'] = $file_arr[$f]->getVar("file_catum"); @@ -178,12 +178,12 @@ if (@$moyen == 0) { $file['moyen'] = ""; } else { - $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."/rate".$moyen.".png'/>"; + $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."rate".$moyen.".png'/>"; } //favorie if ($file['counts'] >= $xoopsModuleConfig['tdmpicture_favourite']) { - $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."/flag.png'/>"; + $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."flag.png'/>"; } else { $file['favourite'] = ""; } Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -132,17 +132,17 @@ $nav_page = ""; if ($pos != 0) { - $path = TDMPICTURE_THUMB_PATH . "/".$array_files[$pos-1]; + $path = TDMPICTURE_THUMB_PATH.$array_files[$pos-1]; if (file_exists($path)) { - $previmg = "<img src=".TDMPICTURE_THUMB_URL. "/".$array_files[$pos-1]." class='detail_img'>"; + $previmg = "<img src=".TDMPICTURE_THUMB_URL.$array_files[$pos-1]." class='detail_img'>"; $prev_page = "<a title='".$array_titles[$pos-1]."' href='viewfile.php?st=".$array_ids[$pos-1]."&tris=".$tris."'>".$previmg."</a>"; $xoopsTpl->assign('prev_page', $prev_page); } } if ($pos != $numrows) { - $path = TDMPICTURE_THUMB_PATH . "/".$array_files[$pos+1]; + $path = TDMPICTURE_THUMB_PATH.$array_files[$pos+1]; if (file_exists($path)) { - $nextimg = "<img src=".TDMPICTURE_THUMB_URL. "/".$array_files[$pos+1]." class='detail_img'>"; + $nextimg = "<img src=".TDMPICTURE_THUMB_URL.$array_files[$pos+1]." class='detail_img'>"; $next_page = "<a title='".$array_titles[$pos+1]."' href='viewfile.php?st=".$array_ids[$pos+1]."&tris=".$tris."'>".$nextimg."</a>" ; $xoopsTpl->assign('next_page', $next_page); } } @@ -174,11 +174,12 @@ $file['file_cat_id'] = $file_arr[$f]->getVar('file_cat'); // //on test l'existance de l'image - $imgpath = TDMPICTURE_UPLOADS_PATH . "/".$file_arr[$f]->getVar("file_file"); + $imgpath = TDMPICTURE_UPLOADS_PATH.$file_arr[$f]->getVar("file_file"); if (file_exists($imgpath)) { //$dst = redimage( $imgpath,$xoopsModuleConfig['tdmpicture_width'],$xoopsModuleConfig['tdmpicture_heigth']); - $file['img'] = "<img src=".TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file")." class='detail_img' style='max-width:".$xoopsModuleConfig['tdmpicture_width']."px;max-height:".$xoopsModuleConfig['tdmpicture_heigth']."px;' >"; - $file['img_popup'] = TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file"); + //$file['img'] = "<img src=".TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file")." class='detail_img' style='max-width:".$xoopsModuleConfig['tdmpicture_width']."px;max-height:".$xoopsModuleConfig['tdmpicture_heigth']."px;' >"; + $file['img'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file"); + $file['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file"); } else { $file['img'] = false; } @@ -211,7 +212,7 @@ $xoopsTpl->assign('file_edit', true); } $meta_desc = $file_arr[$f]->getVar("file_text"); - $file['text'] = $myts->displayTarea($file_arr[$f]->getVar("file_text")); + $file['text'] = $file_arr[$f]->getVar("file_text"); $file['indate'] = formatTimeStamp($file_arr[$f]->getVar('file_indate'),"S"); $file['votes'] = $file_arr[$f]->getVar('file_votes'); $file['counts'] = $file_arr[$f]->getVar("file_counts"); @@ -222,11 +223,11 @@ if (@$moyen == 0) { $file['moyen'] = ""; } else { - $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."/rate".$moyen.".png'/>"; + $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."rate".$moyen.".png'/>"; } //favorie if ($file['counts'] >= $xoopsModuleConfig['tdmpicture_favourite']) { - $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."/flag.png'/>"; + $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."flag.png'/>"; } else { $file['favourite'] = ""; } Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-14 18:11:32 UTC (rev 9877) +++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-14 18:25:12 UTC (rev 9878) @@ -22,7 +22,7 @@ } $modversion['name'] = "TDMPicture"; -$modversion['version'] = 1.06; +$modversion['version'] = 1.063; $modversion['description'] = 'Image manager'; $modversion['credits'] = "none"; $modversion['author'] = 'TDM'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |