From fb4182ea66a2cc484c5547e3520c50410877a910 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Wed, 17 May 2006 06:00:12 +0000 Subject: [PATCH] Correct spelling --- phpgwapi/inc/class.auth.inc.php | 28 +++++++++++++++++++--------- phpgwapi/setup/phpgw_de.lang | 2 +- phpgwapi/setup/phpgw_en.lang | 2 +- phpgwapi/setup/phpgw_fr.lang | 2 +- phpgwapi/setup/phpgw_nl.lang | 2 +- phpgwapi/setup/phpgw_pt-br.lang | 2 +- 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/phpgwapi/inc/class.auth.inc.php b/phpgwapi/inc/class.auth.inc.php index 04d5b5069f..c4136db76f 100644 --- a/phpgwapi/inc/class.auth.inc.php +++ b/phpgwapi/inc/class.auth.inc.php @@ -1,4 +1,4 @@ - * @@ -241,32 +241,42 @@ } /** - * Checks if a given password is "save" + * Checks if a given password is "safe" * * @param string $login * @abstract atm a simple check in length, #digits, #uppercase and #lowercase - * could be made more save using e.g. pecl libary cracklib - * but as pecl dosn't tun on any platform and isn't GPL'd - * i havn't implemented it yet - * Windows compatible check is: 7 char lenth, 1 Up, 1 Low, 1 Num and 1 Special + * could be made more safe using e.g. pecl library cracklib + * but as pecl dosn't run on any platform and isn't GPL'd + * i haven't implemented it yet + * Windows compatible check is: 7 char lenth, 1 Up, 1 Low, 1 Num and 1 Special * @author cornelius weiss - * @return mixed false if password is considerd "save" or a string $message if "unsafe" + * @return mixed false if password is considered "safe" or a string $message if "unsafe" */ function crackcheck($passwd) { if (!preg_match('/.{'. ($noc=7). ',}/',$passwd)) + { $message = lang('Password must have at least %1 characters',$noc). '
'; + } if(!preg_match('/(.*\d.*){'. ($non=1). ',}/',$passwd)) + { $message .= lang('Password must contain at least %1 numbers',$non). '
'; + } if(!preg_match('/(.*[[:upper:]].*){'. ($nou=1). ',}/',$passwd)) + { $message .= lang('Password must contain at least %1 uppercase letters',$nou). '
'; + } if(!preg_match('/(.*[[:lower:]].*){'. ($nol=1). ',}/',$passwd)) + { $message .= lang('Password must contain at least %1 lowercase letters',$nol). '
'; + } if(!preg_match('/(.*[\\!"#$%&\'()*+,-.\/:;<=>?@\[\]\^_ {|}~`].*){'. ($nol=1). ',}/',$passwd)) - $message .= lang('Password must contain at least %1 special charactars',$nol). '
'; + { + $message .= lang('Password must contain at least %1 special characters',$nol). '
'; + } return $message ? $message : false; } - + /** @function smd5_compare @abstract compare SMD5-encrypted passwords for authentication diff --git a/phpgwapi/setup/phpgw_de.lang b/phpgwapi/setup/phpgw_de.lang index 20741aad86..f340975b36 100644 --- a/phpgwapi/setup/phpgw_de.lang +++ b/phpgwapi/setup/phpgw_de.lang @@ -613,7 +613,7 @@ password could not be changed common de Passwort konnte nicht ge password has been updated common de Passwort wurde aktualisiert password must contain at least %1 lowercase letters common de Das Passwort muss mindestens %1 Kleinbuchstaben enthalten password must contain at least %1 numbers common de Das Passwort muss mindestens %1 Nummern enthalten -password must contain at least %1 special charactars common de Das Passwort muss mindestens %1 Sonderzeichen enthalten +password must contain at least %1 special characters common de Das Passwort muss mindestens %1 Sonderzeichen enthalten password must contain at least %1 uppercase letters common de Das Passwort muss mindestens %1 Großbuchstaben enthalten password must have at least %1 characters common de Das Passwort muss mindestens %1 Zeichen lang sein paste htmlarea-ContextMenu de Einfügen diff --git a/phpgwapi/setup/phpgw_en.lang b/phpgwapi/setup/phpgw_en.lang index 4d932a8696..878f8b4959 100644 --- a/phpgwapi/setup/phpgw_en.lang +++ b/phpgwapi/setup/phpgw_en.lang @@ -653,7 +653,7 @@ password could not be changed common en Password could not be changed password has been updated common en Password has been updated password must contain at least %1 lowercase letters common en Password must contain at least %1 lowercase letters password must contain at least %1 numbers common en Password must contain at least %1 numbers -password must contain at least %1 special charactars common en Password must contain at least %1 special charactars +password must contain at least %1 special characters common en Password must contain at least %1 special characters password must contain at least %1 uppercase letters common en Password must contain at least %1 uppercase letters password must have at least %1 characters common en Password must have at least %1 characters paste htmlarea-ContextMenu en Paste diff --git a/phpgwapi/setup/phpgw_fr.lang b/phpgwapi/setup/phpgw_fr.lang index d17403025e..cfc23f8c5d 100644 --- a/phpgwapi/setup/phpgw_fr.lang +++ b/phpgwapi/setup/phpgw_fr.lang @@ -647,7 +647,7 @@ password could not be changed common fr Le mot de passe n'a pas pu password has been updated common fr Le mot de passe a été mis à jour avec succès password must contain at least %1 lowercase letters common fr Le mot de passe doit contenir au moins %1 caractères minuscules password must contain at least %1 numbers common fr Le mot de passe doit contenir au moins %1 chiffres -password must contain at least %1 special charactars common fr Le mot de passe doit contenir au moins %1 caractères spéciaux +password must contain at least %1 special characters common fr Le mot de passe doit contenir au moins %1 caractères spéciaux password must contain at least %1 uppercase letters common fr Le mot de passe doit contenir au moins %1 caractères majuscules password must have at least %1 characters common fr Le mot de passe doit contenir au moins %1 caractères paste htmlarea-ContextMenu fr Coller diff --git a/phpgwapi/setup/phpgw_nl.lang b/phpgwapi/setup/phpgw_nl.lang index a1b30c3034..85b4e1693a 100644 --- a/phpgwapi/setup/phpgw_nl.lang +++ b/phpgwapi/setup/phpgw_nl.lang @@ -653,7 +653,7 @@ password could not be changed common nl Wachtwoord kon niet worden gewijzigd password has been updated common nl Wachtwoord is gewijzigd password must contain at least %1 lowercase letters common nl Wachtwoord moet minstens %1 kleine letters bevatten password must contain at least %1 numbers common nl Wachtwoord moet minstens %1 cijfers bevatten -password must contain at least %1 special charactars common nl Wachtwoord moet minstens %1 bijzondere tekens bevatten +password must contain at least %1 special characters common nl Wachtwoord moet minstens %1 bijzondere tekens bevatten password must contain at least %1 uppercase letters common nl Wachtwoord moet minstens %1 hoofdletters bevatten password must have at least %1 characters common nl Wachtwoord moet minstens %1 tekens bevatten paste htmlarea-ContextMenu nl Plakken diff --git a/phpgwapi/setup/phpgw_pt-br.lang b/phpgwapi/setup/phpgw_pt-br.lang index c94260c676..8c9e3824f2 100755 --- a/phpgwapi/setup/phpgw_pt-br.lang +++ b/phpgwapi/setup/phpgw_pt-br.lang @@ -653,7 +653,7 @@ password could not be changed common pt-br Senha n password has been updated common pt-br Senha foi alterada password must contain at least %1 lowercase letters common pt-br Senha deve ter ao menos %1 caractere(s) minúsculo(s) password must contain at least %1 numbers common pt-br Senha deve ter ao menos %1 número(s) -password must contain at least %1 special charactars common pt-br Senha deve ter ao menos %1 caractere(s) especial(is) +password must contain at least %1 special characters common pt-br Senha deve ter ao menos %1 caractere(s) especial(is) password must contain at least %1 uppercase letters common pt-br Senha deve ter ao menos %1 caractere(s) maiúsculo(s) password must have at least %1 characters common pt-br Senha deve ter ao menos %1 caractere(s) paste htmlarea-ContextMenu pt-br Colar