From e4f43af452fdf9ffef2637ce31ba4170cd2c50a4 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 30 Aug 2010 15:09:43 +0200
Subject: [PATCH] Take directory_* permissions into account when accessing a
 profile.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 modules/profile.php           | 4 ++--
 templates/profile/profile.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/profile.php b/modules/profile.php
index e1004c9..d7cd55f 100644
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -253,9 +253,9 @@ class ProfileModule extends PLModule
         $page->changeTpl('profile/profile.tpl', SIMPLE);
 
         // Determines the access level at which the profile will be displayed.
-        if (!S::logged() || Env::v('view') == 'public') {
+        if (!S::logged() || !S::user()->checkPerms('directory_ax') || Env::v('view') == 'public') {
             $view = 'public';
-        } else if (S::logged() && Env::v('view') == 'ax') {
+        } else if (!S::user()->checkPerms('directory_private') || Env::v('view') == 'ax') {
             $view = 'ax';
         } else {
             $view = 'private';
diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index 53eecf4..ed73b0b 100644
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -87,7 +87,7 @@ function chgMainWinLoc(strPage)
   <div id="fiche_identite" class="part">
     <div class="civilite">
       {if $profile->isFemale()}&bull;{/if}
-        {if $logged}{$profile->private_name}{else}{$profile->public_name}{/if}
+        {if $view eq 'private'}{$profile->private_name}{else}{$profile->public_name}{/if}
 
       {if $logged}
         &nbsp;{if !$profile->isDead()}<a href="vcard/{$owner->login()}.vcf">{*
-- 
2.1.4