Skip to content

Commit cec0ff1

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents 1a83392 + 8729016 commit cec0ff1

27 files changed

+251
-49
lines changed

‎interface/lib/classes/aps_guicontroller.inc.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,16 @@ public function validateInstallerInput($postinput, $pkg_details, $domains, $sett
567567
}
568568
else $error[] = $app->lng('error_main_domain');
569569

570+
if(isset($postinput['admin_password']))
571+
{
572+
$app->uses('validate_password');
573+
574+
$passwordError = $app->validate_password->password_check('', $postinput['admin_password'], '');
575+
if ($passwordError) {
576+
$error[] = $passwordError;
577+
}
578+
}
579+
570580
// Main location (not obligatory but must be supplied)
571581
if(isset($postinput['main_location']))
572582
{

‎interface/web/sites/lib/lang/ar_aps.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
5555
$wb['btn_install_txt'] = 'Install';
5656
$wb['btn_cancel_txt'] = 'Cancel';
5757
$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
58+
$wb['generate_password_txt'] = 'Generate Password';
59+
$wb['repeat_password_txt'] = 'Repeat Password';
60+
$wb['password_mismatch_txt'] = 'The passwords do not match.';
61+
$wb['password_match_txt'] = 'The passwords do match.';
62+
$wb['password_strength_txt'] = 'Password strength';
5863
?>

‎interface/web/sites/lib/lang/bg_aps.lng‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
5555
$wb['btn_install_txt'] = 'Install';
5656
$wb['btn_cancel_txt'] = 'Cancel';
5757
$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
58-
?>
58+
$wb['generate_password_txt'] = 'Generate Password';
59+
$wb['repeat_password_txt'] = 'Repeat Password';
60+
$wb['password_mismatch_txt'] = 'The passwords do not match.';
61+
$wb['password_match_txt'] = 'The passwords do match.';
62+
$wb['password_strength_txt'] = 'Сила на паролата';
63+
?>

‎interface/web/sites/lib/lang/br_aps.lng‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'Atualização da lista de pacotes fina
5555
$wb['btn_install_txt'] = 'Instalar';
5656
$wb['btn_cancel_txt'] = 'Cancelar';
5757
$wb['limit_aps_txt'] = 'O limite de instâncias de apps para esta conta foi alcançado.';
58-
?>
58+
$wb['generate_password_txt'] = 'Gerar senha';
59+
$wb['repeat_password_txt'] = 'Repetir senha';
60+
$wb['password_mismatch_txt'] = 'A senhas não coincidem.';
61+
$wb['password_match_txt'] = 'A senhas coincidem.';
62+
$wb['password_strength_txt'] = 'Dificuldade da senha';
63+
?>

‎interface/web/sites/lib/lang/ca_aps.lng‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'Mise à jour APS Packagelist terminée
5555
$wb['btn_install_txt'] = 'Installer';
5656
$wb['btn_cancel_txt'] = 'Annuler';
5757
$wb['limit_aps_txt'] = 'Le nombre max d\'instances APS pour votre compte a été atteint.';
58-
?>
58+
$wb['generate_password_txt'] = 'Générer un mot de passe';
59+
$wb['repeat_password_txt'] = 'Vérification du mot de passe';
60+
$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
61+
$wb['password_match_txt'] = 'Les mots de passe correspondent.';
62+
$wb['password_strength_txt'] = 'Force du mot de passe';
63+
?>

‎interface/web/sites/lib/lang/cz_aps.lng‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS aktualizace seznamu balíčků byl
5555
$wb['btn_install_txt'] = 'Instalovat';
5656
$wb['btn_cancel_txt'] = 'Zrušit';
5757
$wb['limit_aps_txt'] = 'Max. počet APS instancí u vašeho účtu je dosaženo.';
58-
?>
58+
$wb['generate_password_txt'] = 'Generovat heslo';
59+
$wb['repeat_password_txt'] = 'Opakujte heslo';
60+
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
61+
$wb['password_match_txt'] = 'Hesla se shodují.';
62+
$wb['password_strength_txt'] = 'Bezpečnost hesla';
63+
?>

‎interface/web/sites/lib/lang/de_aps.lng‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ $wb['installation_success_txt'] = 'Installiert';
5555
$wb['installation_remove_txt'] = 'Deinstallation vorgemerkt';
5656
$wb['packagelist_update_finished_txt'] = 'APS Paketlistenupdate beendet.';
5757
$wb['limit_aps_txt'] = 'Die maximale Anzahl an APS-Instanzen für Ihr Konto wurde erreicht.';
58-
?>
58+
$wb['generate_password_txt'] = 'Passwort erzeugen';
59+
$wb['repeat_password_txt'] = 'Passwort wiederholen';
60+
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
61+
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
62+
$wb['password_strength_txt'] = 'Passwortkomplexität';
63+
?>

‎interface/web/sites/lib/lang/dk_aps.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ $wb['installation_success_txt'] = 'Installeret';
5555
$wb['installation_remove_txt'] = 'Fjernelse planlagt';
5656
$wb['packagelist_update_finished_txt'] = 'APS Pakke Liste opdatering er færdig.';
5757
$wb['limit_aps_txt'] = 'Max. antal af APS forekomster for din konto er nået.';
58+
$wb['generate_password_txt'] = 'Generer Adgangskode';
59+
$wb['repeat_password_txt'] = 'Gentage Adgangskode';
60+
$wb['password_mismatch_txt'] = 'Adgangskoderne stemmer ikke overens.';
61+
$wb['password_match_txt'] = 'Adgangskoderne stemmer overens.';
62+
$wb['password_strength_txt'] = 'Adgangskode styrke';
5863
?>

‎interface/web/sites/lib/lang/el_aps.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
5555
$wb['btn_install_txt'] = 'Install';
5656
$wb['btn_cancel_txt'] = 'Cancel';
5757
$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
58+
$wb['generate_password_txt'] = 'Generate Password';
59+
$wb['repeat_password_txt'] = 'Repeat Password';
60+
$wb['password_mismatch_txt'] = 'The passwords do not match.';
61+
$wb['password_match_txt'] = 'The passwords do match.';
62+
$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
5863
?>

‎interface/web/sites/lib/lang/en_aps.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ $wb['installation_success_txt'] = 'Installed';
5555
$wb['installation_remove_txt'] = 'Removal planned';
5656
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
5757
$wb["limit_aps_txt"] = 'The max. number of APS instances for your account is reached.';
58+
$wb["generate_password_txt"] = 'Generate Password';
59+
$wb["repeat_password_txt"] = 'Repeat Password';
60+
$wb["password_mismatch_txt"] = 'The passwords do not match.';
61+
$wb["password_match_txt"] = 'The passwords do match.';
62+
$wb["password_strength_txt"] = "Password strength";
5863
?>

0 commit comments

Comments
 (0)