|
@@ 310-314 (lines=5) @@
|
| 307 |
|
if($args->password1) $args->password = $args->password1; |
| 308 |
|
|
| 309 |
|
// check password strength |
| 310 |
|
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) |
| 311 |
|
{ |
| 312 |
|
$message = Context::getLang('about_password_strength'); |
| 313 |
|
return new Object(-1, $message[$config->password_strength]); |
| 314 |
|
} |
| 315 |
|
|
| 316 |
|
// Remove some unnecessary variables from all the vars |
| 317 |
|
$all_args = Context::getRequestVars(); |
|
@@ 1966-1970 (lines=5) @@
|
| 1963 |
|
// Check password strength |
| 1964 |
|
if($args->password && !$password_is_hashed) |
| 1965 |
|
{ |
| 1966 |
|
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) |
| 1967 |
|
{ |
| 1968 |
|
$message = Context::getLang('about_password_strength'); |
| 1969 |
|
return new Object(-1, $message[$config->password_strength]); |
| 1970 |
|
} |
| 1971 |
|
$args->password = $oMemberModel->hashPassword($args->password); |
| 1972 |
|
} |
| 1973 |
|
elseif(!$args->password) |
|
@@ 2210-2214 (lines=5) @@
|
| 2207 |
|
// Check password strength |
| 2208 |
|
if($args->password) |
| 2209 |
|
{ |
| 2210 |
|
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) |
| 2211 |
|
{ |
| 2212 |
|
$message = Context::getLang('about_password_strength'); |
| 2213 |
|
return new Object(-1, $message[$config->password_strength]); |
| 2214 |
|
} |
| 2215 |
|
$args->password = $oMemberModel->hashPassword($args->password); |
| 2216 |
|
} |
| 2217 |
|
else |
|
@@ 2301-2305 (lines=5) @@
|
| 2298 |
|
$oMemberModel = getModel('member'); |
| 2299 |
|
$config = $oMemberModel->getMemberConfig(); |
| 2300 |
|
|
| 2301 |
|
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) |
| 2302 |
|
{ |
| 2303 |
|
$message = Context::getLang('about_password_strength'); |
| 2304 |
|
return new Object(-1, $message[$config->password_strength]); |
| 2305 |
|
} |
| 2306 |
|
|
| 2307 |
|
$args->password = $oMemberModel->hashPassword($args->password); |
| 2308 |
|
} |