Moves viewPrivate and isMe to module.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/modules/profile.php b/modules/profile.php
index 07e9189..6714c4e 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -329,14 +329,15 @@ class ProfileModule extends PLModule
         $wiz->addPage('ProfilePageGeneral', 'Général', 'general');
         $wiz->addPage('ProfilePageAddresses', 'Adresses personnelles', 'adresses');
         $wiz->addPage('ProfilePageJobs', 'Informations professionnelles', 'emploi');
-        if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) {
+        $viewPrivate = S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE);
+        if ($viewPrivate) {
             $wiz->addPage('ProfilePageGroups', 'Groupes X - Binets', 'poly');
         }
         $wiz->addPage('ProfilePageDecos', 'Décorations - Medailles', 'deco');
-        if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) {
+        if ($viewPrivate) {
             $wiz->addPage('ProfilePageMentor', 'Mentoring', 'mentor');
         }
-        if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE) && $profile->isDeltatenEnabled(Profile::DELTATEN_OLD)) {
+        if ($viewPrivate && $profile->isDeltatenEnabled(Profile::DELTATEN_OLD)) {
             $wiz->addPage('ProfilePageDeltaten', 'Opération N N-10', 'deltaten');
         }
         $wiz->apply($page, 'profile/edit/' . $profile->hrid(), $opened_tab, $mode);
@@ -348,6 +349,8 @@ class ProfileModule extends PLModule
 
        $page->setTitle('Mon Profil');
        $page->assign('hrpid', $profile->hrid());
+       $page->assign('viewPrivate', $viewPrivate);
+       $page->assign('isMe', S::user()->isMyProfile($profile));
        if (isset($success) && $success) {
            $page->trigSuccess('Ton profil a bien été mis à jour.');
        }

diff --git a/templates/profile/base.tpl b/templates/profile/base.tpl
index cd11e40..0aaa0c3 100644 (file)
--- a/templates/profile/base.tpl
+++ b/templates/profile/base.tpl
@@ -20,18 +20,13 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{assign var=isMe value=$smarty.session.user->isMyProfile($profile)}
-{if hasPerm('directory_private')}
-{assign var=viewPrivate value=true}
-{/if}
-
 <form action="{$wiz_baseurl}/{$lookup[$current]}" method="post" id="prof_annu">
   {xsrf_token_field}
   <div>
     {icon name=information title="Voir ma fiche"} Tu peux consulter
-    {if $smarty.session.user->isMyProfile($profile)}ta{else}cette{/if} fiche telle que la
+    {if $isMe}ta{else}cette{/if} fiche telle que la
     voient <a class="popup2" href="profile/{$profile->hrpid}?view=public">n'importe quel internaute</a>,
-    <a class="popup2" href="profile/{$profile->hrpid}?view=ax">l'AX</a>{if hasPerm('directory_private')}ou
+    <a class="popup2" href="profile/{$profile->hrpid}?view=ax">l'AX</a>{if $viewPrivate}ou
     <a class="popup2" href="profile/{$profile->hrpid}">les X</a>{/if}.
   </div>
   <div class="flags">