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

(-)a/Koha/Patron.pm (-1 lines)
Lines 226-232 sub store { Link Here
226
226
227
                # Make a copy of the plain text password for later use
227
                # Make a copy of the plain text password for later use
228
                $self->plain_text_password( $self->password );
228
                $self->plain_text_password( $self->password );
229
230
                # Create a disabled account if no password provided
229
                # Create a disabled account if no password provided
231
                $self->password( $self->password
230
                $self->password( $self->password
232
                    ? Koha::AuthUtils::hash_password( $self->password )
231
                    ? Koha::AuthUtils::hash_password( $self->password )
(-)a/Koha/Patrons/Import.pm (-2 / +6 lines)
Lines 72-77 sub import_patrons { Link Here
72
    my $defaults             = $params->{defaults};
72
    my $defaults             = $params->{defaults};
73
    my $ext_preserve         = $params->{preserve_extended_attributes};
73
    my $ext_preserve         = $params->{preserve_extended_attributes};
74
    my $overwrite_cardnumber = $params->{overwrite_cardnumber};
74
    my $overwrite_cardnumber = $params->{overwrite_cardnumber};
75
    my $overwrite_passwords  = $params->{overwrite_passwords};
75
    my $extended             = C4::Context->preference('ExtendedPatronAttributes');
76
    my $extended             = C4::Context->preference('ExtendedPatronAttributes');
76
    my $set_messaging_prefs  = C4::Context->preference('EnhancedMessagingPreferences');
77
    my $set_messaging_prefs  = C4::Context->preference('EnhancedMessagingPreferences');
77
78
Lines 241-248 sub import_patrons { Link Here
241
                # use values from extant patron unless our csv file includes this column or we provided a default.
242
                # use values from extant patron unless our csv file includes this column or we provided a default.
242
                # FIXME : You cannot update a field with a  perl-evaluated false value using the defaults.
243
                # FIXME : You cannot update a field with a  perl-evaluated false value using the defaults.
243
244
244
                # The password is always encrypted, skip it!
245
                # The password is always encrypted, skip it unless we are forcing overwrite!
245
                next if $col eq 'password';
246
                next if $col eq 'password' && !$overwrite_passwords;
246
247
247
                unless ( exists( $csvkeycol{$col} ) || $defaults->{$col} ) {
248
                unless ( exists( $csvkeycol{$col} ) || $defaults->{$col} ) {
248
                    $borrower{$col} = $member->{$col} if ( $member->{$col} );
249
                    $borrower{$col} = $member->{$col} if ( $member->{$col} );
Lines 287-292 sub import_patrons { Link Here
287
                    );
288
                    );
288
                }
289
                }
289
            }
290
            }
291
            if ($overwrite_passwords){
292
                $patron->set_password({ password => $borrower{password} });
293
            }
290
            if ($extended) {
294
            if ($extended) {
291
                if ($ext_preserve) {
295
                if ($ext_preserve) {
292
                    my $old_attributes = GetBorrowerAttributes($borrowernumber);
296
                    my $old_attributes = GetBorrowerAttributes($borrowernumber);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt (-1 / +14 lines)
Lines 220-225 Link Here
220
220
221
                <li class="radio">
221
                <li class="radio">
222
                    <input type="radio" id="overwrite_cardnumberyes" name="overwrite_cardnumber" value="1" /><label for="overwrite_cardnumberyes">Overwrite the existing one with this</label>
222
                    <input type="radio" id="overwrite_cardnumberyes" name="overwrite_cardnumber" value="1" /><label for="overwrite_cardnumberyes">Overwrite the existing one with this</label>
223
                    <ul>
224
                        <li>
225
                            <input type="checkbox" id="overwrite_passwords" name="overwrite_passwords" disabled="true"/>
226
                            <label for="overwrite_passwords">Replace patron passwords with those in the file</label>
227
                        </li
228
                    </ul>
223
                </li>
229
                </li>
224
            </ol>
230
            </ol>
225
        </fieldset>
231
        </fieldset>
Lines 276-282 Link Here
276
        </li>
282
        </li>
277
283
278
        <li>
284
        <li>
279
            'password' should be stored in plaintext, and will be converted to a Bcrypt hash (if your passwords are already encrypted, talk to your system administrator about options).
285
            'password' should be stored in plaintext, and will be converted to a Bcrypt hash (if your passwords are already encrypted, talk to your system administrator about options). Passwords will not be updated on overwrite unless replace passwords option is checked.
280
        </li>
286
        </li>
281
287
282
        <li>
288
        <li>
Lines 313-318 you can supply dates in ISO format (e.g., '2010-10-28'). Link Here
313
                $(".expand_defaults").toggle();
319
                $(".expand_defaults").toggle();
314
            });
320
            });
315
        });
321
        });
322
323
        $("#overwrite_cardnumberno").click(function(){
324
            $("#overwrite_passwords").prop('checked',false).prop('disabled',true);
325
        });
326
        $("#overwrite_cardnumberyes").click(function(){
327
            $("#overwrite_passwords").prop('disabled',false);
328
        });
316
    </script>
329
    </script>
317
[% END %]
330
[% END %]
318
[% INCLUDE 'intranet-bottom.inc' %]
331
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/misc/import_patrons.pl (+3 lines)
Lines 29-34 my $Import = Koha::Patrons::Import->new(); Link Here
29
my $csv_file;
29
my $csv_file;
30
my $matchpoint;
30
my $matchpoint;
31
my $overwrite_cardnumber;
31
my $overwrite_cardnumber;
32
my $overwrite_passwords;
32
my %defaults;
33
my %defaults;
33
my $ext_preserve = 0;
34
my $ext_preserve = 0;
34
my $confirm;
35
my $confirm;
Lines 41-46 GetOptions( Link Here
41
    'm|matchpoint=s'                => \$matchpoint,
42
    'm|matchpoint=s'                => \$matchpoint,
42
    'd|default=s'                   => \%defaults,
43
    'd|default=s'                   => \%defaults,
43
    'o|overwrite'                   => \$overwrite_cardnumber,
44
    'o|overwrite'                   => \$overwrite_cardnumber,
45
    'op|overwrite_passwords'        => \$overwrite_passwords,
44
    'p|preserve-extended-attributes' => \$ext_preserve,
46
    'p|preserve-extended-attributes' => \$ext_preserve,
45
    'v|verbose+'                    => \$verbose,
47
    'v|verbose+'                    => \$verbose,
46
    'h|help|?'                      => \$help,
48
    'h|help|?'                      => \$help,
Lines 61-66 my $return = $Import->import_patrons( Link Here
61
        defaults                     => \%defaults,
63
        defaults                     => \%defaults,
62
        matchpoint                   => $matchpoint,
64
        matchpoint                   => $matchpoint,
63
        overwrite_cardnumber         => $overwrite_cardnumber,
65
        overwrite_cardnumber         => $overwrite_cardnumber,
66
        overwrite_passwords          => $overwrite_passwords,
64
        preserve_extended_attributes => $ext_preserve,
67
        preserve_extended_attributes => $ext_preserve,
65
    }
68
    }
66
);
69
);
(-)a/t/db_dependent/Koha/Patrons/Import.t (-1 / +40 lines)
Lines 18-24 Link Here
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
use Test::More tests => 157;
21
use Test::More tests => 158;
22
use Test::Warn;
22
use Test::Warn;
23
23
24
# To be replaced by t::lib::Mock
24
# To be replaced by t::lib::Mock
Lines 428-433 subtest 'test_import_with_cardnumber_0' => sub { Link Here
428
428
429
};
429
};
430
430
431
subtest 'test_import_with_password_overwrite' => sub {
432
    plan tests => 4;
433
434
    #Remove possible existing user to avoid clashes
435
    my $ernest = Koha::Patrons->find({ userid => 'ErnestP' });
436
    $ernest->delete if $ernest;
437
438
    #Setup our info
439
    my $branchcode = $builder->build({ source => "Branch"})->{branchcode};
440
    my $categorycode = $builder->build({ source => "Category"})->{categorycode};
441
    my $csv_headers  = 'surname,userid,branchcode,categorycode,password';
442
    my $csv_password = "Worrell,ErnestP,$branchcode,$categorycode,Ernest";
443
    my $csv_password_change = "Worrell,ErnestP,$branchcode,$categorycode,Vern";
444
    my $defaults = { cardnumber => "" }; #currently all the defaults come as "" if not filled
445
446
    #Make the test files for importing
447
    my $filename_1 = make_csv($temp_dir, $csv_headers, $csv_password);
448
    open(my $handle_1, "<", $filename_1) or die "cannot open < $filename_1: $!";
449
    my $params_1 = { file => $handle_1, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1};
450
    my $filename_2 = make_csv($temp_dir, $csv_headers, $csv_password_change);
451
    open(my $handle_2, "<", $filename_2) or die "cannot open < $filename_2: $!";
452
    my $params_2 = { file => $handle_2, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1};
453
454
455
    my $result = $patrons_import->import_patrons($params_1, $defaults);
456
    like($result->{feedback}->[1]->{value}, qr/^Worrell \/ \d+/, 'First borrower imported as expected');
457
    $ernest = Koha::Patrons->find({ userid => 'ErnestP' });
458
    isnt($ernest->password,'Ernest',"New patron is imported, password is encrypted");
459
460
    #Save info to double check
461
    my $orig_pass = $ernest->password;
462
463
    $result = $patrons_import->import_patrons($params_2, $defaults);
464
    $ernest = Koha::Patrons->find({ userid => 'ErnestP' });
465
    isnt($ernest->password,$orig_pass,"New patron is overwritten, password is overwritten");
466
    isnt($ernest->password,'Vern',"Password is overwritten and is encrypted from value provided");
467
468
};
469
431
470
432
subtest 'test_prepare_columns' => sub {
471
subtest 'test_prepare_columns' => sub {
433
    plan tests => 16;
472
    plan tests => 16;
(-)a/tools/import_borrowers.pl (-1 / +1 lines)
Lines 127-132 if ( $uploadborrowers && length($uploadborrowers) > 0 ) { Link Here
127
            defaults                     => \%defaults,
127
            defaults                     => \%defaults,
128
            matchpoint                   => $matchpoint,
128
            matchpoint                   => $matchpoint,
129
            overwrite_cardnumber         => $input->param('overwrite_cardnumber'),
129
            overwrite_cardnumber         => $input->param('overwrite_cardnumber'),
130
            overwrite_passwords          => $input->param('overwrite_passwords'),
130
            preserve_extended_attributes => $input->param('ext_preserve') || 0,
131
            preserve_extended_attributes => $input->param('ext_preserve') || 0,
131
        }
132
        }
132
    );
133
    );
133
- 

Return to bug 23473