X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=7428f149eb7e6362cda5e1e2c5c26a7b48c3d55b;hb=2d7ad7207e52b478c20f8867121a940665a6f77c;hp=93339975b4ce4ea558e511d7b3129f55af952219;hpb=3c74642259203c7f11e21ef0a75497660170c4ec;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 9333997..7428f14 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -25,15 +25,15 @@ class ProfileModule extends PLModule { return array( 'photo' => $this->make_hook('photo', AUTH_PUBLIC), - 'photo/change' => $this->make_hook('photo_change', AUTH_MDP), + 'photo/change' => $this->make_hook('photo_change', AUTH_MDP, 'user'), 'fiche.php' => $this->make_hook('fiche', AUTH_PUBLIC), 'profile' => $this->make_hook('profile', AUTH_PUBLIC), - 'profile/private' => $this->make_hook('profile', AUTH_COOKIE), + 'profile/private' => $this->make_hook('profile', AUTH_COOKIE, 'user'), 'profile/ax' => $this->make_hook('ax', AUTH_COOKIE, 'admin,edit_directory'), - 'profile/edit' => $this->make_hook('p_edit', AUTH_MDP), + 'profile/edit' => $this->make_hook('p_edit', AUTH_MDP, 'user'), 'profile/ajax/address' => $this->make_hook('ajax_address', AUTH_COOKIE, 'user', NO_AUTH), - 'profile/ajax/address/del' => $this->make_hook('ajax_address_del', AUTH_MDP), + 'profile/ajax/address/del' => $this->make_hook('ajax_address_del', AUTH_MDP, 'user'), 'profile/ajax/tel' => $this->make_hook('ajax_tel', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/edu' => $this->make_hook('ajax_edu', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/medal' => $this->make_hook('ajax_medal', AUTH_COOKIE, 'user', NO_AUTH), @@ -45,15 +45,15 @@ class ProfileModule extends PLModule 'profile/ajax/buildnames' => $this->make_hook('ajax_buildnames', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/tree/jobterms' => $this->make_hook('ajax_tree_job_terms', AUTH_COOKIE, 'user', NO_AUTH), 'profile/jobterms' => $this->make_hook('jobterms', AUTH_COOKIE, 'user', NO_AUTH), - 'javascript/education.js' => $this->make_hook('education_js', AUTH_COOKIE), - 'javascript/grades.js' => $this->make_hook('grades_js', AUTH_COOKIE), + 'javascript/education.js' => $this->make_hook('education_js', AUTH_COOKIE, 'user'), + 'javascript/grades.js' => $this->make_hook('grades_js', AUTH_COOKIE, 'user'), 'profile/medal' => $this->make_hook('medal', AUTH_PUBLIC), - 'referent' => $this->make_hook('referent', AUTH_COOKIE), + 'referent' => $this->make_hook('referent', AUTH_COOKIE, 'user'), 'referent/country' => $this->make_hook('ref_country', AUTH_COOKIE, 'user', NO_AUTH), 'referent/autocomplete' => $this->make_hook('ref_autocomplete', AUTH_COOKIE, 'user', NO_AUTH), - 'groupes-x' => $this->make_hook('xnet', AUTH_COOKIE), + 'groupes-x' => $this->make_hook('xnet', AUTH_COOKIE, 'groups'), 'groupes-x/logo' => $this->make_hook('xnetlogo', AUTH_PUBLIC), 'vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'user', NO_HTTPS), @@ -224,13 +224,14 @@ class ProfileModule extends PLModule } // Determines the access level at which the profile will be displayed. - if (!S::logged() || !S::user()->checkPerms('directory_ax') || Env::v('view') == 'public') { - $view = 'public'; - } else if (!S::user()->checkPerms('directory_private') || Env::v('view') == 'ax') { - $view = 'ax'; + if (Env::v('view') == 'public') { + $view = Visibility::VIEW_PUBLIC; + } else if (Env::v('view') == 'ax') { + $view = Visibility::VIEW_AX; } else { - $view = 'private'; + $view = Visibility::VIEW_PRIVATE; } + $visibility = Visibility::defaultForRead($view); // Display pending picture if (S::logged() && Env::v('modif') == 'new') { @@ -241,7 +242,7 @@ class ProfileModule extends PLModule if (is_null($pid)) { $owner = User::getSilent($id); if ($owner) { - $profile = $owner->profile(true, Profile::FETCH_ALL, $view); + $profile = $owner->profile(true, Profile::FETCH_ALL, $visibility); if ($profile) { $pid = $profile->id(); } @@ -249,7 +250,7 @@ class ProfileModule extends PLModule } else { // Fetches profile's and profile's owner information and redirects to // marketing if the owner has not subscribed and the requirer has logged in. - $profile = Profile::get($pid, Profile::FETCH_ALL, $view); + $profile = Profile::get($pid, Profile::FETCH_ALL, $visibility); $owner = $profile->owner(); } if (is_null($pid)) { @@ -258,6 +259,7 @@ class ProfileModule extends PLModule } return PL_NOT_FOUND; } + // Now that we know this is an existing profile, we can switch to the // appropriate template. $page->changeTpl('profile/profile.tpl', SIMPLE); @@ -277,7 +279,7 @@ class ProfileModule extends PLModule $page->assign_by_ref('profile', $profile); $page->assign_by_ref('owner', $owner); - $page->assign('view', $view); + $page->assign('view', $visibility); $page->assign('logged', S::logged()); header('Last-Modified: ' . date('r', strtotime($profile->last_change))); @@ -715,7 +717,7 @@ class ProfileModule extends PLModule $table_editor->add_join_table('profile_education', 'eduid', true); $table_editor->add_join_table('profile_education_degree', 'eduid', true); $table_editor->describe('name', 'intitulé', true); - $table_editor->describe('url', 'site web', false); + $table_editor->describe('url', 'site web', false, true); $table_editor->apply($page, $action, $id); } function handler_admin_education_field($page, $action = 'list', $id = null) { @@ -763,7 +765,7 @@ class ProfileModule extends PLModule $page->assign('title', 'Gestion des types de networking'); $table_editor = new PLTableEditor('admin/networking', 'profile_networking_enum', 'nwid'); $table_editor->describe('name', 'intitulé', true); - $table_editor->describe('icon', 'nom de l\'icône', false); + $table_editor->describe('icon', 'nom de l\'icône', false, true); $table_editor->describe('filter', 'filtre', true); $table_editor->describe('link', 'lien web', true); $table_editor->apply($page, $action, $id); @@ -790,7 +792,7 @@ class ProfileModule extends PLModule $page->assign('title', 'Gestion des Distinctions'); $table_editor = new PLTableEditor('admin/medals','profile_medal_enum','id'); $table_editor->describe('text', 'intitulé', true); - $table_editor->describe('img', 'nom de l\'image', false); + $table_editor->describe('img', 'nom de l\'image', false, true); $table_editor->describe('flags', 'valider', true); $table_editor->apply($page, $action, $id); if ($id && $action == 'edit') {