From 574f3cc38f9e059b77972e71fbbd8cc6a6330c15 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 3 Oct 2010 17:35:03 +0200
Subject: [PATCH] Hide private fields in advanced search if the user does not
 have the directory_private permission.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 templates/profile/phone.tpl   | 2 +-
 templates/search/adv.form.tpl | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/templates/profile/phone.tpl b/templates/profile/phone.tpl
index c378102..767e3d1 100644
--- a/templates/profile/phone.tpl
+++ b/templates/profile/phone.tpl
@@ -22,7 +22,7 @@
 
 {assign var=telpref value="`$prefname`[`$telid`]"}
 {assign var=id value="`$prefid`_`$telid`"}
-{if !hasPerm('directory_private') && ($tel.pub eq 'private') && !empty($tel.display)}
+{if !hasPerm('directory_private') && ($tel.pub eq 'private') && !empty($tel.display|smarty:nodefaults)}
 {assign var=hiddentel value=true}
 {else}
 {assign var=hiddentel value=false}
diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index a71dd30..a9e56a5 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -373,10 +373,12 @@ function cleanForm(f) {
         <a href="jobterm" class="autocompleteToSelect">{icon name="table" title="Tous les mots-clefs"}</a>
       </td>
     </tr>
+    {if hasPerm('directory_private')}
     <tr>
       <td>CV contient</td>
       <td><input type="text" name="cv" size="32" value="{$smarty.request.cv}" /></td>
     </tr>
+    {/if}
     <tr>
       <td colspan="2">
         <input type='checkbox' name='only_referent' {if $smarty.request.only_referent}checked='checked'{/if} id="only_referent"/>
@@ -395,6 +397,7 @@ function cleanForm(f) {
         <a href="nationalite" class="autocompleteToSelect">{icon name="table" title="Toutes les nationalités"}</a>
       </td>
     </tr>
+    {if hasPerm('directory_private')}
     <tr>
       <td>Binet</td>
       <td>
@@ -404,6 +407,7 @@ function cleanForm(f) {
         <a href="binet" class="autocompleteToSelect">{icon name="table" title="Tous les binets"}</a>
       </td>
     </tr>
+    {/if}
     <tr>
       <td>Groupe X</td>
       <td>
@@ -413,6 +417,7 @@ function cleanForm(f) {
         <a href="groupex" class="autocompleteToSelect">{icon name="table" title="Tous les groupes X"}</a>
       </td>
     </tr>
+    {if hasPerm('directory_private')}
     <tr>
       <td>Section</td>
       <td>
@@ -422,6 +427,7 @@ function cleanForm(f) {
         <a href="section" class="autocompleteToSelect">{icon name="table" title="Toutes les sections"}</a>
       </td>
     </tr>
+    {/if}
     <tr>
       <td>Formation</td>
       <td>
-- 
2.1.4