diff --git a/module/blog/blog.php b/module/blog/blog.php index 190ca559..864411b3 100644 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -306,8 +306,12 @@ class blog extends common { foreach ($articleIds as $key => $value) { if ( ( // Propriétaire - $this->getData(['module', $this->getUrl(0), $value,'editConsent']) === self::EDIT_OWNER - AND $this->getData(['module', $this->getUrl(0), $value,'userId']) === $this->getUser('id') + ( + $this->getData(['module', $this->getUrl(0), $value,'editConsent']) === self::EDIT_OWNER + AND $this->getData(['module', $this->getUrl(0), $value,'userId']) === $this->getUser('id') + ) // Ou une autorité + OR $this->getUser('group') > $this->getData(['module',$this->getUrl(0), $value,'editConsent']) + ) OR ( // Groupe $this->getData(['module', $this->getUrl(0), $this->getUrl(1),'editConsent']) !== self::EDIT_OWNER diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index 491de407..e72f759a 100644 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -11,8 +11,11 @@ $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND ( // Propriétaire - $this->getData(['module', $this->getUrl(0), $this->getUrl(1),'editConsent']) === $module::EDIT_OWNER - AND $this->getData(['module', $this->getUrl(0), $this->getUrl(1),'userId']) === $this->getUser('id') + ( + $this->getData(['module', $this->getUrl(0), $this->getUrl(1),'editConsent']) === $module::EDIT_OWNER + AND $this->getData(['module', $this->getUrl(0), $this->getUrl(1),'userId']) === $this->getUser('id') + ) // Ou une autorité + OR $this->getUser('group') > $this->getData(['module',$this->getUrl(0), $value,'editConsent']) ) OR ( // Groupe $this->getData(['module', $this->getUrl(0), $this->getUrl(1),'editConsent']) !== $module::EDIT_OWNER