From 0409b3c29d09a147b83092233f07c71a61d78a35 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Sun, 13 Feb 2011 23:13:43 +0100 Subject: [PATCH] Fixes erroneous rights for address and job deletion. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- classes/address.php | 2 +- modules/profile/jobs.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/address.php b/classes/address.php index 8d1fa48..ba09823 100644 --- a/classes/address.php +++ b/classes/address.php @@ -586,7 +586,7 @@ class Address $this->text = trim($this->text); $this->phones = Phone::formatFormArray($this->phones, $this->error, new ProfileVisibility($this->pub)); if ($this->removed == 1) { - if (S::user()->checkPerms('directory_ax') && Phone::hasPrivate($this->phones)) { + if (!S::user()->checkPerms('directory_private') && Phone::hasPrivate($this->phones)) { Platal::page()->trigWarning("L'adresse ne peut être supprimée car elle contient des informations pour lesquelles vous n'avez le droit d'édition."); } else { $this->text = ''; diff --git a/modules/profile/jobs.inc.php b/modules/profile/jobs.inc.php index 3f3097b..893145e 100644 --- a/modules/profile/jobs.inc.php +++ b/modules/profile/jobs.inc.php @@ -224,7 +224,7 @@ class ProfileSettingJob implements ProfileSetting } if (isset($job['removed']) && $job['removed']) { - if (S::user()->checkPerms('directory_ax') + if (!S::user()->checkPerms('directory_private') && (Phone::hasPrivate($job['w_phone']) || Address::hasPrivate($job['w_address']) || $job['w_email_pub'] == 'private')) { Platal::page()->trigWarning("L'entreprise ne peut être supprimée car elle contient des informations pour lesquelles vous n'avez le droit d'édition."); } else { -- 2.1.4