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

(-)a/C4/Auth.pm (-29 / +5 lines)
Lines 1-31 Link Here
1
package CGI::Session::Serialize::yamlxs;
2
# Proof of concept: CGI::Session::Serialize::yamlxs for CGI::Session:
3
4
use strict;
5
use warnings;
6
7
# hacky hack to trick CGI::Session loader for serializers not to die in its "require":
8
$INC{'CGI/Session/Serialize/yamlxs.pm'} = '1';
9
10
use CGI::Session::ErrorHandler;
11
use YAML::XS ();
12
13
$CGI::Session::Serialize::yamlxs::VERSION = '0.1';
14
@CGI::Session::Serialize::yamlxs::ISA     = ( "CGI::Session::ErrorHandler" );
15
16
sub freeze {
17
    my ($self, $data) = @_;
18
    return YAML::XS::Dump($data);
19
}
20
21
sub thaw {
22
    my ($self, $string) = @_;
23
    return (YAML::XS::Load($string))[0];
24
}
25
# ********************************************************************
26
27
28
29
package C4::Auth;
1
package C4::Auth;
30
2
31
# Copyright 2000-2002 Katipo Communications
3
# Copyright 2000-2002 Katipo Communications
Lines 1899-1905 sub _get_session_params { Link Here
1899
sub get_session {
1871
sub get_session {
1900
    my $sessionID      = shift;
1872
    my $sessionID      = shift;
1901
    my $params = _get_session_params();
1873
    my $params = _get_session_params();
1902
    return CGI::Session->new( $params->{dsn}, $sessionID, $params->{dsn_args} );
1874
    my $session = CGI::Session->new( $params->{dsn}, $sessionID, $params->{dsn_args} );
1875
    if ( ! $session ){
1876
        die CGI::Session->errstr();
1877
    }
1878
    return $session;
1903
}
1879
}
1904
1880
1905
1881
(-)a/Makefile.PL (-1 / +3 lines)
Lines 334-339 my $target_map = { Link Here
334
  './koha-tmpl/opac-tmpl'       => {target => 'OPAC_TMPL_DIR', trimdir => -1},
334
  './koha-tmpl/opac-tmpl'       => {target => 'OPAC_TMPL_DIR', trimdir => -1},
335
  './kohaversion.pl'            => 'INTRANET_CGI_DIR',
335
  './kohaversion.pl'            => 'INTRANET_CGI_DIR',
336
  './labels'                    => 'INTRANET_CGI_DIR',
336
  './labels'                    => 'INTRANET_CGI_DIR',
337
  './lib'                       => {target => 'PERL_MODULE_DIR', trimdir => -1},
337
  './mainpage.pl'               => 'INTRANET_CGI_DIR',
338
  './mainpage.pl'               => 'INTRANET_CGI_DIR',
338
  './Makefile.PL'               => 'NONE',
339
  './Makefile.PL'               => 'NONE',
339
  './MANIFEST.SKIP'             => 'NONE',
340
  './MANIFEST.SKIP'             => 'NONE',
Lines 1464-1470 sub get_target_directories { Link Here
1464
        $skipdirs{'OPAC_TMPL_DIR'} = 1;
1465
        $skipdirs{'OPAC_TMPL_DIR'} = 1;
1465
        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl');
1466
        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl');
1466
        $skipdirs{'OPAC_WWW_DIR'} = 1;
1467
        $skipdirs{'OPAC_WWW_DIR'} = 1;
1467
        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir($curdir);
1468
        #NOTE: We're hacking the dirmap here, so that PERL_MODULE_DIR tokens get rewritten correctly for git installs
1469
        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir($curdir) . ":" . File::Spec->catdir($curdir) . "/lib";
1468
        $skipdirs{'PERL_MODULE_DIR'} = 1;
1470
        $skipdirs{'PERL_MODULE_DIR'} = 1;
1469
        $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');
1471
        $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');
1470
        $dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb');
1472
        $dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb');
(-)a/debian/scripts/koha-functions.sh (-1 / +1 lines)
Lines 330-336 adjust_paths_dev_install() Link Here
330
    if [ "$dev_install" != "" ] && [ "$dev_install" != "0" ]; then
330
    if [ "$dev_install" != "" ] && [ "$dev_install" != "0" ]; then
331
        DEV_INSTALL=1
331
        DEV_INSTALL=1
332
        KOHA_HOME=$(run_safe_xmlstarlet $instancename intranetdir)
332
        KOHA_HOME=$(run_safe_xmlstarlet $instancename intranetdir)
333
        PERL5LIB=$KOHA_HOME
333
        PERL5LIB="$KOHA_HOME:$KOHA_HOME/lib"
334
    else
334
    else
335
        DEV_INSTALL=""
335
        DEV_INSTALL=""
336
    fi
336
    fi
(-)a/lib/CGI/Session/Serialize/yamlxs.pm (-1 / +22 lines)
Line 0 Link Here
0
- 
1
package CGI::Session::Serialize::yamlxs;
2
3
use strict;
4
use warnings;
5
6
use CGI::Session::ErrorHandler;
7
use YAML::XS ();
8
9
$CGI::Session::Serialize::yamlxs::VERSION = '0.1';
10
@CGI::Session::Serialize::yamlxs::ISA     = ( "CGI::Session::ErrorHandler" );
11
12
sub freeze {
13
    my ($self, $data) = @_;
14
    return YAML::XS::Dump($data);
15
}
16
17
sub thaw {
18
    my ($self, $string) = @_;
19
    return (YAML::XS::Load($string))[0];
20
}
21
22
1;

Return to bug 28489