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

(-)a/C4/Auth.pm (-2 / +2 lines)
Lines 20-26 package C4::Auth; Link Here
20
use strict;
20
use strict;
21
use warnings;
21
use warnings;
22
use Digest::MD5 qw(md5_base64);
22
use Digest::MD5 qw(md5_base64);
23
use File::Spec;
24
use JSON qw/encode_json/;
23
use JSON qw/encode_json/;
25
use URI::Escape;
24
use URI::Escape;
26
use CGI::Session;
25
use CGI::Session;
Lines 31-36 use C4::Templates; # to get the template Link Here
31
use C4::Languages;
30
use C4::Languages;
32
use C4::Search::History;
31
use C4::Search::History;
33
use Koha;
32
use Koha;
33
use Koha::UploadedFile;
34
use Koha::Caches;
34
use Koha::Caches;
35
use Koha::AuthUtils qw(get_script_name hash_password);
35
use Koha::AuthUtils qw(get_script_name hash_password);
36
use Koha::Library::Groups;
36
use Koha::Library::Groups;
Lines 1745-1751 sub _get_session_params { Link Here
1745
    }
1745
    }
1746
    else {
1746
    else {
1747
        # catch all defaults to tmp should work on all systems
1747
        # catch all defaults to tmp should work on all systems
1748
        my $dir = File::Spec->tmpdir;
1748
        my $dir = Koha::UploadedFile->temporary_directory;
1749
        my $instance = C4::Context->config( 'database' ); #actually for packages not exactly the instance name, but generally safer to leave it as it is
1749
        my $instance = C4::Context->config( 'database' ); #actually for packages not exactly the instance name, but generally safer to leave it as it is
1750
        return { dsn => "driver:File;serializer:yaml;id:md5", dsn_args => { Directory => "$dir/cgisess_$instance" } };
1750
        return { dsn => "driver:File;serializer:yaml;id:md5", dsn_args => { Directory => "$dir/cgisess_$instance" } };
1751
    }
1751
    }
(-)a/C4/InstallAuth.pm (-2 / +4 lines)
Lines 20-33 package C4::InstallAuth; Link Here
20
use strict;
20
use strict;
21
#use warnings; FIXME - Bug 2505
21
#use warnings; FIXME - Bug 2505
22
use Digest::MD5 qw(md5_base64);
22
use Digest::MD5 qw(md5_base64);
23
use CGI::Session;
23
use File::Spec;
24
use File::Spec;
24
25
25
require Exporter;
26
require Exporter;
27
26
use C4::Context;
28
use C4::Context;
27
use C4::Output;
29
use C4::Output;
28
use C4::Templates;
30
use C4::Templates;
29
use C4::Koha;
31
use C4::Koha;
30
use CGI::Session;
32
use Koha::UploadedFile;
31
33
32
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
34
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
33
35
Lines 238-244 sub checkauth { Link Here
238
    my $dbh = C4::Context->dbh();
240
    my $dbh = C4::Context->dbh();
239
    my $template_name;
241
    my $template_name;
240
    $template_name = "installer/auth.tt";
242
    $template_name = "installer/auth.tt";
241
    my $sessdir = File::Spec->catdir( File::Spec->tmpdir, 'cgisess_' . C4::Context->config('database') ); # same construction as in C4/Auth
243
    my $sessdir = File::Spec->catdir( Koha::UploadedFile->temporary_directory, 'cgisess_' . C4::Context->config('database') ); # same construction as in C4/Auth
242
244
243
    # state variables
245
    # state variables
244
    my $loggedin = 0;
246
    my $loggedin = 0;
(-)a/Koha/Edifact/Transport.pm (-2 / +2 lines)
Lines 28-34 use Net::SFTP::Foreign; Link Here
28
use File::Slurp;
28
use File::Slurp;
29
use File::Copy;
29
use File::Copy;
30
use File::Basename qw( fileparse );
30
use File::Basename qw( fileparse );
31
use File::Spec;
31
use Koha::UploadedFile;
32
use Koha::Database;
32
use Koha::Database;
33
use Encode qw( from_to );
33
use Encode qw( from_to );
34
34
Lines 40-46 sub new { Link Here
40
    my $self     = {
40
    my $self     = {
41
        account     => $acct,
41
        account     => $acct,
42
        schema      => $schema,
42
        schema      => $schema,
43
        working_dir => File::Spec->tmpdir(),    #temporary work directory
43
        working_dir => Koha::UploadedFile->temporary_directory,    #temporary work directory
44
        transfer_date => DateTime->now( time_zone => 'local' ),
44
        transfer_date => DateTime->now( time_zone => 'local' ),
45
    };
45
    };
46
46
(-)a/misc/cronjobs/fines.pl (-1 / +2 lines)
Lines 38-43 use File::Spec; Link Here
38
38
39
use Koha::Calendar;
39
use Koha::Calendar;
40
use Koha::DateUtils;
40
use Koha::DateUtils;
41
use Koha::UploadedFile;
41
use C4::Log;
42
use C4::Log;
42
43
43
my $help;
44
my $help;
Lines 183-189 sub set_holiday { Link Here
183
sub get_filename {
184
sub get_filename {
184
    my $directory = shift;
185
    my $directory = shift;
185
    if ( !$directory ) {
186
    if ( !$directory ) {
186
        $directory = File::Spec->tmpdir();
187
        $directory = Koha::UploadedFile->temporary_directory;
187
    }
188
    }
188
    if ( !-d $directory ) {
189
    if ( !-d $directory ) {
189
        carp "Could not write to $directory ... does not exist!";
190
        carp "Could not write to $directory ... does not exist!";
(-)a/t/db_dependent/Plugins.t (-2 / +3 lines)
Lines 5-11 use Modern::Perl; Link Here
5
use Test::More tests => 35;
5
use Test::More tests => 35;
6
use CGI;
6
use CGI;
7
use File::Basename;
7
use File::Basename;
8
use File::Spec;
9
use File::Temp qw( tempdir tempfile );
8
use File::Temp qw( tempdir tempfile );
10
use FindBin qw($Bin);
9
use FindBin qw($Bin);
11
use Archive::Extract;
10
use Archive::Extract;
Lines 13-18 use Module::Load::Conditional qw(can_load); Link Here
13
use Test::MockModule;
12
use Test::MockModule;
14
13
15
use C4::Context;
14
use C4::Context;
15
use Koha::UploadedFile;
16
16
use t::lib::Mocks;
17
use t::lib::Mocks;
17
18
18
BEGIN {
19
BEGIN {
Lines 62-68 is( $plugin->get_plugin_http_path(), '/plugin/Koha/Plugin/Test', 'Test $plugin-> Link Here
62
# test absolute path change in get_template with Koha::Plugin::Test
63
# test absolute path change in get_template with Koha::Plugin::Test
63
# using the mock set before
64
# using the mock set before
64
# we also add tmpdir as an approved template dir
65
# we also add tmpdir as an approved template dir
65
t::lib::Mocks::mock_config( 'pluginsdir', [ File::Spec->tmpdir ] );
66
t::lib::Mocks::mock_config( 'pluginsdir', [ Koha::UploadedFile->temporary_directory ] );
66
my ( $fh, $fn ) = tempfile( SUFFIX => '.tt', UNLINK => 1 );
67
my ( $fh, $fn ) = tempfile( SUFFIX => '.tt', UNLINK => 1 );
67
print $fh 'I am [% filename %]';
68
print $fh 'I am [% filename %]';
68
close $fh;
69
close $fh;
(-)a/t/db_dependent/Sitemapper.t (-1 / +3 lines)
Lines 26-31 use Test::More tests => 16; Link Here
26
use Koha::Schema;
26
use Koha::Schema;
27
use Carp qw/croak carp/;
27
use Carp qw/croak carp/;
28
28
29
use Koha::UploadedFile;
30
29
BEGIN {
31
BEGIN {
30
    use_ok('Koha::Sitemapper');
32
    use_ok('Koha::Sitemapper');
31
    use_ok('Koha::Sitemapper::Writer');
33
    use_ok('Koha::Sitemapper::Writer');
Lines 62-68 $db->mock( Link Here
62
    _new_schema => sub { return Schema(); }
64
    _new_schema => sub { return Schema(); }
63
);
65
);
64
66
65
my $dir = File::Spec->tmpdir();
67
my $dir = Koha::UploadedFile->temporary_directory;
66
68
67
my $data = [
69
my $data = [
68
    [qw/ 1         2013-11-15 2013-11-15/],
70
    [qw/ 1         2013-11-15 2013-11-15/],
(-)a/t/db_dependent/Templates.t (-4 / +2 lines)
Lines 23-29 use Test::More tests => 8; Link Here
23
use Test::Deep;
23
use Test::Deep;
24
use Test::MockModule;
24
use Test::MockModule;
25
use Test::Warn;
25
use Test::Warn;
26
use File::Spec;
27
use File::Temp qw/tempfile/;
26
use File::Temp qw/tempfile/;
28
27
29
use t::lib::Mocks;
28
use t::lib::Mocks;
Lines 127-135 subtest "Absolute path change in _get_template_file" => sub { Link Here
127
    # We create a simple template in /tmp.
126
    # We create a simple template in /tmp.
128
    # We simulate an anonymous OPAC session; the OPACBaseURL template variable
127
    # We simulate an anonymous OPAC session; the OPACBaseURL template variable
129
    # should be filled by get_template_and_user.
128
    # should be filled by get_template_and_user.
130
    t::lib::Mocks::mock_config( 'pluginsdir', [ File::Spec->tmpdir ] );
129
    t::lib::Mocks::mock_config( 'pluginsdir', [ Koha::UploadedFile->temporary_directory ] );
131
    t::lib::Mocks::mock_preference( 'OPACBaseURL', 'without any doubt' );
130
    t::lib::Mocks::mock_preference( 'OPACBaseURL', 'without any doubt' );
132
    my ( $fh, $fn ) = tempfile( SUFFIX => '.tt', UNLINK => 1 );
131
    my ( $fh, $fn ) = tempfile( SUFFIX => '.tt', UNLINK => 1, DIR => Koha::UploadedFile->temporary_directory );
133
    print $fh q|I am a [% quality %] template [% OPACBaseURL %]|;
132
    print $fh q|I am a [% quality %] template [% OPACBaseURL %]|;
134
    close $fh;
133
    close $fh;
135
    my ( $template, $login, $cookie ) = C4::Auth::get_template_and_user({
134
    my ( $template, $login, $cookie ) = C4::Auth::get_template_and_user({
136
- 

Return to bug 20727