From: <lor...@us...> - 2012-07-11 09:45:42
|
Revision: 9845 http://xoops.svn.sourceforge.net/xoops/?rev=9845&view=rev Author: lord_venom Date: 2012-07-11 09:45:31 +0000 (Wed, 11 Jul 2012) Log Message: ----------- Modified Paths: -------------- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php XoopsModules/TDMPicture/trunk/TDMPicture/index.php XoopsModules/TDMPicture/trunk/TDMPicture/user.php Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 19:44:32 UTC (rev 9844) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-11 09:45:31 UTC (rev 9845) @@ -222,7 +222,7 @@ } break; - case _DELETE : + case _AM_TDMPICTURE_DELETE_SELECTED : if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) { if (!$GLOBALS['xoopsSecurity']->check()) { Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php 2012-07-10 19:44:32 UTC (rev 9844) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php 2012-07-11 09:45:31 UTC (rev 9845) @@ -58,14 +58,14 @@ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT, $numcat); $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE, $numfile); if ($cat_waiting == 0){ - $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, $cat_waiting, 'Green'); + $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, 0, 'Green'); }else{ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, $cat_waiting, 'Red'); } - if ($numfile == 0){ - $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $numfile, 'Green'); + if ($file_waiting == 0){ + $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, 0, 'Green'); }else{ - $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $numfile, 'Red'); + $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $file_waiting, 'Red'); } foreach (array_keys( $folder) as $i) { Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php 2012-07-10 19:44:32 UTC (rev 9844) +++ XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php 2012-07-11 09:45:31 UTC (rev 9845) @@ -49,26 +49,6 @@ } -function TDMDownloads_NumbersOfEntries($mytree, $categories, $entries,$cid) -{ - $count = 0; - $child_arr = array(); - if(in_array($cid, $categories)) { - $child = $mytree->getAllChild($cid); - foreach (array_keys($entries) as $i) { - if ($entries[$i]->getVar('cid') == $cid){ - $count++; - } - foreach (array_keys($child) as $j) { - if ($entries[$i]->getVar('cid') == $j){ - $count++; - } - } - } - } - return $count; -} - function tdmpicture_adminheader() { global $xoopsConfig, $xoopsModule, $xoTheme, $xoopsTpl; Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-10 19:44:32 UTC (rev 9844) +++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-11 09:45:31 UTC (rev 9845) @@ -65,10 +65,10 @@ $criteria = new CriteriaCompo(); $criteria->add(new Criteria('cat_display', 1)); - $criteria->add(new Criteria('cat_index', 1)); + //$criteria->add(new Criteria('cat_index', 1)); $criteria->setSort('cat_weight'); $criteria->setOrder('DESC'); - $criteria->add(new Criteria('cat_display', 1)); + //$criteria->add(new Criteria('cat_display', 1)); $cat_arr = $cat_handler->getall($criteria); $mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid'); //asigne les URL Modified: XoopsModules/TDMPicture/trunk/TDMPicture/user.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-10 19:44:32 UTC (rev 9844) +++ XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-11 09:45:31 UTC (rev 9845) @@ -69,30 +69,32 @@ // ************************************************************ // Liste des Categories // ************************************************************ - + $criteria = new CriteriaCompo(); $criteria->add(new Criteria('cat_display', 1)); - $criteria->add(new Criteria('cat_uid', $ut)); + //$criteria->add(new Criteria('cat_index', 1)); $criteria->setSort('cat_weight'); $criteria->setOrder('DESC'); + //$criteria->add(new Criteria('cat_display', 1)); $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"); $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); $numcat = $cat_handler->getCount($criteria); - $xoopsTpl->assign('numcat', $numcat); + $xoopsTpl->assign('numcat', $numcat); unset($criteria); -$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, false)); +//$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, false)); // ************************************************************ // Liste des derniers fichier This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |