[xoops-svn] SF.net SVN: xoops:[9886] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9886
          http://xoops.svn.sourceforge.net/xoops/?rev=9886&view=rev
Author:   lord_venom
Date:     2012-07-16 08:29:14 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
    XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-16 08:12:51 UTC (rev 9885)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-16 08:29:14 UTC (rev 9886)
@@ -56,6 +56,7 @@
 
 	$gperm_handler =& xoops_gethandler('groupperm');
 	$parent = "";
+	$scat_display = isset($GLOBALS['scat_display']) ? $GLOBALS['scat_display'] : true;
 	//$GLOBALS['navbar'] .= "";
 		
 	
@@ -100,7 +101,7 @@
 		
 		
 		//if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
-		if ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected) {
+		if (($scat_display) && $this->_tree[$key]['obj']->getVar('cat_pid') == $selected) {
 		
 		if (!empty( $this->_tree[$key]['child'] )) {
 		$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');

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php	2012-07-16 08:12:51 UTC (rev 9885)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php	2012-07-16 08:29:14 UTC (rev 9886)
@@ -79,7 +79,7 @@
 		$criteria = new CriteriaCompo();
 		if ($cat_index) {
 		$criteria->add(new Criteria('cat_display', 1));
-		$criteria->add(new Criteria('cat_index', 1));
+		//$criteria->add(new Criteria('cat_index', 1));
 		$xoopsTpl->assign('nav', "<a href='".XOOPS_URL. "/modules/".$xoopsModule->dirname()."'/>".$xoopsModule->name()."</a>");
 		} else {
 		$criteria->add(new Criteria('cat_display', 1));
@@ -92,6 +92,7 @@
 		//asigne les URL
 		define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
 		define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
+		$GLOBALS['scat_display'] = false;
 		//$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
 		//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
 		$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.