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

(-)a/admin/sftp_servers.pl (-18 / +10 lines)
Lines 27-32 use C4::Auth qw( get_template_and_user ); Link Here
27
use C4::Output qw( output_html_with_http_headers );
27
use C4::Output qw( output_html_with_http_headers );
28
28
29
use Koha::SFTP::Servers;
29
use Koha::SFTP::Servers;
30
use Koha::File::Transports;
30
31
31
my $input = CGI->new;
32
my $input = CGI->new;
32
my $op    = $input->param('op') || 'list';
33
my $op    = $input->param('op') || 'list';
Lines 42-48 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
42
43
43
my @messages;
44
my @messages;
44
45
45
my $sftp_servers = Koha::SFTP::Servers->search;
46
my $sftp_servers = Koha::File::Transports->search;
46
47
47
if ( $op eq 'cud-add' ) {
48
if ( $op eq 'cud-add' ) {
48
    my $name               = $input->param('sftp_name');
49
    my $name               = $input->param('sftp_name');
Lines 60-66 if ( $op eq 'cud-add' ) { Link Here
60
    my $debug              = ( scalar $input->param('sftp_debug_mode') ) ? 1 : 0;
61
    my $debug              = ( scalar $input->param('sftp_debug_mode') ) ? 1 : 0;
61
62
62
    try {
63
    try {
63
        my $sftp_server = Koha::SFTP::Server->new(
64
        my $sftp_server = Koha::File::Transport->new(
64
            {
65
            {
65
                name               => $name,
66
                name               => $name,
66
                host               => $host,
67
                host               => $host,
Lines 69-74 if ( $op eq 'cud-add' ) { Link Here
69
                passive            => $passive,
70
                passive            => $passive,
70
                auth_mode          => $auth_mode,
71
                auth_mode          => $auth_mode,
71
                user_name          => $user_name,
72
                user_name          => $user_name,
73
                password           => $password,
74
                key_file           => $key_file,
72
                download_directory => $download_directory,
75
                download_directory => $download_directory,
73
                upload_directory   => $upload_directory,
76
                upload_directory   => $upload_directory,
74
                status             => $status,
77
                status             => $status,
Lines 76-87 if ( $op eq 'cud-add' ) { Link Here
76
            }
79
            }
77
        )->store;
80
        )->store;
78
81
79
        $sftp_server->update_password($password)
80
            if ($password);
81
82
        $sftp_server->update_key_file($key_file)
83
            if ($key_file);
84
85
        push @messages, {
82
        push @messages, {
86
            type => 'message',
83
            type => 'message',
87
            code => 'success_on_insert'
84
            code => 'success_on_insert'
Lines 105-111 if ( $op eq 'cud-add' ) { Link Here
105
    my $sftp_server_plain_text_password;
102
    my $sftp_server_plain_text_password;
106
    my $sftp_server_plain_text_key;
103
    my $sftp_server_plain_text_key;
107
104
108
    $sftp_server = Koha::SFTP::Servers->find($sftp_server_id)
105
    $sftp_server = Koha::File::Transports->find($sftp_server_id)
109
        unless !$sftp_server_id;
106
        unless !$sftp_server_id;
110
107
111
    unless ( !$sftp_server ) {
108
    unless ( !$sftp_server ) {
Lines 132-138 if ( $op eq 'cud-add' ) { Link Here
132
    my $sftp_server_plain_text_password;
129
    my $sftp_server_plain_text_password;
133
    my $sftp_server;
130
    my $sftp_server;
134
131
135
    $sftp_server = Koha::SFTP::Servers->find($sftp_server_id)
132
    $sftp_server = Koha::File::Transports->find($sftp_server_id)
136
        unless !$sftp_server_id;
133
        unless !$sftp_server_id;
137
134
138
    $sftp_server_plain_text_password = $sftp_server->plain_text_password
135
    $sftp_server_plain_text_password = $sftp_server->plain_text_password
Lines 163-168 if ( $op eq 'cud-add' ) { Link Here
163
                    passive            => $passive,
160
                    passive            => $passive,
164
                    auth_mode          => $auth_mode,
161
                    auth_mode          => $auth_mode,
165
                    user_name          => $user_name,
162
                    user_name          => $user_name,
163
                    password           => $password,
164
                    key_file           => $key_file,
166
                    download_directory => $download_directory,
165
                    download_directory => $download_directory,
167
                    upload_directory   => $upload_directory,
166
                    upload_directory   => $upload_directory,
168
                    status             => $status,
167
                    status             => $status,
Lines 170-181 if ( $op eq 'cud-add' ) { Link Here
170
                }
169
                }
171
            )->store;
170
            )->store;
172
171
173
            $sftp_server->update_password($password)
174
                if ($password);
175
176
            $sftp_server->update_key_file($key_file)
177
                if ($key_file);
178
179
            push @messages, {
172
            push @messages, {
180
                type => 'message',
173
                type => 'message',
181
                code => 'success_on_update'
174
                code => 'success_on_update'
Lines 204-210 if ( $op eq 'cud-add' ) { Link Here
204
    my $sftp_server_id = $input->param('sftp_server_id');
197
    my $sftp_server_id = $input->param('sftp_server_id');
205
    my $sftp_server;
198
    my $sftp_server;
206
199
207
    $sftp_server = Koha::SFTP::Servers->find($sftp_server_id)
200
    $sftp_server = Koha::File::Transports->find($sftp_server_id)
208
        unless !$sftp_server_id;
201
        unless !$sftp_server_id;
209
202
210
    if ($sftp_server) {
203
    if ($sftp_server) {
211
- 

Return to bug 39190