@@ -40,7 +40,7 @@ |
||
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | - * @param $type |
|
| 43 | + * @param string $type |
|
| 44 | 44 | * @return mixed |
| 45 | 45 | */ |
| 46 | 46 | public function getNewType($type) |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | protected $translator = null; |
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | - * @param $type |
|
| 20 | + * @param string $type |
|
| 21 | 21 | * @param array $params |
| 22 | 22 | * @param bool $language |
| 23 | 23 | * @return string |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | - * @param $slug |
|
| 33 | + * @param string $slug |
|
| 34 | 34 | * @param array $params |
| 35 | 35 | * @param bool $language |
| 36 | 36 | * @return string |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
| 79 | - * @param $name |
|
| 79 | + * @param string $name |
|
| 80 | 80 | * @param array $params |
| 81 | 81 | * @param bool $language |
| 82 | 82 | * @return string |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | */ |
| 25 | 25 | public function getLabel($type, $params = [], $language = false) |
| 26 | 26 | { |
| 27 | - $slug = 'labels.'.$type; |
|
| 27 | + $slug = 'labels.' . $type; |
|
| 28 | 28 | |
| 29 | 29 | return $this->translate($slug, $params, $language); |
| 30 | 30 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public function translate($slug, $params = [], $language = false) |
| 39 | 39 | { |
| 40 | - $slug = $this->getController().'.'.$slug; |
|
| 40 | + $slug = $this->getController() . '.' . $slug; |
|
| 41 | 41 | |
| 42 | 42 | return $this->getTranslator()->translate($slug, $params, $language); |
| 43 | 43 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | public function getMessage($name, $params = [], $language = false) |
| 85 | 85 | { |
| 86 | - $slug = 'messages.'.$name; |
|
| 86 | + $slug = 'messages.' . $name; |
|
| 87 | 87 | |
| 88 | 88 | return $this->translate($slug, $params, $language); |
| 89 | 89 | } |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | /** |
| 61 | 61 | * Uploads cover to temporary directory |
| 62 | 62 | * |
| 63 | - * @return mixed |
|
| 63 | + * @return \Organization_Cover_Default|null |
|
| 64 | 64 | */ |
| 65 | 65 | public function uploadCoverAutoCrop($file) |
| 66 | 66 | { |
@@ -190,7 +190,7 @@ |
||
| 190 | 190 | |
| 191 | 191 | /** |
| 192 | 192 | * @param $request |
| 193 | - * @return $this|void |
|
| 193 | + * @return LogoModel |
|
| 194 | 194 | */ |
| 195 | 195 | public function removeLogo($request) |
| 196 | 196 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | /** |
| 150 | 150 | * Persist record |
| 151 | 151 | * |
| 152 | - * @param Record|boolean $item record to be persisted |
|
| 152 | + * @param Record $item record to be persisted |
|
| 153 | 153 | * |
| 154 | 154 | * @return $this |
| 155 | 155 | */ |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | /** |
| 181 | 181 | * Returns current default Persisted Record |
| 182 | 182 | * |
| 183 | - * @return bool|mixed |
|
| 183 | + * @return boolean |
|
| 184 | 184 | */ |
| 185 | 185 | public function getCurrentDefault() |
| 186 | 186 | { |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | - * @param $key |
|
| 71 | + * @param string $key |
|
| 72 | 72 | */ |
| 73 | 73 | public function setCurrentKey($key) |
| 74 | 74 | { |
@@ -33,7 +33,6 @@ |
||
| 33 | 33 | /** |
| 34 | 34 | * Recursively builds parents path to passed resource |
| 35 | 35 | * |
| 36 | - * @param ACL_Resource|bool $page |
|
| 37 | 36 | * @param array $return |
| 38 | 37 | * @return array |
| 39 | 38 | */ |
@@ -5,61 +5,61 @@ |
||
| 5 | 5 | class Resources extends Records |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - protected $_sortOn = "name"; |
|
| 8 | + protected $_sortOn = "name"; |
|
| 9 | 9 | |
| 10 | - public function findAll() |
|
| 11 | - { |
|
| 12 | - if (!$this->getRegistry()->exists("all")) { |
|
| 13 | - $resources = parent::findAll(); |
|
| 14 | - $this->buildTree($resources); |
|
| 15 | - } |
|
| 10 | + public function findAll() |
|
| 11 | + { |
|
| 12 | + if (!$this->getRegistry()->exists("all")) { |
|
| 13 | + $resources = parent::findAll(); |
|
| 14 | + $this->buildTree($resources); |
|
| 15 | + } |
|
| 16 | 16 | |
| 17 | - return $this->getRegistry()->get('all'); |
|
| 18 | - } |
|
| 17 | + return $this->getRegistry()->get('all'); |
|
| 18 | + } |
|
| 19 | 19 | |
| 20 | - public function buildTree($resources = array()) |
|
| 21 | - { |
|
| 22 | - if ($resources) { |
|
| 23 | - /* @var $resource ACL_Resource */ |
|
| 24 | - foreach ($resources as $resource) { |
|
| 25 | - if ($resource->hasParent()) { |
|
| 26 | - $parent = $resources[$resource->id_parent]; |
|
| 27 | - $parent->addChild($resource); |
|
| 28 | - } |
|
| 29 | - } |
|
| 30 | - } |
|
| 31 | - } |
|
| 20 | + public function buildTree($resources = array()) |
|
| 21 | + { |
|
| 22 | + if ($resources) { |
|
| 23 | + /* @var $resource ACL_Resource */ |
|
| 24 | + foreach ($resources as $resource) { |
|
| 25 | + if ($resource->hasParent()) { |
|
| 26 | + $parent = $resources[$resource->id_parent]; |
|
| 27 | + $parent->addChild($resource); |
|
| 28 | + } |
|
| 29 | + } |
|
| 30 | + } |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * Recursively builds parents path to passed resource |
|
| 35 | - * |
|
| 36 | - * @param ACL_Resource|bool $page |
|
| 37 | - * @param array $return |
|
| 38 | - * @return array |
|
| 39 | - */ |
|
| 40 | - public function buildPath($resource, &$return = array()) |
|
| 41 | - { |
|
| 42 | - if (!($resource instanceof ACL_Resource)) { |
|
| 43 | - return array_reverse($return); |
|
| 44 | - } |
|
| 33 | + /** |
|
| 34 | + * Recursively builds parents path to passed resource |
|
| 35 | + * |
|
| 36 | + * @param ACL_Resource|bool $page |
|
| 37 | + * @param array $return |
|
| 38 | + * @return array |
|
| 39 | + */ |
|
| 40 | + public function buildPath($resource, &$return = array()) |
|
| 41 | + { |
|
| 42 | + if (!($resource instanceof ACL_Resource)) { |
|
| 43 | + return array_reverse($return); |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - $return[] = $resource; |
|
| 46 | + $return[] = $resource; |
|
| 47 | 47 | |
| 48 | - return $this->buildPath($resource->getParent(), $return); |
|
| 49 | - } |
|
| 48 | + return $this->buildPath($resource->getParent(), $return); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * Singleton |
|
| 53 | - * |
|
| 54 | - * @return ACL_Resources |
|
| 55 | - */ |
|
| 56 | - public static function instance() |
|
| 57 | - { |
|
| 58 | - static $instance; |
|
| 59 | - if (!($instance instanceof self)) { |
|
| 60 | - $instance = new self(); |
|
| 61 | - } |
|
| 62 | - return $instance; |
|
| 63 | - } |
|
| 51 | + /** |
|
| 52 | + * Singleton |
|
| 53 | + * |
|
| 54 | + * @return ACL_Resources |
|
| 55 | + */ |
|
| 56 | + public static function instance() |
|
| 57 | + { |
|
| 58 | + static $instance; |
|
| 59 | + if (!($instance instanceof self)) { |
|
| 60 | + $instance = new self(); |
|
| 61 | + } |
|
| 62 | + return $instance; |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | 65 | } |
| 66 | 66 | \ No newline at end of file |
@@ -41,6 +41,9 @@ |
||
| 41 | 41 | return $this; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | + /** |
|
| 45 | + * @param boolean $value |
|
| 46 | + */ |
|
| 44 | 47 | public function authenticated($value = null) |
| 45 | 48 | { |
| 46 | 49 | if (!is_null($value)) { |
@@ -73,6 +73,9 @@ |
||
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | + /** |
|
| 77 | + * @param string $name |
|
| 78 | + */ |
|
| 76 | 79 | static function nameTransaction($name) |
| 77 | 80 | { |
| 78 | 81 | if (self::isLoaded()) { |