{**************************************************************************}
{* *}
-{* Copyright (C) 2003-2011 Polytechnique.org *}
+{* Copyright (C) 2003-2014 Polytechnique.org *}
{* http://opensource.polytechnique.org/ *}
{* *}
{* This program is free software; you can redistribute it and/or modify *}
{assign var=prefname value="addresses[$i]"}
{assign var=prefid value="addresses_$i"}
-{if !hasPerm('directory_private') && ($address.pub eq 'private') && !$new}
-{assign var=hiddenaddr value=true}
+{if $isMe || hasPerm('admin') || $new}
+ {assign var=hiddenaddr value=false}
+{elseif hasPerm('directory_hidden') || (($address.pub neq 'hidden') && ($address.pub neq 'private'))}
+ {assign var=hiddenaddr value=false}
+{elseif hasPerm('directory_private') && ($address.pub neq 'hidden')}
+ {assign var=hiddenaddr value=false}
{else}
-{assign var=hiddenaddr value=false}
+ {assign var=hiddenaddr value=true}
{/if}
<table class="bicol" style="display: none; margin-bottom: 1em" id="{$prefid}_grayed">
{include file="include/flags.radio.tpl" name="`$prefname`[pub]" val=$address.pub mainField='addresses' mainId=$i subField='phones' subId=-1}
</td>
</tr>
- {include file="geoloc/form.address.tpl" prefname=$prefname prefid=$prefid address=$address id=$i}
+ {include file="geoloc/form.address.tpl" prefname=$prefname prefid=$prefid address=$address id=$i hiddenaddr=$hiddenaddr}
<tr {if $hiddenaddr}style="display: none"{/if}>
{if !$isMe}
<td>
</tr>
</table>
-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
+{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *}