diff --git a/protected/humhub/components/access/AccessValidator.php b/protected/humhub/components/access/AccessValidator.php index f83df28740..a78893107b 100644 --- a/protected/humhub/components/access/AccessValidator.php +++ b/protected/humhub/components/access/AccessValidator.php @@ -1,21 +1,13 @@ name) { + if (!$this->name) { $this->name = static::class; } - if(empty($this->reason)) { + if (empty($this->reason)) { $this->reason = Yii::t('error', 'You are not permitted to access this section.'); } } @@ -97,7 +89,7 @@ abstract class AccessValidator extends Object * * @return boolean true if validation passed otherwise true */ - abstract function run(); + abstract public function run(); /** * Filters out all rules which are not related to this validator. @@ -107,7 +99,7 @@ abstract class AccessValidator extends Object */ protected function filterRelatedRules($rules = null) { - if($rules === null) { + if ($rules === null) { $rules = $this->access->getRules(); } @@ -115,11 +107,11 @@ abstract class AccessValidator extends Object foreach ($rules as $rule) { $ruleName = $this->getRuleName($rule); - if($this->name === $ruleName) { + if ($this->name === $ruleName) { $result[] = $rule; } - } + return $result; } @@ -185,12 +177,12 @@ abstract class AccessValidator extends Object */ protected function getRuleName($rule) { - if(empty($rule)) { + if (empty($rule)) { return null; } $firstKey = current(array_keys($rule)); - if(is_string($firstKey)) { + if (is_string($firstKey)) { return $firstKey; } else { return $rule[$firstKey]; @@ -212,4 +204,4 @@ abstract class AccessValidator extends Object { return $this->code; } -} \ No newline at end of file +}