@@ -305,6 +305,7 @@ discard block |
||
| 305 | 305 | |
| 306 | 306 | /** |
| 307 | 307 | * @param String |
| 308 | + * @param string $name |
|
| 308 | 309 | */ |
| 309 | 310 | public function setDisplayFolderName($name) { |
| 310 | 311 | $this->displayFolderName = $name; |
@@ -1046,7 +1047,7 @@ discard block |
||
| 1046 | 1047 | |
| 1047 | 1048 | /** |
| 1048 | 1049 | * @param SS_HTTPRequest $request |
| 1049 | - * @return UploadField_ItemHandler |
|
| 1050 | + * @return UploadField_SelectHandler |
|
| 1050 | 1051 | */ |
| 1051 | 1052 | public function handleSelect(SS_HTTPRequest $request) { |
| 1052 | 1053 | if(!$this->canAttachExisting()) return $this->httpError(403); |
@@ -1404,7 +1405,7 @@ discard block |
||
| 1404 | 1405 | * Action to handle editing of a single file |
| 1405 | 1406 | * |
| 1406 | 1407 | * @param SS_HTTPRequest $request |
| 1407 | - * @return ViewableData_Customised |
|
| 1408 | + * @return HTMLText |
|
| 1408 | 1409 | */ |
| 1409 | 1410 | public function edit(SS_HTTPRequest $request) { |
| 1410 | 1411 | // Check form field state |
@@ -162,6 +162,9 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | // -------------------------------------------------------------------------------------------------------------- |
| 164 | 164 | |
| 165 | + /** |
|
| 166 | + * @param DOMElement $node |
|
| 167 | + */ |
|
| 165 | 168 | protected function removeNode($node) { |
| 166 | 169 | $node->parentNode->removeChild($node); |
| 167 | 170 | } |
@@ -177,6 +180,9 @@ discard block |
||
| 177 | 180 | } |
| 178 | 181 | } |
| 179 | 182 | |
| 183 | + /** |
|
| 184 | + * @param DOMElement $after |
|
| 185 | + */ |
|
| 180 | 186 | protected function insertListAfter($new, $after) { |
| 181 | 187 | $doc = $after->ownerDocument; $parent = $after->parentNode; $next = $after->nextSibling; |
| 182 | 188 | |
@@ -85,6 +85,10 @@ discard block |
||
| 85 | 85 | * but is necessary for retain compatibility with password hashed |
| 86 | 86 | * with flawed algorithms - see {@link PasswordEncryptor_LegacyPHPHash} and |
| 87 | 87 | * {@link PasswordEncryptor_Blowfish} |
| 88 | + * @param string $hash |
|
| 89 | + * @param string $password |
|
| 90 | + * @param string $salt |
|
| 91 | + * @param Member $member |
|
| 88 | 92 | */ |
| 89 | 93 | public function check($hash, $password, $salt = null, $member = null) { |
| 90 | 94 | return $hash === $this->encrypt($password, $salt, $member); |
@@ -241,6 +245,7 @@ discard block |
||
| 241 | 245 | |
| 242 | 246 | /** |
| 243 | 247 | * self::$cost param is forced to be two digits with leading zeroes for ints 4-9 |
| 248 | + * @param string $password |
|
| 244 | 249 | */ |
| 245 | 250 | public function salt($password, $member = null) { |
| 246 | 251 | $generator = new RandomGenerator(); |