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

(-)a/C4/Auth.pm (-5 / +5 lines)
Lines 642-648 sub checkauth { Link Here
642
        C4::Context->_new_userenv($sessionID);
642
        C4::Context->_new_userenv($sessionID);
643
        my ($ip, $lasttime, $sessiontype);
643
        my ($ip, $lasttime, $sessiontype);
644
        if ($session){
644
        if ($session){
645
            C4::Context::set_userenv(
645
            C4::Context->set_userenv(
646
                $session->param('number'),       $session->param('id'),
646
                $session->param('number'),       $session->param('id'),
647
                $session->param('cardnumber'),   $session->param('firstname'),
647
                $session->param('cardnumber'),   $session->param('firstname'),
648
                $session->param('surname'),      $session->param('branch'),
648
                $session->param('surname'),      $session->param('branch'),
Lines 915-921 sub checkauth { Link Here
915
                if ($persona){
915
                if ($persona){
916
                    $session->param('persona',1);
916
                    $session->param('persona',1);
917
                }
917
                }
918
                C4::Context::set_userenv(
918
                C4::Context->set_userenv(
919
                    $session->param('number'),       $session->param('id'),
919
                    $session->param('number'),       $session->param('id'),
920
                    $session->param('cardnumber'),   $session->param('firstname'),
920
                    $session->param('cardnumber'),   $session->param('firstname'),
921
                    $session->param('surname'),      $session->param('branch'),
921
                    $session->param('surname'),      $session->param('branch'),
Lines 1146-1152 sub check_api_auth { Link Here
1146
        my $session = get_session($sessionID);
1146
        my $session = get_session($sessionID);
1147
        C4::Context->_new_userenv($sessionID);
1147
        C4::Context->_new_userenv($sessionID);
1148
        if ($session) {
1148
        if ($session) {
1149
            C4::Context::set_userenv(
1149
            C4::Context->set_userenv(
1150
                $session->param('number'),       $session->param('id'),
1150
                $session->param('number'),       $session->param('id'),
1151
                $session->param('cardnumber'),   $session->param('firstname'),
1151
                $session->param('cardnumber'),   $session->param('firstname'),
1152
                $session->param('surname'),      $session->param('branch'),
1152
                $session->param('surname'),      $session->param('branch'),
Lines 1306-1312 sub check_api_auth { Link Here
1306
                $session->param('ip',$session->remote_addr());
1306
                $session->param('ip',$session->remote_addr());
1307
                $session->param('lasttime',time());
1307
                $session->param('lasttime',time());
1308
            }
1308
            }
1309
            C4::Context::set_userenv(
1309
            C4::Context->set_userenv(
1310
                $session->param('number'),       $session->param('id'),
1310
                $session->param('number'),       $session->param('id'),
1311
                $session->param('cardnumber'),   $session->param('firstname'),
1311
                $session->param('cardnumber'),   $session->param('firstname'),
1312
                $session->param('surname'),      $session->param('branch'),
1312
                $session->param('surname'),      $session->param('branch'),
Lines 1385-1391 sub check_cookie_auth { Link Here
1385
    my $session = get_session($sessionID);
1385
    my $session = get_session($sessionID);
1386
    C4::Context->_new_userenv($sessionID);
1386
    C4::Context->_new_userenv($sessionID);
1387
    if ($session) {
1387
    if ($session) {
1388
        C4::Context::set_userenv(
1388
        C4::Context->set_userenv(
1389
            $session->param('number'),       $session->param('id'),
1389
            $session->param('number'),       $session->param('id'),
1390
            $session->param('cardnumber'),   $session->param('firstname'),
1390
            $session->param('cardnumber'),   $session->param('firstname'),
1391
            $session->param('surname'),      $session->param('branch'),
1391
            $session->param('surname'),      $session->param('branch'),
(-)a/C4/Context.pm (+1 lines)
Lines 1111-1116 set_userenv is called in Auth.pm Link Here
1111
1111
1112
#'
1112
#'
1113
sub set_userenv {
1113
sub set_userenv {
1114
    shift @_;
1114
    my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $persona)= @_;
1115
    my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $persona)= @_;
1115
    my $var=$context->{"activeuser"} || '';
1116
    my $var=$context->{"activeuser"} || '';
1116
    my $cell = {
1117
    my $cell = {
(-)a/installer/InstallAuth.pm (-2 / +2 lines)
Lines 250-256 sub checkauth { Link Here
250
          new CGI::Session( "driver:File;serializer:yaml", $sessionID,
250
          new CGI::Session( "driver:File;serializer:yaml", $sessionID,
251
            { Directory => '/tmp' } );
251
            { Directory => '/tmp' } );
252
        if ( $session->param('cardnumber') ) {
252
        if ( $session->param('cardnumber') ) {
253
            C4::Context::set_userenv(
253
            C4::Context->set_userenv(
254
                $session->param('number'),
254
                $session->param('number'),
255
                $session->param('id'),
255
                $session->param('id'),
256
                $session->param('cardnumber'),
256
                $session->param('cardnumber'),
Lines 312-318 sub checkauth { Link Here
312
           #Only superlibrarian should have access to this page.
312
           #Only superlibrarian should have access to this page.
313
           #Since if it is a user, it is supposed that there is a borrower table
313
           #Since if it is a user, it is supposed that there is a borrower table
314
           #And thus that data structure is loaded.
314
           #And thus that data structure is loaded.
315
                my $hash = C4::Context::set_userenv(
315
                my $hash = C4::Context->set_userenv(
316
                    0,                           0,
316
                    0,                           0,
317
                    C4::Context->config('user'), C4::Context->config('user'),
317
                    C4::Context->config('user'), C4::Context->config('user'),
318
                    C4::Context->config('user'), "",
318
                    C4::Context->config('user'), "",
(-)a/t/db_dependent/Circulation.t (-2 / +1 lines)
Lines 77-83 is( Link Here
77
77
78
diag('Now, set a userenv');
78
diag('Now, set a userenv');
79
C4::Context->_new_userenv('xxx');
79
C4::Context->_new_userenv('xxx');
80
C4::Context::set_userenv(0,0,0,'firstname','surname', 'MPL', 'Midway Public Library', '', '', '');
80
C4::Context->set_userenv(0,0,0,'firstname','surname', 'MPL', 'Midway Public Library', '', '', '');
81
is(C4::Context->userenv->{branch}, 'MPL', 'userenv set');
81
is(C4::Context->userenv->{branch}, 'MPL', 'userenv set');
82
82
83
# Userenv set, PickupLibrary
83
# Userenv set, PickupLibrary
84
- 

Return to bug 10900