From 4c597ca7aac7615482ddd7a0e02eb4342f416161 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Tue, 16 Jan 2018 15:26:04 +0100 Subject: [PATCH] Revert "Bug 19514: Add client-side check" This reverts commit f74fc96595b2e98cbfdb9a93312e9aa4e3a1b38e. --- C4/InstallAuth.pm | 4 ---- .../en/modules/onboarding/onboardingstep3.tt | 3 --- koha-tmpl/intranet-tmpl/prog/js/onboarding.js | 18 ------------------ 3 files changed, 25 deletions(-) diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm index 6204f11405..9c6795f829 100644 --- a/C4/InstallAuth.pm +++ b/C4/InstallAuth.pm @@ -149,10 +149,6 @@ sub get_template_and_user { $template->param( CAN_user_serials => 1 ); $template->param( CAN_user_reports => 1 ); } - - my $minPasswordLength = C4::Context->preference('minPasswordLength'); - $minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3; - $template->param(minPasswordLength => $minPasswordLength,); } return ( $template, $borrowernumber, $cookie ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt index a812b089b5..67a8c9b13a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt @@ -1,4 +1,3 @@ -[% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] Koha › Web installer › Create Koha administrator patron [% INCLUDE 'installer-doc-head-close.inc' %] @@ -113,5 +112,3 @@ [% INCLUDE 'intranet-bottom.inc' %] -[% PROCESS 'password_check.inc' %] -[% PROCESS 'add_password_check' new_password => 'password' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/onboarding.js b/koha-tmpl/intranet-tmpl/prog/js/onboarding.js index 93cb010b0c..4816dfdfd7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/onboarding.js +++ b/koha-tmpl/intranet-tmpl/prog/js/onboarding.js @@ -1,17 +1,5 @@ function _(s) { return s; } // dummy function for gettext -// http://stackoverflow.com/questions/1038746/equivalent-of-string-format-in-jquery/5341855#5341855 -String.prototype.format = function() { return formatstr(this, arguments); }; -function formatstr(str, col) { - col = typeof col === 'object' ? col : Array.prototype.slice.call(arguments, 1); - var idx = 0; - return str.replace(/%%|%s|%(\d+)\$s/g, function (m, n) { - if (m == "%%") { return "%"; } - if (m == "%s") { return col[idx++]; } - return col[n]; - }); -} - jQuery.validator.addMethod( "category_code_check", function(value,element){ var patt = /^[A-Za-z0-9]{0,10}$/g; if (patt.test(element.value)) { @@ -126,12 +114,6 @@ $(document).ready(function() { required: true }, password: { - required: true, - password_strong: true, - password_no_spaces: true - }, - password2: { - required: true, password_match: true } }, -- 2.39.5