Renames classes that extend ProfilePage into ProfilePageXXXX.

[platal.git] / modules / profile.php

diff --git a/modules/profile.php b/modules/profile.php
index e1004c9..3b32414 100644 (file)
--- 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';
@@ -327,13 +327,17 @@ class ProfileModule extends PLModule
         $wiz->addUserData('profile', $profile);
         $wiz->addUserData('owner', $profile->owner());
         $this->load('page.inc.php');
-        $wiz->addPage('ProfileSettingGeneral', 'Général', 'general');
-        $wiz->addPage('ProfileSettingAddresses', 'Adresses personnelles', 'adresses');
-        $wiz->addPage('ProfileSettingGroups', 'Groupes X - Binets', 'poly');
-        $wiz->addPage('ProfileSettingDecos', 'Décorations - Medailles', 'deco');
-        $wiz->addPage('ProfileSettingJobs', 'Informations professionnelles', 'emploi');
-        $wiz->addPage('ProfileSettingSkills', 'Compétences diverses', 'skill');
-        $wiz->addPage('ProfileSettingMentor', 'Mentoring', 'mentor');
+        $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)) {
+            $wiz->addPage('ProfilePageGroups', 'Groupes X - Binets', 'poly');
+        }
+        $wiz->addPage('ProfilePageDecos', 'Décorations - Medailles', 'deco');
+        if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) {
+            $wiz->addPage('ProfilePageSkills', 'Compétences diverses', 'skill');
+            $wiz->addPage('ProfilePageMentor', 'Mentoring', 'mentor');
+        }
         $wiz->apply($page, 'profile/edit/' . $profile->hrid(), $opened_tab, $mode);
 
         if (!$profile->birthdate) {
@@ -392,7 +396,8 @@ class ProfileModule extends PLModule
         $page->assign('prefid', $prefid);
         $page->assign('prefname', $prefname);
         $page->assign('telid', $telid);
-        $page->assign('tel', array());
+        $phone = new Phone();
+        $page->assign('tel', $phone->toFormArray());
     }
 
     function handler_ajax_edu(&$page, $eduid, $class)