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

(-)a/Koha/Edifact/Transport.pm (-6 / +5 lines)
Lines 230-243 sub ftp_download { Link Here
230
        )
230
        )
231
        or return $self->_abort_download(
231
        or return $self->_abort_download(
232
        undef,
232
        undef,
233
        "Cannot connect to $self->{account}->host: $EVAL_ERROR"
233
        "Cannot connect to " . $self->{account}->host . ": $EVAL_ERROR"
234
        );
234
        );
235
    $ftp->login( $self->{account}->username, Koha::Encryption->new->decrypt_hex( $self->{account}->password ) )
235
    $ftp->login( $self->{account}->username, Koha::Encryption->new->decrypt_hex( $self->{account}->password ) )
236
        or return $self->_abort_download( $ftp, "Cannot login: $ftp->message()" );
236
        or return $self->_abort_download( $ftp, "Cannot login: $ftp->message()" );
237
    $ftp->cwd( $self->{account}->download_directory )
237
    $ftp->cwd( $self->{account}->download_directory )
238
        or return $self->_abort_download(
238
        or return $self->_abort_download(
239
        $ftp,
239
        $ftp,
240
        "Cannot change remote dir : $ftp->message()"
240
        "Cannot change remote dir : " . $ftp->message()
241
        );
241
        );
242
    my $file_list = $ftp->ls()
242
    my $file_list = $ftp->ls()
243
        or return $self->_abort_download( $ftp, 'cannot get file list from server' );
243
        or return $self->_abort_download( $ftp, 'cannot get file list from server' );
Lines 278-291 sub ftp_upload { Link Here
278
        )
278
        )
279
        or return $self->_abort_download(
279
        or return $self->_abort_download(
280
        undef,
280
        undef,
281
        "Cannot connect to $self->{account}->host: $EVAL_ERROR"
281
        "Cannot connect to " . $self->{account}->host . ": $EVAL_ERROR"
282
        );
282
        );
283
    $ftp->login( $self->{account}->username, Koha::Encryption->new->decrypt_hex( $self->{account}->password ) )
283
    $ftp->login( $self->{account}->username, Koha::Encryption->new->decrypt_hex( $self->{account}->password ) )
284
        or return $self->_abort_download( $ftp, "Cannot login: $ftp->message()" );
284
        or return $self->_abort_download( $ftp, "Cannot login: $ftp->message()" );
285
    $ftp->cwd( $self->{account}->upload_directory )
285
    $ftp->cwd( $self->{account}->upload_directory )
286
        or return $self->_abort_download(
286
        or return $self->_abort_download(
287
        $ftp,
287
        $ftp,
288
        "Cannot change remote dir : $ftp->message()"
288
        "Cannot change remote dir : " . $ftp->message()
289
        );
289
        );
290
    foreach my $m (@messages) {
290
    foreach my $m (@messages) {
291
        my $content = $m->raw_msg;
291
        my $content = $m->raw_msg;
Lines 318-324 sub sftp_upload { Link Here
318
        port     => $port,
318
        port     => $port,
319
        timeout  => 10,
319
        timeout  => 10,
320
    );
320
    );
321
    $sftp->die_on_error("Cannot ssh to $self->{account}->host");
321
    $sftp->die_on_error( "Cannot ssh to " . $self->{account}->host );
322
    $sftp->setcwd( $self->{account}->upload_directory )
322
    $sftp->setcwd( $self->{account}->upload_directory )
323
        or return $self->_abort_download(
323
        or return $self->_abort_download(
324
        $sftp,
324
        $sftp,
325
- 

Return to bug 39904