From: <sy...@us...> - 2010-03-10 13:39:18
|
Revision: 26037 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26037&view=rev Author: sylvieg Date: 2010-03-10 13:39:11 +0000 (Wed, 10 Mar 2010) Log Message: ----------- [FIX]fgal: verif categ perms for the list of fgals where you can upload Modified Paths: -------------- branches/5.x/templates/tiki-upload_file.tpl branches/5.x/tiki-upload_file.php Modified: branches/5.x/templates/tiki-upload_file.tpl =================================================================== --- branches/5.x/templates/tiki-upload_file.tpl 2010-03-10 13:25:15 UTC (rev 26036) +++ branches/5.x/templates/tiki-upload_file.tpl 2010-03-10 13:39:11 UTC (rev 26037) @@ -181,9 +181,7 @@ <select id="galleryId" name="galleryId[]"> <option value="{$prefs.fgal_root_id}" {if $prefs.fgal_root_id eq $galleryId}selected="selected"{/if} style="font-style:italic; border-bottom:1px dashed #666;">{tr}File Galleries{/tr}</option> {section name=idx loop=$galleries} - {if $galleries[idx].id neq $prefs.fgal_root_id and - ( ($galleries[idx].individual eq 'n') or ($galleries[idx].individual_tiki_p_upload_files eq 'y') ) - } + {if $galleries[idx].id neq $prefs.fgal_root_id and $galleries[idx].perms.tiki_p_upload_files eq 'y'} <option value="{$galleries[idx].id|escape}" {if $galleries[idx].id eq $galleryId}selected="selected"{/if}>{$galleries[idx].name|escape}</option> {/if} {/section} Modified: branches/5.x/tiki-upload_file.php =================================================================== --- branches/5.x/tiki-upload_file.php 2010-03-10 13:25:15 UTC (rev 26036) +++ branches/5.x/tiki-upload_file.php 2010-03-10 13:39:11 UTC (rev 26037) @@ -487,22 +487,7 @@ $galleries = $filegallib->list_file_galleries(0, -1, 'name_asc', $user, '', $prefs['fgal_root_id'], false, true, false, false, false, true, false); $cachelib->cacheItem($cacheName, serialize($galleries), $cacheType); } - $temp_max = count($galleries["data"]); - for ($i = 0; $i < $temp_max; $i++) { - if ($userlib->object_has_one_permission($galleries["data"][$i]["galleryId"], 'file gallery')) { - $galleries["data"][$i]["individual"] = 'y'; - if ($userlib->object_has_permission($user, $galleries["data"][$i]["galleryId"], 'file gallery', 'tiki_p_upload_files')) { - $galleries["data"][$i]["individual_tiki_p_upload_files"] = 'y'; - } else { - $galleries["data"][$i]["individual_tiki_p_upload_files"] = 'n'; - } - if ($tiki_p_admin == 'y' || $userlib->object_has_permission($user, $galleries["data"][$i]["galleryId"], 'file gallery', 'tiki_p_admin_file_galleries')) { - $galleries["data"][$i]["individual_tiki_p_upload_files"] = 'y'; - } - } else { - $galleries["data"][$i]["individual"] = 'n'; - } - } + $galleries['data'] = Perms::filter(array('file gallery'), 'object', $galleries['data'], array('object'=>'id'), 'upload_files'); $smarty->assign_by_ref('galleries', $galleries["data"]); } if ($tiki_p_admin_file_galleries == 'y' || $tiki_p_admin == 'y') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |