View | Details | Raw Unified | Return to bug 18298
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-5 / +5 lines)
Lines 9-15 Link Here
9
    function generate_password() {
9
    function generate_password() {
10
        // Always generate a strong password
10
        // Always generate a strong password
11
        var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
11
        var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
12
        var length = [% minPasswordLength %];
12
        var length = [% Koha.Preference('minPasswordLength') %];
13
        if ( length < 8 ) length = 8;
13
        if ( length < 8 ) length = 8;
14
        var password='';
14
        var password='';
15
        for ( var i = 0 ; i < length ; i++){
15
        for ( var i = 0 ; i < length ; i++){
Lines 21-27 Link Here
21
        $("body").on('click', "#fillrandom",function(e) {
21
        $("body").on('click', "#fillrandom",function(e) {
22
            e.preventDefault();
22
            e.preventDefault();
23
            var password = '';
23
            var password = '';
24
            var pattern_regex = /(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{[% minPasswordLength %],}/;
24
            var pattern_regex = /(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{[% Koha.Preference('minPasswordLength') %],}/;
25
            while ( ! pattern_regex.test( password ) ) {
25
            while ( ! pattern_regex.test( password ) ) {
26
                password = generate_password();
26
                password = generate_password();
27
            }
27
            }
Lines 94-100 Link Here
94
        <li>You have entered a username that already exists. Please choose another one.</li>
94
        <li>You have entered a username that already exists. Please choose another one.</li>
95
		[% END %]
95
		[% END %]
96
        [% IF ( ERROR_password_too_short ) %]
96
        [% IF ( ERROR_password_too_short ) %]
97
            <li id="ERROR_short_password">Password must be at least [% minPasswordLength %] characters long.</li>
97
            <li id="ERROR_short_password">Password must be at least [% Koha.Preference('minPasswordLength') %] characters long.</li>
98
        [% END %]
98
        [% END %]
99
        [% IF ( ERROR_password_too_weak ) %]
99
        [% IF ( ERROR_password_too_weak ) %]
100
            <li id="ERROR_weak_password">Password must contain at least one digit, one lowercase and one uppercase.</li>
100
            <li id="ERROR_weak_password">Password must contain at least one digit, one lowercase and one uppercase.</li>
Lines 117-125 Link Here
117
	<ol>
117
	<ol>
118
    <li><label for="newuserid">New username:</label>
118
    <li><label for="newuserid">New username:</label>
119
	<input type="hidden" name="member" value="[% borrowernumber %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% userid %]" /></li>
119
	<input type="hidden" name="member" value="[% borrowernumber %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% userid %]" /></li>
120
    [% SET password_pattern = ".{" _ minPasswordLength _ ",}" %]
120
    [% SET password_pattern = ".{" _ Koha.Preference('minPasswordLength') _ ",}" %]
121
    [% IF Koha.Preference('RequireStrongPassword') %]
121
    [% IF Koha.Preference('RequireStrongPassword') %]
122
        [% SET password_pattern = '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{' _ minPasswordLength _ ',}' %]
122
        [% SET password_pattern = '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{' _ Koha.Preference('minPasswordLength') _ ',}' %]
123
    [% END %]
123
    [% END %]
124
    <li>
124
    <li>
125
        <label for="newpassword">New password:</label>
125
        <label for="newpassword">New password:</label>
(-)a/members/member-password.pl (-2 lines)
Lines 145-151 $template->param( Link Here
145
    userid                     => $bor->{'userid'},
145
    userid                     => $bor->{'userid'},
146
    destination                => $destination,
146
    destination                => $destination,
147
    is_child                   => ( $category_type eq 'C' ),
147
    is_child                   => ( $category_type eq 'C' ),
148
    minPasswordLength          => $minpw,
149
    RoutingSerials             => C4::Context->preference('RoutingSerials'),
148
    RoutingSerials             => C4::Context->preference('RoutingSerials'),
150
    csrf_token                 => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID'), }),
149
    csrf_token                 => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID'), }),
151
);
150
);
152
- 

Return to bug 18298