Changeset 25050 for extensions
- Timestamp:
- Oct 21, 2013, 11:51:44 AM (11 years ago)
- Location:
- extensions/Password_Policy
- Files:
-
- 61 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Password_Policy/admin/PP_admin.php
r25028 r25050 59 59 else if (isset($_POST['PasswordTest']) and empty($_POST['PP_Password_Test'])) 60 60 { 61 array_push($page['errors'], l10n('PP_ reg_err_login3'));61 array_push($page['errors'], l10n('PP_Error_Password_Mandatory')); 62 62 } 63 63 -
extensions/Password_Policy/admin/template/PP_admin.tpl
r25028 r25050 16 16 17 17 <div class="titrePage"> 18 <h2>{'PP_Title _Tab'|@translate} {$PP_VERSION}<br/>{'PP_SubTitle1'|@translate}</h2>18 <h2>{'PP_Title'|@translate} {$PP_VERSION}<br/>{'PP_SubTitle'|@translate}</h2> 19 19 </div> 20 20 21 21 <form method="post" action="" class="general"> 22 22 <fieldset> 23 <span class="cluetip" title="{'PP_Title1'|translate}|{'PP_restricTitle_d'|translate}">24 {'PP_Title1'|@translate}25 </span>26 27 23 <ul> 28 24 <li> -
extensions/Password_Policy/include/functions.inc.php
r25028 r25050 192 192 if ($data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts 193 193 { 194 if (PP_check_pw greset($user['id']))194 if (PP_check_pwdreset($user['id'])) 195 195 { 196 196 redirect(PHPWG_ROOT_PATH.'profile.php'); … … 230 230 if ($PasswordCheck < $conf_PP['PASSWORD_SCORE']) 231 231 { 232 $message = get_l10n_args('PP_ reg_err_login4_%s', $PasswordCheck);232 $message = get_l10n_args('PP_Error_Password_Need_Enforcement_%s', $PasswordCheck); 233 233 $lang['reg_err_pass'] = l10n_args($message).$conf_PP['PASSWORD_SCORE']; 234 234 array_push($errors, $lang['reg_err_pass']); … … 241 241 if ($PasswordCheck < $conf_PP['PASSWORD_SCORE']) 242 242 { 243 $message = get_l10n_args('PP_ reg_err_login4_%s', $PasswordCheck);243 $message = get_l10n_args('PP_Error_Password_Need_Enforcement_%s', $PasswordCheck); 244 244 $lang['reg_err_pass'] = l10n_args($message).$conf_PP['PASSWORD_SCORE']; 245 245 array_push($errors, $lang['reg_err_pass']); … … 264 264 if ((isset($conf_PP['PWDRESET']) and $conf_PP['PWDRESET'] == 'true')) 265 265 { 266 if (PP_check_pw greset($user['id']))266 if (PP_check_pwdreset($user['id'])) 267 267 { 268 268 $template->append('errors', l10n('PP_Password_Reset_Msg')); … … 276 276 // Password reset control 277 277 // ---------------------- 278 if (isset($conf_PP['PWDRESET']) and $conf_PP['PWDRESET'] == 'true' and PP_check_pw greset($user['id']))278 if (isset($conf_PP['PWDRESET']) and $conf_PP['PWDRESET'] == 'true' and PP_check_pwdreset($user['id'])) 279 279 { 280 280 // if password not changed then pwdreset field = true else pwdreset field = false … … 302 302 if ($PasswordCheck < $conf_PP['PASSWORD_SCORE']) 303 303 { 304 $message = get_l10n_args('PP_ reg_err_login4_%s', $PasswordCheck);304 $message = get_l10n_args('PP_Error_Password_Need_Enforcement_%s', $PasswordCheck); 305 305 $template->append('errors', l10n_args($message).$conf_PP['PASSWORD_SCORE']); 306 306 unset($_POST['use_new_pwd']); … … 340 340 * 341 341 */ 342 function PP_check_pw greset($uid)342 function PP_check_pwdreset($uid) 343 343 { 344 344 $query = ' -
extensions/Password_Policy/main.inc.php
r25028 r25050 107 107 in_array($conf['default_user_id'], $collection)) 108 108 { 109 array_push($page['errors'], l10n('PP_Default user cannot be pw greset'));110 $template->append('errors', l10n('PP_Default user cannot be pw greset'));109 array_push($page['errors'], l10n('PP_Default user cannot be pwdreset')); 110 $template->append('errors', l10n('PP_Default user cannot be pwdreset')); 111 111 } 112 112 if (in_array($conf['webmaster_id'], $collection))
Note: See TracChangeset
for help on using the changeset viewer.