@@ -218,35 +218,35 @@ |
||
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | /** |
| 221 | - * This function takes a password as argument, salts it and returns the new password. |
|
| 222 | - * |
|
| 223 | - * @param string $password |
|
| 224 | - * |
|
| 225 | - * @return string |
|
| 226 | - */ |
|
| 221 | + * This function takes a password as argument, salts it and returns the new password. |
|
| 222 | + * |
|
| 223 | + * @param string $password |
|
| 224 | + * |
|
| 225 | + * @return string |
|
| 226 | + */ |
|
| 227 | 227 | protected function salt_password($password) |
| 228 | 228 | { |
| 229 | 229 | if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('saltedpasswords')) { |
| 230 | - // @see tx_saltedpasswords_Tasks_BulkUpdate::updatePasswords() |
|
| 231 | - $saltedpasswordsInstance = \TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getSaltingInstance(NULL, 'FE'); |
|
| 230 | + // @see tx_saltedpasswords_Tasks_BulkUpdate::updatePasswords() |
|
| 231 | + $saltedpasswordsInstance = \TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getSaltingInstance(NULL, 'FE'); |
|
| 232 | 232 | |
| 233 | - $password = $saltedpasswordsInstance->getHashedPassword($password); |
|
| 233 | + $password = $saltedpasswordsInstance->getHashedPassword($password); |
|
| 234 | 234 | |
| 235 | - if ($this->isValidMd5($password)) { |
|
| 235 | + if ($this->isValidMd5($password)) { |
|
| 236 | 236 | $password = 'M' . $password; |
| 237 | - } |
|
| 237 | + } |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | return $password; |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
| 244 | - * This function checks if a password is in md5 format. |
|
| 245 | - * |
|
| 246 | - * @param string $md5 |
|
| 247 | - * |
|
| 248 | - * @return int |
|
| 249 | - */ |
|
| 244 | + * This function checks if a password is in md5 format. |
|
| 245 | + * |
|
| 246 | + * @param string $md5 |
|
| 247 | + * |
|
| 248 | + * @return int |
|
| 249 | + */ |
|
| 250 | 250 | protected function isValidMd5($md5 ='') |
| 251 | 251 | { |
| 252 | 252 | return preg_match('/^[a-f0-9]{32}$/', $md5); |
@@ -247,7 +247,7 @@ |
||
| 247 | 247 | * |
| 248 | 248 | * @return int |
| 249 | 249 | */ |
| 250 | - protected function isValidMd5($md5 ='') |
|
| 250 | + protected function isValidMd5($md5 = '') |
|
| 251 | 251 | { |
| 252 | 252 | return preg_match('/^[a-f0-9]{32}$/', $md5); |
| 253 | 253 | } |