From 15f9cd37fa5df85b022756f0071a5b637dd7e6cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Wed, 1 Sep 2010 01:49:43 +0200 Subject: [PATCH] Improve default ProfileVisibility wrt new perm levels. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- classes/profile.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/classes/profile.php b/classes/profile.php index a747063..c26a545 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -42,9 +42,14 @@ class ProfileVisibility Platal::page()->kill("Invalid visibility: " . $level); } - if (!S::logged()) { + // Unlogged or not allowed to view directory_ax or requesting public + // => public view + if (!S::logged() || !S::user()->checkPerms('directory_ax') || $level == self::VIS_PUBLIC) { $level = self::VIS_PUBLIC; - } else if ($level == null) { + // Not allowed to view directory_private or requesting ax + } else if (!S::user()->checkPerms('directory_private') || $level == self::VIS_AX) { + $level = self::VIS_AX; + } else { $level = self::VIS_PRIVATE; } -- 2.1.4